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

thomas at sita.openmoko.org thomas at sita.openmoko.org
Thu Apr 3 12:30:04 CEST 2008


Author: thomas
Date: 2008-04-03 12:30:02 +0200 (Thu, 03 Apr 2008)
New Revision: 4304

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/moko-save-number.h
   trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
Log:
2008-04-03  Thomas Wood  <thomas at openedhand.com>

	* src/moko-save-number.c: (create_new_contact_from_number),
	(btn_save_info_weak_notify), (moko_save_number):
	* src/moko-save-number.h:
	* src/sms-notes.c:

	Fix some compiler warnings and possible double free


Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog	2008-04-03 10:28:43 UTC (rev 4303)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog	2008-04-03 10:30:02 UTC (rev 4304)
@@ -1,5 +1,14 @@
 2008-04-03  Thomas Wood  <thomas at openedhand.com>
 
+	* src/moko-save-number.c: (create_new_contact_from_number),
+	(btn_save_info_weak_notify), (moko_save_number):
+	* src/moko-save-number.h:
+	* src/sms-notes.c:
+
+	Fix some compiler warnings and possible double free
+
+2008-04-03  Thomas Wood  <thomas at openedhand.com>
+
 	* src/test-notes.c: (main): Add optional message and author command line
 	parameters
 

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-03 10:28:43 UTC (rev 4303)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/moko-save-number.c	2008-04-03 10:30:02 UTC (rev 4304)
@@ -70,11 +70,13 @@
     EContact *contact;
     EBook *book;
     EVCardAttribute *attr;
+    const gchar *s;
 
     /* create contact */
     contact = e_contact_new ();
     /* add name */
-    e_contact_set (contact, E_CONTACT_FULL_NAME, gtk_entry_get_text (GTK_ENTRY (name)));
+    s = gtk_entry_get_text (GTK_ENTRY (name));
+    e_contact_set (contact, E_CONTACT_FULL_NAME, (const gpointer) s);
     /* add number */
     attr = e_vcard_attribute_new ("", EVC_TEL);
     e_vcard_add_attribute_with_value (E_VCARD (contact), attr, number);
@@ -210,7 +212,7 @@
 }
 
 void
-moko_save_number (gchar *number)
+moko_save_number (const gchar *number)
 {
   GtkWidget *window, *btn, *vbox;
   SaveButtonInfo *btn_info;
@@ -240,8 +242,6 @@
   g_signal_connect (btn, "clicked", G_CALLBACK (on_btn_save_clicked), btn_info);
   g_object_weak_ref (G_OBJECT (btn), (GWeakNotify) btn_save_info_weak_notify, btn_info);
   
-  g_free (number);
-  
   gtk_widget_show_all (window);
 }
 

Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/moko-save-number.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/moko-save-number.h	2008-04-03 10:28:43 UTC (rev 4303)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/moko-save-number.h	2008-04-03 10:30:02 UTC (rev 4304)
@@ -18,4 +18,4 @@
  */
 
 
-void moko_save_number (gchar *number);
+void moko_save_number (const gchar *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-03 10:28:43 UTC (rev 4303)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c	2008-04-03 10:30:02 UTC (rev 4304)
@@ -32,6 +32,8 @@
 #include <libebook/e-book.h>
 #include <string.h>
 
+#include "moko-save-number.h"
+
 static GdkColor alt_color;
 static gboolean hidden = TRUE;
 static gboolean open = FALSE;





More information about the commitlog mailing list