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

[alex_tang at sita.openmoko.org]

Author: alex_tang
Date: 2007-03-20 08:56:08 +0100 (Tue, 20 Mar 2007)
New Revision: 1428

Modified:
   trunk/src/target/OM-2007/applications/openmoko-messages/src/callbacks.c
   trunk/src/target/OM-2007/applications/openmoko-messages/src/callbacks.h
   trunk/src/target/OM-2007/applications/openmoko-messages/src/main.c
   trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-membership-window.c
Log:
Clean the footer while colse messages.
Fix message membership folder display, any change add/delete will change the list.


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-20 07:42:41 UTC (rev 1427)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/callbacks.c	2007-03-20 07:56:08 UTC (rev 1428)
@@ -23,7 +23,7 @@
 #include <gtk/gtk.h>
 #include <dbus/dbus.h>
 
-static void
+void
 send_signal_to_footer (DBusConnection* bus, gchar* message_str)
 {
     DBusMessage *message;
@@ -280,6 +280,7 @@
 	sms_membership_window_set_messages (SMS_MEMBERSHIP_WINDOW(d->mmWin), d->liststore);
     }
     gtk_window_set_decorated (GTK_WINDOW(d->mmWin), FALSE);
+    sms_membership_window_set_menubox (SMS_MEMBERSHIP_WINDOW(d->mmWin), d->folderlist);
     sms_membership_window_show ( SMS_MEMBERSHIP_WINDOW(d->mmWin) );
 }
 

Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/callbacks.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/callbacks.h	2007-03-20 07:42:41 UTC (rev 1427)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/callbacks.h	2007-03-20 07:56:08 UTC (rev 1428)
@@ -26,6 +26,7 @@
 #include "main.h"
 
 gboolean cb_filter_changed(GtkWidget* widget, gchar* text, MessengerData* d);
+void send_signal_to_footer (DBusConnection* bus, gchar* message_str);
 
 void cb_new_sms (GtkMenuItem* item, MessengerData* d);
 void cb_new_mail (GtkMenuItem* item, MessengerData* d);

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-20 07:42:41 UTC (rev 1427)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/main.c	2007-03-20 07:56:08 UTC (rev 1428)
@@ -373,10 +373,8 @@
 
 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);
+    send_signal_to_footer(d->bus,"");
     gtk_main_quit();
 }
 

Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-membership-window.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-membership-window.c	2007-03-20 07:42:41 UTC (rev 1427)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-membership-window.c	2007-03-20 07:56:08 UTC (rev 1428)
@@ -48,6 +48,8 @@
     GtkWidget* fromLabel;
     GtkWidget* subjectLabel;
     GtkWidget* closebutton;
+    GtkWidget* radioBtnBox;
+    GtkWidget* radioAlign;
     GtkTreeModel* filter;
     GtkWidget* view;
     GtkListStore* liststore;
@@ -286,11 +288,22 @@
     }
 
     //set radio button box alignment
-    GtkAlignment* alignment = GTK_ALIGNMENT(gtk_alignment_new (0.5, 0.5, 1, 1));
-    gtk_alignment_set_padding (alignment, 5, 5, 30, 5);
-    gtk_container_add( GTK_CONTAINER(alignment), GTK_WIDGET(rdobtnbox) );
-    gtk_box_pack_start (GTK_BOX (priv->folderbox), GTK_WIDGET(alignment), FALSE, TRUE, 0);
-    moko_menu_box_set_application_menu( MOKO_MENU_BOX(priv->menubox), GTK_MENU(appmenu) );
+    if (!GTK_IS_ALIGNMENT(priv->radioAlign)){
+        g_debug("Should be the first fime");
+        priv->radioAlign = GTK_ALIGNMENT(gtk_alignment_new (0.5, 0.5, 1, 1));
+        gtk_alignment_set_padding (priv->radioAlign, 5, 5, 30, 5);
+    //if (priv->radioBtnBox != NULL)
+    //    gtk_container_remove( GTK_CONTAINER(alignment), GTK_WIDGET(priv->radioBtnBox) );
+        priv->radioBtnBox = rdobtnbox;
+        gtk_container_add( GTK_CONTAINER(priv->radioAlign), GTK_WIDGET(priv->radioBtnBox) );
+        gtk_box_pack_start (GTK_BOX (priv->folderbox), GTK_WIDGET(priv->radioAlign), FALSE, FALSE, 0);
+    	moko_menu_box_set_application_menu( MOKO_MENU_BOX(priv->menubox), GTK_MENU(appmenu) );
+    }
+    else{
+        gtk_container_remove( GTK_CONTAINER(priv->radioAlign), GTK_WIDGET(priv->radioBtnBox) );
+	priv->radioBtnBox = rdobtnbox;
+        gtk_container_add( GTK_CONTAINER(priv->radioAlign), GTK_WIDGET(priv->radioBtnBox) );
+    }
     moko_menu_box_set_filter_menu( MOKO_MENU_BOX(priv->menubox), GTK_MENU(filtmenu) );
     gtk_widget_show (priv->menubox);
     gtk_widget_show_all (priv->vbox);