r3705 - in trunk/src/target/OM-2007.2/applications/openmoko-messages2: . src
chris at sita.openmoko.org
chris at sita.openmoko.org
Thu Dec 20 15:24:38 CET 2007
Author: chris
Date: 2007-12-20 15:24:37 +0100 (Thu, 20 Dec 2007)
New Revision: 3705
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c
Log:
* src/sms-notes.c: (note_changed_cb), (page_shown):
Fix avatars not appearing when viewing messages from unknown contacts
Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog 2007-12-20 13:32:25 UTC (rev 3704)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog 2007-12-20 14:24:37 UTC (rev 3705)
@@ -1,3 +1,8 @@
+2007-12-20 Chris Lord <chris at openedhand.com>
+
+ * src/sms-notes.c: (note_changed_cb), (page_shown):
+ Fix avatars not appearing when viewing messages from unknown contacts
+
2007-12-18 Chris Lord <chris at openedhand.com>
* src/sms-contacts.c: (page_shown),
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-12-20 13:32:25 UTC (rev 3704)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c 2007-12-20 14:24:37 UTC (rev 3705)
@@ -72,9 +72,6 @@
} else {
data->recipient_icon =
sms_contact_load_photo (contact);
- if ((!data->recipient_icon) && (data->no_photo))
- data->recipient_icon =
- g_object_ref (data->no_photo);
g_object_unref (contact);
break;
}
@@ -82,9 +79,13 @@
note_changed_cb_end:
/* Remove handlers */
- if (data->recipient_number)
+ if (data->recipient_number) {
+ if ((!data->recipient_icon) && (data->no_photo))
+ data->recipient_icon =
+ g_object_ref (data->no_photo);
g_signal_handlers_disconnect_by_func (
store_view, note_changed_cb, data);
+ }
}
static gboolean
@@ -162,7 +163,14 @@
GList *u, *components = NULL;
/* Assume the 'unknown' contact was selected */
- data->author_icon = g_object_ref (data->no_photo);
+ if (data->no_photo) {
+ data->author_icon = g_object_ref (data->no_photo);
+
+ /* Without the author UID, we won't be able to
+ * identify the recipient - so set their photo here
+ */
+ data->recipient_icon = g_object_ref (data->no_photo);
+ }
/* Manually feed the notes in - this is a bit naughty as if
* they change, we won't be notified...
@@ -191,7 +199,7 @@
}
data->author_icon = sms_contact_load_photo (contact);
- if (!data->author_icon)
+ if ((!data->author_icon) && (data->no_photo))
data->author_icon = g_object_ref (data->no_photo);
store_view = jana_store_get_view (data->notes);
More information about the commitlog
mailing list