r3681 - in trunk/src/target/OM-2007.2/applications/openmoko-messages2: . src

chris at sita.openmoko.org chris at sita.openmoko.org
Tue Dec 18 18:09:26 CET 2007


Author: chris
Date: 2007-12-18 18:09:25 +0100 (Tue, 18 Dec 2007)
New Revision: 3681

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-contacts.c
   trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
Log:
        * src/sms-contacts.c: (page_shown),
        (sms_contacts_update_delete_all):
        Fix warnings

        * src/sms-notes.c: (notes_visible_func):
        Don't allow NULL argument for author uid in strcmp


Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog	2007-12-18 16:56:45 UTC (rev 3680)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog	2007-12-18 17:09:25 UTC (rev 3681)
@@ -1,5 +1,14 @@
 2007-12-18  Chris Lord  <chris at openedhand.com>
 
+	* src/sms-contacts.c: (page_shown),
+	(sms_contacts_update_delete_all):
+	Fix warnings
+
+	* src/sms-notes.c: (notes_visible_func):
+	Don't allow NULL argument for author uid in strcmp
+
+2007-12-18  Chris Lord  <chris at openedhand.com>
+
 	* src/sms-contacts.c: (sms_contacts_page_new):
 	Update categories on start-up, in case there are no contacts
 

Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-contacts.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-contacts.c	2007-12-18 16:56:45 UTC (rev 3680)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-contacts.c	2007-12-18 17:09:25 UTC (rev 3681)
@@ -40,7 +40,8 @@
 	
 	/* Update delete/delete-all buttons */
 	sms_contacts_update_delete_all (data);
-	selection = gtk_tree_view_get_selection (data->contacts_treeview);
+	selection = gtk_tree_view_get_selection (
+		GTK_TREE_VIEW (data->contacts_treeview));
 	selection_changed_cb (selection, data);
 }
 
@@ -568,8 +569,8 @@
 void
 sms_contacts_update_delete_all (SmsData *data)
 {
-	if (gtk_notebook_get_current_page (data->notebook) == SMS_PAGE_CONTACTS)
-	{
+	if (gtk_notebook_get_current_page (GTK_NOTEBOOK (data->notebook)) ==
+	    SMS_PAGE_CONTACTS) {
 		if (g_hash_table_size (data->note_count) > 0) {
 			gtk_widget_set_sensitive (GTK_WIDGET (
 				data->delete_all_button), TRUE);

Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c	2007-12-18 16:56:45 UTC (rev 3680)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c	2007-12-18 17:09:25 UTC (rev 3681)
@@ -607,7 +607,7 @@
 			moko_search_bar_get_combo_box (MOKO_SEARCH_BAR (
 				data->notes_search))); 
 		
-		if (type <= ALL_NOTES) return TRUE;
+		if ((type <= ALL_NOTES) || (!data->author_uid)) return TRUE;
 		
 		gtk_tree_model_get (model, iter,
 			JANA_GTK_NOTE_STORE_COL_UID, &author_uid, -1);





More information about the commitlog mailing list