r3515 - in trunk/src/target/OM-2007.2/applications/openmoko-messages2: . src
chris at sita.openmoko.org
chris at sita.openmoko.org
Mon Nov 26 17:28:12 CET 2007
Author: chris
Date: 2007-11-26 17:28:11 +0100 (Mon, 26 Nov 2007)
New Revision: 3515
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 contacts without avatars not getting the stock_person icon
Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog 2007-11-26 16:17:23 UTC (rev 3514)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog 2007-11-26 16:28:11 UTC (rev 3515)
@@ -4,6 +4,14 @@
* src/sms-notes.c: (page_shown):
* src/sms-utils.c: (sms_get_selected_contact):
* src/sms-utils.h:
+ Fix contacts without avatars not getting the stock_person icon
+
+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>
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 16:17:23 UTC (rev 3514)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-compose.c 2007-11-26 16:28:11 UTC (rev 3515)
@@ -46,7 +46,7 @@
gtk_combo_box_remove_text (GTK_COMBO_BOX (
data->number_combo), 0);
- if (!(contact = sms_get_selected_contact (data, NULL))) {
+ if (!(contact = sms_get_selected_contact (data))) {
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 16:17:23 UTC (rev 3514)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c 2007-11-26 16:28:11 UTC (rev 3515)
@@ -87,9 +87,12 @@
if (!open) return;
- if (!(contact = sms_get_selected_contact (
- data, &data->author_icon))) return;
+ if (!(contact = sms_get_selected_contact (data))) return;
+ data->author_icon = sms_contact_load_photo (contact);
+ if (!data->author_icon)
+ data->author_icon = g_object_ref (data->no_photo);
+
store_view = jana_store_get_view (data->notes);
for (i = E_CONTACT_FIRST_PHONE_ID; i <= E_CONTACT_LAST_PHONE_ID; i++) {
const gchar *number = e_contact_get_const (
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 16:17:23 UTC (rev 3514)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.c 2007-11-26 16:28:11 UTC (rev 3515)
@@ -24,7 +24,7 @@
#endif
EContact *
-sms_get_selected_contact (SmsData *data, GdkPixbuf **icon)
+sms_get_selected_contact (SmsData *data)
{
GtkTreeSelection *selection;
GtkTreeModel *model;
@@ -38,12 +38,7 @@
if (!gtk_tree_selection_get_selected (selection, &model, &iter))
return NULL;
- 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);
+ 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 16:17:23 UTC (rev 3514)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-utils.h 2007-11-26 16:28:11 UTC (rev 3515)
@@ -22,7 +22,7 @@
#include "sms.h"
-EContact *sms_get_selected_contact (SmsData *data, GdkPixbuf **icon);
+EContact *sms_get_selected_contact (SmsData *data);
GdkPixbuf *sms_contact_load_photo (EContact *contact);
#endif /* SMS_UTILS_H */
More information about the commitlog
mailing list