r1411 - in trunk/src/target/OM-2007/applications/openmoko-contacts: . src

[thomas at sita.openmoko.org]

Author: thomas
Date: 2007-03-19 18:04:09 +0100 (Mon, 19 Mar 2007)
New Revision: 1411

Modified:
   trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
   trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-callbacks-ebook.c
   trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-omoko.c
Log:
* src/contacts-callbacks-ebook.c: (contacts_added_cb),
(contacts_changed_cb): Move update listview and update groups to
sequence-complete callback. Fixes a bug were groups list menu was never
initialised when there were no groups defined.

* src/contacts-omoko.c: (contacts_ui_create): Stop using nested functions


Modified: trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog	2007-03-19 16:59:39 UTC (rev 1410)
+++ trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog	2007-03-19 17:04:09 UTC (rev 1411)
@@ -1,3 +1,11 @@
+2007-03-19  Thomas Wood  <thomas at openedhand.com>
+
+	* src/contacts-callbacks-ebook.c: (contacts_added_cb),
+	(contacts_changed_cb): Move update listview and update groups to
+	sequence-complete callback. Fixes a bug were groups list menu was never
+	initialised when there were no groups defined.
+	* src/contacts-omoko.c: (contacts_ui_create): Stop using nested functions
+
 2007-03-07  Thomas Wood  <thomas at openedhand.com>
 
 	Merge in various changes from mainline contacts:

Modified: trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-callbacks-ebook.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-callbacks-ebook.c	2007-03-19 16:59:39 UTC (rev 1410)
+++ trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-callbacks-ebook.c	2007-03-19 17:04:09 UTC (rev 1411)
@@ -96,15 +96,11 @@
 				{
 					data->contacts_groups = g_list_prepend
 					   (data->contacts_groups, group->data);
-					contacts_ui_update_groups_list (data);
 				}
 			}
 			g_list_free (contact_groups);
 		}
 	}
-	
-	/* Update view */
-	contacts_update_treeview (data);
 }
 
 void
@@ -174,7 +170,6 @@
 				{
 					data->contacts_groups = g_list_prepend 
 					   (data->contacts_groups, group->data);
-					contacts_ui_update_groups_list (data);
 				}
 			}
 			g_list_free (contact_groups);
@@ -182,9 +177,6 @@
 	}
 	
 	if (current_contact) g_object_unref (current_contact);
-
-	/* Update view */
-	contacts_update_treeview (data);
 }
 
 /* TODO: Remove groups that no longer contain contacts */
@@ -197,9 +189,6 @@
 		const gchar *uid = (const gchar *)i->data;
 		g_hash_table_remove (data->contacts_table, uid);
 	}
-
-	/* Update view */
-	contacts_update_treeview (data);
 }
 
 void
@@ -221,4 +210,11 @@
 		data->initialising = FALSE;
 		gtk_tree_view_scroll_to_point (GTK_TREE_VIEW (data->ui->contacts_treeview), 0, 0);
 	}
+
+	/* Update view */
+	contacts_update_treeview (data);
+
+	/* Update filter menu */
+	contacts_ui_update_groups_list (data);
+
 }

Modified: trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-omoko.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-omoko.c	2007-03-19 16:59:39 UTC (rev 1410)
+++ trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-omoko.c	2007-03-19 17:04:09 UTC (rev 1411)
@@ -266,19 +266,22 @@
 	create_main_window (data);
 }
 
+static void
+remove_menu_item (GtkWidget *menu_item, GtkWidget *menu)
+{
+	gtk_container_remove (GTK_CONTAINER (menu), menu_item);
+}
+
+static void
+add_menu_item (gchar *group, GtkMenu *menu)
+{
+	gtk_menu_shell_append (GTK_MENU_SHELL (menu), gtk_menu_item_new_with_label (group));
+}
+
 void
 contacts_ui_update_groups_list (ContactsData *data)
 {
-	void remove_menu_item (GtkWidget *menu_item, GtkWidget *menu)
-	{
-		gtk_container_remove (GTK_CONTAINER (menu), menu_item);
-	}
 
-	void add_menu_item (gchar *group, GtkMenu *menu)
-	{
-		gtk_menu_shell_append (GTK_MENU_SHELL (menu), gtk_menu_item_new_with_label (group));
-	}
-
 	/* update filter menu */
 	gtk_container_foreach (GTK_CONTAINER (filter_menu), (GtkCallback)remove_menu_item, filter_menu);