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

[alex_tang at sita.openmoko.org]

Author: alex_tang
Date: 2007-03-29 05:55:51 +0200 (Thu, 29 Mar 2007)
New Revision: 1545

Modified:
   trunk/src/target/OM-2007/applications/openmoko-messages/src/callbacks.c
   trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-contact-window.c
   trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-contact-window.h
Log:
GList* selectedContacts is not need any more.


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-28 21:20:58 UTC (rev 1544)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/callbacks.c	2007-03-29 03:55:51 UTC (rev 1545)
@@ -590,7 +590,7 @@
 {
   g_debug("sms select contact done");
   GtkWidget* toEntry = (GtkWidget*)data;
-  GList* contacts = SMS_CONTACT_WINDOW(widget)->selectedContacts;
+  GList* contacts = sms_get_selected_contacts(SMS_CONTACT_WINDOW(widget));
   g_debug ("start to add %d contacts to entry", g_list_length(contacts));
   gchar* nameList = NULL;
   gchar* name;

Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-contact-window.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-contact-window.c	2007-03-28 21:20:58 UTC (rev 1544)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-contact-window.c	2007-03-29 03:55:51 UTC (rev 1545)
@@ -40,7 +40,7 @@
 static void updateContactsView (EBook* book, EBookStatus status, 
                                 GList* contacts, gpointer closure);
 static void contacts_view_cursor_changed(GtkTreeSelection* selection, SmsContactData* data);
-static void contact_select_done(void);
+static void contact_select_done(SmsContactWindow* self);
 gboolean get_selected_contact (GtkTreeModel* model, GtkTreePath* path, 
                                GtkTreeIter* iter, gpointer data);
 
@@ -64,6 +64,7 @@
   GObjectClass* object_class = G_OBJECT_CLASS(klass);
   g_type_class_add_private (klass, sizeof(SmsContactWindowPrivate));
 
+  klass->contact_select_done = contact_select_done;
   /* create a new signal */
   sms_contact_signals[CONTACT_SELECT_DONE_SIGNAL] = g_signal_new("contact_select_done",
                                                    SMS_TYPE_CONTACT_WINDOW,
@@ -262,13 +263,6 @@
 
 static void sms_contact_window_close (SmsContactWindow* self)
 {
-  /* get selected items */
-  SmsContactWindowPrivate* priv = SMS_CONTACT_WINDOW_GET_PRIVATE(self);
-  GtkWidget* contactView = moko_navigation_list_get_tree_view(MOKO_NAVIGATION_LIST(priv->contacts_view));
-  GtkTreeModel* contactModel = gtk_tree_view_get_model (GTK_TREE_VIEW(contactView));
-  gtk_tree_model_foreach (contactModel, get_selected_contact, self);
-  self->selectedContacts = priv->data->contacts;
-
   /* emit selection done signal */
   g_signal_emit (G_OBJECT(self),sms_contact_signals[CONTACT_SELECT_DONE_SIGNAL],0);
 
@@ -314,8 +308,18 @@
 
 }
 
-static void contact_select_done(void)
+static void contact_select_done(SmsContactWindow* self)
 {
   g_debug("select ok");
+  /* get selected items */
+  SmsContactWindowPrivate* priv = SMS_CONTACT_WINDOW_GET_PRIVATE(self);
+  GtkWidget* contactView = moko_navigation_list_get_tree_view(MOKO_NAVIGATION_LIST(priv->contacts_view));
+  GtkTreeModel* contactModel = gtk_tree_view_get_model (GTK_TREE_VIEW(contactView));
+  gtk_tree_model_foreach (contactModel, get_selected_contact, self);
 }
 
+GList* sms_get_selected_contacts(SmsContactWindow* self)
+{
+  SmsContactWindowPrivate* priv = SMS_CONTACT_WINDOW_GET_PRIVATE(self);
+  return priv->data->contacts;
+}

Modified: trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-contact-window.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-contact-window.h	2007-03-28 21:20:58 UTC (rev 1544)
+++ trunk/src/target/OM-2007/applications/openmoko-messages/src/sms-contact-window.h	2007-03-29 03:55:51 UTC (rev 1545)
@@ -36,9 +36,6 @@
 #define SMS_IS_CONTACT_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), SMS_TYPE_CONTACT_WINDOW_CLASS)
 #define SMS_GET_CONTACT_WINDOW_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SMS_TYPE_CONTACT_WINDOW, SmsContactWindowClass)
 
-GType sms_contact_window_get_type();
-GtkWidget* sms_contact_new();
-
 enum {
   CONTACT_SEL_COL,
   CONTACT_NAME_COL,
@@ -55,7 +52,6 @@
 {
   MokoWindow parent;
   /* instance members */
-  GList* selectedContacts;
 }SmsContactWindow;
 
 typedef struct
@@ -72,6 +68,10 @@
   GList* contacts;
 }SmsContactData;
 
+GType sms_contact_window_get_type();
+GtkWidget* sms_contact_new();
+GList* sms_get_selected_contacts(SmsContactWindow* self);
+
 G_END_DECLS
 
 #endif