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

[alex_tang at sita.openmoko.org]

Author: alex_tang
Date: 2007-03-07 09:38:01 +0100 (Wed, 07 Mar 2007)
New Revision: 1258

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:
Add get_model_number to get current folder's message number.
Add search key word initializtion.


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-07 07:16:39 UTC (rev 1257)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/callbacks.c	2007-03-07 08:38:01 UTC (rev 1258)
@@ -22,12 +22,30 @@
 #include "detail-area.h"
 #include <gtk/gtk.h>
 
+static gboolean 
+model_number_helper (GtkTreeModel* model,
+		     GtkTreePath*  path,
+		     GtkTreeIter*  iter,
+		     gpointer      data)
+{
+    MessengerData* d = (MessengerData*)data;
+    d->msg_num ++;
+    return FALSE;
+}
 
+gint get_model_number (MessengerData* d)
+{
+    d->msg_num = 0;
+    gtk_tree_model_foreach (d->filter,model_number_helper,d);
+    return d->msg_num;
+}
+
 gboolean cb_filter_changed(GtkWidget* widget, gchar* text, MessengerData* d)
 {
-    g_debug("changed to %s folder",text);
+    //g_debug("changed to %s folder",text);
     d->currentfolder = g_strdup(text);
     gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER(d->filter));
+    g_debug("folder %s has %d messages",text,get_model_number(d));
     
     return FALSE;
 }
@@ -448,7 +466,7 @@
     GtkWidget* search_entry = GTK_WIDGET(editable);
     d->s_key = g_strdup (gtk_entry_get_text(GTK_ENTRY(search_entry)));
     gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER(d->filter));
-    g_debug ("search %s",d->s_key);
+    g_debug ("search %s, result has %d messages",d->s_key,get_model_number(d));
 }
 
 void cb_search_on (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-07 07:16:39 UTC (rev 1257)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/main.c	2007-03-07 08:38:01 UTC (rev 1258)
@@ -111,7 +111,6 @@
     lockapp = testlock ("/tmp/messages.lock");
     if (lockapp > 0)
      {
-       //kill (lockapp, SIGUSR1);
        g_debug("Openmoko messages is already running");
        return 0;
      }
@@ -119,6 +118,8 @@
 
     MessengerData* d = g_new ( MessengerData, 1);
     d->foldersdb = foldersdb_new();
+    d->s_key = "";
+    d->msg_num = 0;
     d->app = MOKO_APPLICATION (moko_application_get_instance());
     d->currentfolder = g_strdup("Inbox");
     g_set_application_name( "Messages" ); 

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-07 07:16:39 UTC (rev 1257)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/main.h	2007-03-07 08:38:01 UTC (rev 1258)
@@ -44,6 +44,7 @@
     GSList* folderlist;
     gchar* currentfolder;
     gchar* s_key;
+    gint   msg_num;
     gboolean searchOn;
     GtkWidget* nfEntry;
     GtkWidget* frEntry;