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

[chris at sita.openmoko.org]

Author: chris
Date: 2007-11-26 17:17:23 +0100 (Mon, 26 Nov 2007)
New Revision: 3514

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-compose.c
   trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
   trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.c
   trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.h
Log:
	* src/sms-compose.c: (page_shown):
        * src/sms-notes.c: (page_shown):
        * src/sms-utils.c: (sms_get_selected_contact):
        * src/sms-utils.h: 
        Fix leak in function to get selected contact


Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog	2007-11-26 15:24:01 UTC (rev 3513)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog	2007-11-26 16:17:23 UTC (rev 3514)
@@ -1,3 +1,11 @@
+2007-11-26  Chris Lord  <chris at openedhand.com>
+
+	* src/sms-compose.c: (page_shown):
+	* src/sms-notes.c: (page_shown):
+	* src/sms-utils.c: (sms_get_selected_contact):
+	* src/sms-utils.h:
+	Fix leak in function to get selected contact
+
 2007-11-23  Chris Lord  <chris at openedhand.com>
 
 	* src/sms-compose.c: (send_clicked_cb):

Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-compose.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-compose.c	2007-11-26 15:24:01 UTC (rev 3513)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-compose.c	2007-11-26 16:17:23 UTC (rev 3514)
@@ -46,7 +46,7 @@
 		gtk_combo_box_remove_text (GTK_COMBO_BOX (
 			data->number_combo), 0);
 
-	if (!(contact = sms_get_selected_contact (data))) {
+	if (!(contact = sms_get_selected_contact (data, NULL))) {
 		gtk_image_set_from_icon_name (GTK_IMAGE (data->contact_image),
 			"stock_person", GTK_ICON_SIZE_DIALOG);
 		gtk_label_set_markup (GTK_LABEL (data->contact_label),

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	2007-11-26 15:24:01 UTC (rev 3513)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c	2007-11-26 16:17:23 UTC (rev 3514)
@@ -87,7 +87,8 @@
 	
 	if (!open) return;
 	
-	if (!(contact = sms_get_selected_contact (data))) return;
+	if (!(contact = sms_get_selected_contact (
+	      data, &data->author_icon))) return;
 	
 	store_view = jana_store_get_view (data->notes);
 	for (i = E_CONTACT_FIRST_PHONE_ID; i <= E_CONTACT_LAST_PHONE_ID; i++) {

Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.c	2007-11-26 15:24:01 UTC (rev 3513)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.c	2007-11-26 16:17:23 UTC (rev 3514)
@@ -24,7 +24,7 @@
 #endif
 
 EContact *
-sms_get_selected_contact (SmsData *data)
+sms_get_selected_contact (SmsData *data, GdkPixbuf **icon)
 {
 	GtkTreeSelection *selection;
 	GtkTreeModel *model;
@@ -38,8 +38,12 @@
 	
 	if (!gtk_tree_selection_get_selected (selection, &model, &iter))
 		return NULL;
-	gtk_tree_model_get (model, &iter, COL_UID, &data->author_uid,
-		COL_ICON, &data->author_icon, -1);
+	if (icon)
+		gtk_tree_model_get (model, &iter, COL_UID, &data->author_uid,
+			COL_ICON, icon, -1);
+	else
+		gtk_tree_model_get (model, &iter,
+			COL_UID, &data->author_uid, -1);
 	
 	if (!e_book_get_contact (data->ebook,
 	     data->author_uid, &contact, &error)) {

Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.h	2007-11-26 15:24:01 UTC (rev 3513)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.h	2007-11-26 16:17:23 UTC (rev 3514)
@@ -22,7 +22,7 @@
 
 #include "sms.h"
 
-EContact *sms_get_selected_contact (SmsData *data);
+EContact *sms_get_selected_contact (SmsData *data, GdkPixbuf **icon);
 GdkPixbuf *sms_contact_load_photo (EContact *contact);
 
 #endif /* SMS_UTILS_H */