[pkg-fso-commits] [SCM] libframeworkd-phonegui branch, upstream, updated. 640da47bfcff755388d0fb8f443eb34e0dea3c72
quickdev
niklas.coding at gmail.com
Sat Dec 27 20:50:09 UTC 2008
The following commit has been merged in the upstream branch:
commit cfd33aac3eff4e48ae042ee167d4f7554409b6a5
Author: quickdev <niklas.coding at gmail.com>
Date: Mon Dec 22 00:30:58 2008 +0100
Fixed ticket #193 and #208. Did some formatting.
diff --git a/libframeworkd-phonegui-efl/src/view/call-active-view.c b/libframeworkd-phonegui-efl/src/view/call-active-view.c
index 43fea2b..50626f6 100644
--- a/libframeworkd-phonegui-efl/src/view/call-active-view.c
+++ b/libframeworkd-phonegui-efl/src/view/call-active-view.c
@@ -45,7 +45,6 @@ void call_active_view_hide(struct CallActiveViewData *data) {
g_debug("call_active_hide()");
struct Window *win = data->parent.win;
- g_debug("win: %d", win);
if(data->parent.dtmf_active) {
call_dtmf_disable(&(data->parent));
@@ -65,5 +64,3 @@ void call_active_view_hide(struct CallActiveViewData *data) {
evas_object_del(data->bt3);
}
-
-
diff --git a/libframeworkd-phonegui-efl/src/view/call-incoming-view.c b/libframeworkd-phonegui-efl/src/view/call-incoming-view.c
index de08a25..6834191 100644
--- a/libframeworkd-phonegui-efl/src/view/call-incoming-view.c
+++ b/libframeworkd-phonegui-efl/src/view/call-incoming-view.c
@@ -47,7 +47,7 @@ void call_incoming_view_hide(struct CallIncomingViewData *data) {
evas_object_del(data->bt2);
if(data->parent.dtmf_active) {
- call_dtmf_disable(&(data->parent));
+ call_dtmf_disable(data);
}
if(speaker_active) {
diff --git a/libframeworkd-phonegui-efl/src/view/contact-delete-view.c b/libframeworkd-phonegui-efl/src/view/contact-delete-view.c
index 6d47cff..0ec2cc2 100644
--- a/libframeworkd-phonegui-efl/src/view/contact-delete-view.c
+++ b/libframeworkd-phonegui-efl/src/view/contact-delete-view.c
@@ -16,8 +16,8 @@ void contact_delete_no_clicked(void *userdata, Evas_Object *obj, void *event_inf
static void delete_callback(GError *error, gpointer userdata);
static void delete_callback2(struct ContactDeleteViewData *data);
-static void frame_delete_show(struct ContactDeleteViewData *data);
-static void frame_delete_hide(struct ContactDeleteViewData *data);
+static void frame_delete_show(void *);
+static void frame_delete_hide(void *);
static void frame_delete_no_clicked(void *userdata, Evas_Object *obj, void *event_info);
static void frame_delete_yes_clicked(void *userdata, Evas_Object *obj, void *event_info);
@@ -31,16 +31,13 @@ struct ContactDeleteViewData *contact_delete_view_show(struct Window *win, GHash
if(options == NULL) {
g_error("At least option[id] must be set.");
} else {
- data->id = g_hash_table_lookup(options, "id");
+ data->id = (int) g_hash_table_lookup(options, "id");
data->callback = g_hash_table_lookup(options, "delete_callback");
data->callback_data = g_hash_table_lookup(options, "delete_callback_data");
-
- g_debug("Delete view with contact id = %d", data->id);
}
window_frame_show(win, data, frame_delete_show, frame_delete_hide);
window_show(win);
-
return data;
}
@@ -67,7 +64,8 @@ static void delete_callback2(struct ContactDeleteViewData *data) {
* Frame "delete"
*/
-static void frame_delete_show(struct ContactDeleteViewData *data) {
+static void frame_delete_show(void *userdata) {
+ struct ContactDeleteViewData *data = (struct ContactDeleteViewData *) userdata;
struct Window *win = data->win;
window_layout_set(win, CONTACTS_FILE, "delete");
@@ -84,7 +82,8 @@ static void frame_delete_show(struct ContactDeleteViewData *data) {
evas_object_show(data->bt_no);
}
-static void frame_delete_hide(struct ContactDeleteViewData *data) {
+static void frame_delete_hide(void *userdata) {
+ struct ContactDeleteViewData *data = (struct ContactDeleteViewData *) userdata;
evas_object_del(data->bt_yes);
evas_object_del(data->bt_no);
}
diff --git a/libframeworkd-phonegui-efl/src/view/contact-edit-view.c b/libframeworkd-phonegui-efl/src/view/contact-edit-view.c
index 3421875..cd54e14 100644
--- a/libframeworkd-phonegui-efl/src/view/contact-edit-view.c
+++ b/libframeworkd-phonegui-efl/src/view/contact-edit-view.c
@@ -100,7 +100,7 @@ static void get_phonebook_info_callback(GError *error, GHashTable *info, gpointe
int min = g_value_get_int(g_hash_table_lookup(info, "min_index"));
int max = g_value_get_int(g_hash_table_lookup(info, "max_index"));
(*data)->free_entry_index = calculate_free_entry_index(min, max, (*data)->contacts, *data);
- g_debug("index: %d", (*data)->free_entry_index);
+ g_debug("free index: %d", (*data)->free_entry_index);
}
}
diff --git a/libframeworkd-phonegui-efl/src/view/contact-list-view.c b/libframeworkd-phonegui-efl/src/view/contact-list-view.c
index 435e2d6..4ca439a 100644
--- a/libframeworkd-phonegui-efl/src/view/contact-list-view.c
+++ b/libframeworkd-phonegui-efl/src/view/contact-list-view.c
@@ -19,6 +19,7 @@ static void frame_list_message_clicked(struct ContactListViewData *data, Evas_Ob
static void frame_list_edit_clicked(struct ContactListViewData *data, Evas_Object *obj, void *event_info);
static void frame_list_delete_clicked(struct ContactListViewData *data, Evas_Object *obj, void *event_info);
static void frame_list_refresh(struct ContactListViewData *data);
+static void frame_list_refresh_callback(struct ContactListViewData *data);
struct ContactListViewData *contact_list_view_show(struct Window *win, GHashTable *options) {
@@ -137,7 +138,6 @@ static void frame_list_options_clicked(struct ContactListViewData *data, Evas_Ob
static void frame_list_message_clicked(struct ContactListViewData *data, Evas_Object *obj, void *event_info) {
evas_object_hide(data->hv);
- g_debug("mssage");
GHashTable *properties = elm_my_contactlist_selected_row_get(data->list);
if(properties != NULL) {
assert(g_hash_table_lookup(properties, "number") != NULL);
@@ -187,6 +187,10 @@ static void frame_list_delete_clicked(struct ContactListViewData *data, Evas_Obj
static void frame_list_refresh(struct ContactListViewData *data) {
+ async_trigger(frame_list_refresh_callback, data);
+}
+
+static void frame_list_refresh_callback(struct ContactListViewData *data) {
elm_my_contactlist_refresh(data->list);
}
diff --git a/libframeworkd-phonegui-efl/src/view/contact-show-view.c b/libframeworkd-phonegui-efl/src/view/contact-show-view.c
index c6bb64b..31f4b35 100644
--- a/libframeworkd-phonegui-efl/src/view/contact-show-view.c
+++ b/libframeworkd-phonegui-efl/src/view/contact-show-view.c
@@ -1,6 +1,11 @@
#include "views.h"
+/*
+ * NOT USED ATM
+ */
+
+
void contacts_button_call_clicked(struct ContactsWindow *win, Evas_Object *obj, void *event_info) {
if(win->contacts_mode == MODE_LIST) {
Etk_Tree_Row *row = etk_tree_selected_row_get(win->tree);
diff --git a/libframeworkd-phonegui-efl/src/view/message-folder-view.c b/libframeworkd-phonegui-efl/src/view/message-folder-view.c
index b2acd62..d808277 100644
--- a/libframeworkd-phonegui-efl/src/view/message-folder-view.c
+++ b/libframeworkd-phonegui-efl/src/view/message-folder-view.c
@@ -1,6 +1,11 @@
#include "views.h"
+/*
+ * NOT USED AT THE MOMENT
+ */
+
+
struct MessageFolderViewData {
struct Window *win;
int mode;
@@ -134,6 +139,3 @@ static void messages_button_show_clicked(struct MessageFolderViewData *data, Eva
}
-
-
-
diff --git a/libframeworkd-phonegui-efl/src/view/message-list-view.c b/libframeworkd-phonegui-efl/src/view/message-list-view.c
index 6c55547..17bfa56 100644
--- a/libframeworkd-phonegui-efl/src/view/message-list-view.c
+++ b/libframeworkd-phonegui-efl/src/view/message-list-view.c
@@ -20,6 +20,7 @@ static void message_list_view_show_clicked(struct MessageListViewData *data, Eva
static void message_list_view_delete_clicked(struct MessageListViewData *data, Evas_Object *obj, void *event_info);
static void message_list_view_answer_clicked(struct MessageListViewData *data, Evas_Object *obj, void *event_info);
static void message_list_view_message_deleted(struct MessageListViewData *data);
+static void message_list_view_message_deleted_callback(struct MessageListViewData *data);
static void retrieve_messagebook_callback(GError*error, GPtrArray*messages, struct MessageListViewData *data);
static void retrieve_messagebook_callback2(struct MessageListViewData *data);
@@ -27,11 +28,9 @@ static void retrieve_messagebook_callback2(struct MessageListViewData *data);
struct MessageListViewData *message_list_view_show(struct Window *win, GHashTable *options) {
g_debug("message_list_view_show()");
-
struct MessageListViewData *data = g_slice_alloc0(sizeof(struct MessageListViewData));
data->win = win;
-
window_layout_set(win, MESSAGE_FILE, "list");
window_text_set(win, "title", "Inbox");
@@ -269,6 +268,10 @@ static void my_hover_bt_1(void *data, Evas_Object *obj, void *event_info) {
}
static void message_list_view_message_deleted(struct MessageListViewData *data) {
+ async_trigger(message_list_view_message_deleted_callback, data);
+}
+
+static void message_list_view_message_deleted_callback(struct MessageListViewData *data) {
// TODO: Reload list instead of deleting the selected message
data->selected_row = etk_tree_selected_row_get(data->tree);
if(data->selected_row != NULL) {
diff --git a/libframeworkd-phonegui-efl/src/view/message-new-view.c b/libframeworkd-phonegui-efl/src/view/message-new-view.c
index f7780ce..44e6bdf 100644
--- a/libframeworkd-phonegui-efl/src/view/message-new-view.c
+++ b/libframeworkd-phonegui-efl/src/view/message-new-view.c
@@ -281,8 +281,6 @@ static void frame_recipient_delete_clicked(struct MessageNewViewData *data, Evas
}
static void frame_recipient_continue_clicked(struct MessageNewViewData *data, Evas_Object *obj, void *event_info) {
- g_debug("frame_recipient_continue_clicked(win=%d)", data->win);
-
if(data->recipients->len) {
window_frame_show(data->win, data, frame_sending_show, frame_sending_hide);
@@ -325,7 +323,6 @@ static void frame_recipient_process_recipient(GHashTable *properties, struct Mes
static void frame_contact_add_show(struct MessageNewViewData *data) {
struct Window *win = data->win;
-
window_layout_set(win, MESSAGE_FILE, "recipient_contact_add");
data->bt1 = elm_button_add(window_evas_object_get(win));
diff --git a/libframeworkd-phonegui-efl/src/view/message-show-view.c b/libframeworkd-phonegui-efl/src/view/message-show-view.c
index 212270a..8b69148 100644
--- a/libframeworkd-phonegui-efl/src/view/message-show-view.c
+++ b/libframeworkd-phonegui-efl/src/view/message-show-view.c
@@ -31,6 +31,7 @@ static void message_show_view_close_clicked(struct MessageShowViewData *data, Ev
static void message_show_view_answer_clicked(struct MessageShowViewData *data, Evas_Object *obj, void *event_info);
static void message_show_view_delete_clicked(struct MessageShowViewData *data, Evas_Object *obj, void *event_info);
static void message_show_view_delete_callback(struct MessageShowViewData *data);
+static void message_show_view_delete_callback_callback(struct MessageShowViewData *data);
static void my_hover_bt_1(void *data, Evas_Object *obj, void *event_info);
@@ -168,11 +169,15 @@ static void message_show_view_delete_clicked(struct MessageShowViewData *data, E
}
static void message_show_view_delete_callback(struct MessageShowViewData *data) {
+ async_trigger(message_show_view_delete_callback_callback, data);
+}
+
+static void message_show_view_delete_callback_callback(struct MessageShowViewData *data) {
window_destroy(data->win, NULL);
if(data->callback != NULL) {
data->callback(data->callback_data);
- }
+ }
}
static void my_hover_bt_1(void *data, Evas_Object *obj, void *event_info) {
diff --git a/libframeworkd-phonegui-efl/src/widget/elm_my_contactlist.h b/libframeworkd-phonegui-efl/src/widget/elm_my_contactlist.h
index 5600920..972884e 100644
--- a/libframeworkd-phonegui-efl/src/widget/elm_my_contactlist.h
+++ b/libframeworkd-phonegui-efl/src/widget/elm_my_contactlist.h
@@ -8,4 +8,4 @@ EAPI Evas_Object* elm_my_contactlist_add(Evas_Object *parent);
EAPI GHashTable* elm_my_contactlist_selected_row_get(void *data);
EAPI void elm_my_contactlist_refresh(void *data);
-#endif;
+#endif
--
libframeworkd-phonegui
More information about the pkg-fso-commits
mailing list