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

[thomas at sita.openmoko.org]

Author: thomas
Date: 2008-04-07 18:01:59 +0200 (Mon, 07 Apr 2008)
New Revision: 4320

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/moko-save-number.c
   trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
Log:
2008-04-07  Thomas Wood  <thomas at openedhand.com>

	* src/moko-save-number.c: (moko_save_number): Check number is not blank,
	and warn user if it is.

	* src/sms-notes.c: (save_contact_clicked_cb): Add recipient number if
	SMS was "Sent".


Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog	2008-04-07 16:00:49 UTC (rev 4319)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog	2008-04-07 16:01:59 UTC (rev 4320)
@@ -1,7 +1,15 @@
 2008-04-07  Thomas Wood  <thomas at openedhand.com>
 
-	* src/test-notes.c: (main): Add support for recipient and "Sent" flag
+	* src/moko-save-number.c: (moko_save_number): Check number is not blank,
+	and warn user if it is.
 
+	* src/sms-notes.c: (save_contact_clicked_cb): Add recipient number if
+	SMS was "Sent".
+
+2008-04-07  Thomas Wood  <thomas at openedhand.com>
+
+	* src/test-notes.c: (main): Add 
+
 2008-04-03  Thomas Wood  <thomas at openedhand.com>
 
 	* src/moko-save-number.c: (create_new_contact_from_number),

Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/moko-save-number.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/moko-save-number.c	2008-04-07 16:00:49 UTC (rev 4319)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/moko-save-number.c	2008-04-07 16:01:59 UTC (rev 4320)
@@ -217,6 +217,18 @@
   GtkWidget *window, *btn, *vbox;
   SaveButtonInfo *btn_info;
 
+g_debug ("Sae number %s", number);
+
+  if (!number || !strcmp (number, ""))
+  {
+    GtkWidget *dlg;
+    dlg = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
+                                  "No number available");
+    gtk_dialog_run (GTK_DIALOG (dlg));
+    gtk_widget_destroy (dlg);
+    return;
+  }
+
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_DIALOG);
   gtk_window_set_title (GTK_WINDOW (window), number);

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	2008-04-07 16:00:49 UTC (rev 4319)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c	2008-04-07 16:01:59 UTC (rev 4320)
@@ -617,7 +617,9 @@
 	GtkTreeSelection *selection;
 	GtkTreeModel *model;
 	GtkTreeIter iter;
-	gchar *author;
+	gchar *author, *recipient, **categories;
+	gboolean sent;
+	gint i;
   
 	selection = gtk_tree_view_get_selection (
 		GTK_TREE_VIEW (data->notes_treeview));
@@ -626,11 +628,30 @@
 		return;
 	
 	gtk_tree_model_get (model, &iter,
-		JANA_GTK_NOTE_STORE_COL_AUTHOR, &author, -1);
+		JANA_GTK_NOTE_STORE_COL_AUTHOR, &author,
+		JANA_GTK_NOTE_STORE_COL_RECIPIENT, &recipient,
+		JANA_GTK_NOTE_STORE_COL_CATEGORIES, &categories, -1);
+
+	/* find out if the SMS was sent or received, so we can save the
+	 * appropriate number */
+	sent = FALSE;
+	for (i = 0; categories[i]; i++)
+	{
+		if (!strcmp (categories[i], "Sent"))
+		{
+			sent = TRUE;
+			break;
+		}
+	}
+
+	if (sent)
+		moko_save_number (recipient);
+	else
+		moko_save_number (author);
   
-	moko_save_number (author);
-  
 	g_free (author);
+	g_free (recipient);
+	g_strfreev (categories);
 }
 
 static void