Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r4242 - in
trunk/src/target/OM-2007.2/applications/openmoko-messages2: . src
([EMAIL PROTECTED])
--- Begin Message ---
Author: erin_yueh
Date: 2008-03-24 10:54:57 +0100 (Mon, 24 Mar 2008)
New Revision: 4242
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-compose.h
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-dbus.c
Log:
openmoko-messages2: display recipient number from call log
Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2008-03-20 17:30:04 UTC (rev 4241)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
2008-03-24 09:54:57 UTC (rev 4242)
@@ -1,3 +1,16 @@
+2008-03-24 Erin Yueh <[EMAIL PROTECTED]>
+
+ * src/sms-compose.c: (page_shown), (sms_compose_refresh):
+ Display the recipient_number from Call logs (bug#1245)
+
+ * src/sms-compose.h: (sms_compose_refresh):
+ * src/sms-dbus.c: (send_message_idle), (sms_dbus_send_message):
+
+2008-03-09 Erin Yueh <[EMAIL PROTECTED]>
+
+ * src/sms-notes.c: (notes_visible_func)
+ fix the category filter (bug#1246)
+
2008-01-22 Chris Lord <[EMAIL PROTECTED]>
* src/sms.h:
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
2008-03-20 17:30:04 UTC (rev 4241)
+++
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-compose.c
2008-03-24 09:54:57 UTC (rev 4242)
@@ -54,47 +54,56 @@
"stock_person", GTK_ICON_SIZE_DIALOG);
gtk_label_set_markup (GTK_LABEL (data->contact_label),
"<big>Unknown</big>");
- return;
+ if(!data->recipient_number)
+ return;
}
- /* Fill contact photo */
- photo = sms_contact_load_photo (contact);
- if (photo) {
- gtk_image_set_from_pixbuf (GTK_IMAGE (
- data->contact_image), photo);
- g_object_unref (photo);
+ if(data->recipient_number) {
+ /* Fill number combo */
+ gtk_combo_box_append_text (GTK_COMBO_BOX (data->number_combo),
+ data->recipient_number);
+
+ gtk_combo_box_set_active (GTK_COMBO_BOX (data->number_combo),
0);
+ gtk_entry_set_text (GTK_ENTRY (GTK_BIN (
+ data->number_combo)->child),
+ gtk_combo_box_get_active_text (
+ GTK_COMBO_BOX (data->number_combo)));
} else {
- gtk_image_set_from_icon_name (GTK_IMAGE (data->contact_image),
- "stock_person", GTK_ICON_SIZE_DIALOG);
- }
-
- /* Fill contact label */
- string = g_strconcat ("<big>", e_contact_get_const (
+ /* Fill contact photo */
+ photo = sms_contact_load_photo (contact);
+ if (photo) {
+ gtk_image_set_from_pixbuf (GTK_IMAGE (
+ data->contact_image), photo);
+ g_object_unref (photo);
+ } else {
+ gtk_image_set_from_icon_name (GTK_IMAGE
+ (data->contact_image),
+ "stock_person", GTK_ICON_SIZE_DIALOG);
+ }
+ /* Fill contact label */
+ string = g_strconcat ("<big>", e_contact_get_const (
contact, E_CONTACT_FULL_NAME), "</big>", NULL);
- gtk_label_set_markup (GTK_LABEL (data->contact_label), string);
- g_free (string);
+ gtk_label_set_markup (GTK_LABEL (data->contact_label), string);
+ g_free (string);
- /* Fill number combo */
- numbers = hito_vcard_get_named_attributes (E_VCARD (contact), EVC_TEL);
- for (n = numbers; n; n = n->next) {
- gchar *number = hito_vcard_attribute_get_value_string (
- (EVCardAttribute *)n->data);
-
- if (!number) continue;
-
- gtk_combo_box_append_text (GTK_COMBO_BOX (data->number_combo),
- number);
- g_free (number);
- }
- g_list_free (numbers);
-
- gtk_combo_box_set_active (GTK_COMBO_BOX (data->number_combo), 0);
- gtk_entry_set_text (GTK_ENTRY (GTK_BIN (
- data->number_combo)->child),
+ /* Fill number combo */
+ numbers = hito_vcard_get_named_attributes (E_VCARD (contact),
EVC_TEL);
+ for (n = numbers; n; n = n->next) {
+ gchar *number = hito_vcard_attribute_get_value_string (
+ (EVCardAttribute *)n->data);
+ if (!number) continue;
+ gtk_combo_box_append_text (GTK_COMBO_BOX
(data->number_combo),
+ number);
+ g_free (number);
+ }
+ g_list_free (numbers);
+ gtk_combo_box_set_active (GTK_COMBO_BOX (data->number_combo),
0);
+ gtk_entry_set_text (GTK_ENTRY (GTK_BIN (
+ data->number_combo)->child),
gtk_combo_box_get_active_text (
GTK_COMBO_BOX (data->number_combo)));
-
- g_object_unref (contact);
+ g_object_unref (contact);
+ }
}
static void
@@ -106,8 +115,9 @@
}
void
-sms_compose_refresh (SmsData *data)
+sms_compose_refresh (SmsData *data, const gchar *number)
{
+ data->recipient_number = g_strdup (number);
if (gtk_notebook_get_current_page (GTK_NOTEBOOK (data->notebook)) ==
SMS_PAGE_COMPOSE) {
page_hidden (data);
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-compose.h
===================================================================
---
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-compose.h
2008-03-20 17:30:04 UTC (rev 4241)
+++
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-compose.h
2008-03-24 09:54:57 UTC (rev 4242)
@@ -23,6 +23,6 @@
#include "sms.h"
GtkWidget *sms_compose_page_new (SmsData *data);
-void sms_compose_refresh (SmsData *data);
+void sms_compose_refresh (SmsData *data, const gchar *number);
#endif /* SMS_COMPOSE_H */
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-dbus.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-dbus.c
2008-03-20 17:30:04 UTC (rev 4241)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-dbus.c
2008-03-24 09:54:57 UTC (rev 4242)
@@ -82,8 +82,8 @@
send_message_idle (SmsDbusData *data)
{
if (data->data->book_seq_complete) {
- if (sms_select_contact (data->data, data->uid))
- sms_compose_refresh (data->data);
+ sms_select_contact (data->data, data->uid);
+ sms_compose_refresh (data->data,data->number);
free_data (data);
return FALSE;
@@ -118,22 +118,19 @@
{
EContact *contact;
- if (e_book_get_contact (sms_dbus->priv->ebook, uid, &contact, error)) {
- SmsDbusData *data;
-
- g_object_unref (contact);
-
- data = g_slice_new0 (SmsDbusData);
- data->data = sms_dbus->priv;
- data->uid = g_strdup (uid);
- data->number = g_strdup (number);
- data->message = g_strdup (message);
-
- g_idle_add ((GSourceFunc)send_message_idle, data);
-
- return TRUE;
- } else
- return FALSE;
+ SmsDbusData *data;
+
+ g_object_unref (contact);
+
+ data = g_slice_new0 (SmsDbusData);
+ data->data = sms_dbus->priv;
+ data->uid = g_strdup (uid);
+ data->number = g_strdup (number);
+ data->message = g_strdup (message);
+ g_idle_add ((GSourceFunc)send_message_idle, data);
+
+ return TRUE;
+
}
gboolean
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
