r1402 - trunk/src/target/OM-2007/applications/openmoko-messages/src

alex_tang at sita.openmoko.org alex_tang at sita.openmoko.org
Mon Mar 19 07:48:24 CET 2007


Author: alex_tang
Date: 2007-03-19 07:48:19 +0100 (Mon, 19 Mar 2007)
New Revision: 1402

Modified:
   trunk/src/target/OM-2007/applications/openmoko-messages/src/callbacks.c
   trunk/src/target/OM-2007/applications/openmoko-messages/src/main.c
   trunk/src/target/OM-2007/applications/openmoko-messages/src/main.h
Log:
Store folder names to file foldersdb fixed.
Initialize to "Inbox" folder in filter menu to fix the bug: "Filter 
Menu" by default will crash while clicking on the scroll bar.
Remove some unuseful debug information.


Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/callbacks.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/callbacks.c	2007-03-19 03:54:27 UTC (rev 1401)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/callbacks.c	2007-03-19 06:48:19 UTC (rev 1402)
@@ -471,7 +471,6 @@
     GdkPixbuf* icon;
     GError*   error = NULL;
     
-    g_debug( "openmoko-messenger: selection changed" );
     view = gtk_tree_selection_get_tree_view( selection );
     if ( gtk_tree_selection_get_selected( selection, &model, &iter ) ) {
         msg = g_malloc(sizeof(message));

Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/main.c	2007-03-19 03:54:27 UTC (rev 1401)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/main.c	2007-03-19 06:48:19 UTC (rev 1402)
@@ -69,7 +69,6 @@
 int main( int argc, char** argv )
 {
     g_debug( "openmoko-messenger starting up" );
-    pid_t           lockapp;
 
     /* Initialize GTK+ */
     gtk_init( &argc, &argv );
@@ -248,6 +247,13 @@
     /* detail area */
     populate_detail_area (d);
     
+    /* Fix default "Filter Menu" bug*/
+    d->currentfolder = g_strdup("Inbox");
+    GtkWidget* menuitem = gtk_menu_get_attach_widget (GTK_MENU(d->filtmenu));
+    GtkWidget* menulabel = GTK_BIN(menuitem)->child;
+    gtk_label_set_text (GTK_LABEL(menulabel),"Inbox");
+    gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER(d->filter));
+    
     /* select the first column */
     gint index = 0;
     GtkTreeSelection* tree_selection = gtk_tree_view_get_selection( GTK_TREE_VIEW(d->view) );
@@ -365,8 +371,11 @@
    moko_paned_window_set_lower_pane( d->window, GTK_WIDGET(moko_details_window_put_in_box(d->details)));
 }
 
-void main_quit(GtkWidget* widget, GdkEvent* event, MessengerData* d)
+void main_quit(GtkMenuItem* item, MessengerData* d)
 {
+    if(d == NULL)
+      g_debug ("Message data is null");
+    g_debug ("Folder List length:%d",g_slist_length(d->folderlist));
     foldersdb_update (d->folderlist);
     gtk_main_quit();
 }

Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/main.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/main.h	2007-03-19 03:54:27 UTC (rev 1401)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/main.h	2007-03-19 06:48:19 UTC (rev 1402)
@@ -82,7 +82,7 @@
 void setup_ui( MessengerData* d );
 void populate_navigation_area( MessengerData* d );
 void populate_detail_area( MessengerData* d );
-void main_quit(GtkWidget* widget, GdkEvent* event, MessengerData* d);
+void main_quit(GtkMenuItem* item, MessengerData* d);
 void update_folder_sensitive (MessengerData* d, GSList* folderlist);
 gboolean init_dbus (MessengerData* d);
 





More information about the commitlog mailing list