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

thomas at sita.openmoko.org thomas at sita.openmoko.org
Mon Apr 16 18:45:19 CEST 2007


Author: thomas
Date: 2007-04-16 18:45:18 +0200 (Mon, 16 Apr 2007)
New Revision: 1783

Modified:
   trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
   trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-omoko.c
Log:
* src/contacts-omoko.c: (create_contacts_list),
(create_main_window): Don't use MokoNavigationView. Fixes bug 472.


Modified: trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog	2007-04-16 15:33:59 UTC (rev 1782)
+++ trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog	2007-04-16 16:45:18 UTC (rev 1783)
@@ -1,5 +1,10 @@
 2007-04-16  Thomas Wood  <thomas at openedhand.com>
 
+	* src/contacts-omoko.c: (create_contacts_list),
+	(create_main_window): Don't use MokoNavigationView. Fixes bug 472.
+
+2007-04-16  Thomas Wood  <thomas at openedhand.com>
+
 	* src/contacts-groups-editor.c:
 	(contacts_groups_pane_update_selection), (contacts_groups_new_cb):
 	* src/contacts-omoko.c: (add_menu_item),

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-04-16 15:33:59 UTC (rev 1782)
+++ trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-omoko.c	2007-04-16 16:45:18 UTC (rev 1783)
@@ -37,8 +37,7 @@
 GtkWidget *
 create_contacts_list (ContactsData *data)
 {
-	MokoNavigationList *moko_navigation_list = moko_navigation_list_new ();
-	GtkWidget *treeview = GTK_WIDGET (moko_navigation_list_get_tree_view (moko_navigation_list));
+	GtkWidget *treeview = moko_tree_view_new ();
 
 	gtk_tree_view_set_model (GTK_TREE_VIEW (treeview),
 				 GTK_TREE_MODEL (data->contacts_filter));
@@ -53,16 +52,16 @@
 	column = gtk_tree_view_column_new_with_attributes (_("Name"), renderer,
 							"text", CONTACT_NAME_COL, NULL);
 	gtk_tree_view_column_set_sort_column_id (column, CONTACT_NAME_COL);
-	moko_navigation_list_append_column (moko_navigation_list, column);
+	moko_tree_view_append_column (MOKO_TREE_VIEW (treeview), column);
 
 	/* mobile column */
 	renderer = gtk_cell_renderer_text_new ();
 	column = gtk_tree_view_column_new_with_attributes (_("Cell Phone"), renderer,
 							"text", CONTACT_CELLPHONE_COL, NULL);
 	gtk_tree_view_column_set_sort_column_id (column, CONTACT_CELLPHONE_COL);
-	moko_navigation_list_append_column (moko_navigation_list, column);
+	moko_tree_view_append_column (MOKO_TREE_VIEW (treeview), column);
 
-	return GTK_WIDGET (moko_navigation_list);
+	return treeview;
 }
 
 void
@@ -139,12 +138,14 @@
 
 	/*** contacts list ***/
 
-	GtkWidget *moko_navigation_list = create_contacts_list (contacts_data);
+	widget = create_contacts_list (contacts_data);
 	g_object_unref (contacts_data->contacts_liststore);
 
-	moko_paned_window_set_upper_pane (MOKO_PANED_WINDOW (ui->main_window), GTK_WIDGET (moko_navigation_list));
-	ui->contacts_treeview = GTK_WIDGET (moko_navigation_list_get_tree_view (MOKO_NAVIGATION_LIST (moko_navigation_list)));
+	moko_paned_window_set_upper_pane (MOKO_PANED_WINDOW (ui->main_window),
+      moko_tree_view_put_into_scrolled_window (MOKO_TREE_VIEW (widget)));
 
+	ui->contacts_treeview = widget;
+
 	/* Connect signal for selection changed event */
 	GtkTreeSelection *selection;
 	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (ui->contacts_treeview));





More information about the commitlog mailing list