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

chris at sita.openmoko.org chris at sita.openmoko.org
Fri Dec 21 14:01:58 CET 2007


Author: chris
Date: 2007-12-21 14:01:56 +0100 (Fri, 21 Dec 2007)
New Revision: 3717

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.h
Log:
        * src/sms.h:
        * src/sms-compose.c: (send_clicked_cb), (sms_compose_page_new):
        Add a check-box for delivery status reports, adapt to altered API in
        phone-kit

        * src/sms-notes.c: (mark_messages_read_idle):
        Fix possible crash when marking messages as read


Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog	2007-12-21 13:00:39 UTC (rev 3716)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog	2007-12-21 13:01:56 UTC (rev 3717)
@@ -1,3 +1,13 @@
+2007-12-21  Chris Lord  <chris at openedhand.com>
+
+	* src/sms.h:
+	* src/sms-compose.c: (send_clicked_cb), (sms_compose_page_new):
+	Add a check-box for delivery status reports, adapt to altered API in
+	phone-kit
+
+	* src/sms-notes.c: (mark_messages_read_idle):
+	Fix possible crash when marking messages as read
+
 2007-12-20  Chris Lord  <chris at openedhand.com>
 
 	* src/sms-notes.c: (sms_notes_data_func):

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-12-21 13:00:39 UTC (rev 3716)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-compose.c	2007-12-21 13:01:56 UTC (rev 3717)
@@ -167,11 +167,13 @@
 			buffer, &start, &end, FALSE);
 		
 		if (message && (message[0] != '\0')) {
+			gboolean sr = gtk_toggle_button_get_active (
+				GTK_TOGGLE_BUTTON (data->delivery_checkbox));
 			g_debug ("Sending message '%s' to %s", message, number);
 			if (!dbus_g_proxy_call (data->sms_proxy, "Send",
 			     &error, G_TYPE_STRING, number, G_TYPE_STRING,
-			     message, G_TYPE_INVALID, G_TYPE_STRING, NULL,
-			     G_TYPE_INVALID)) {
+			     message, G_TYPE_BOOLEAN, sr, G_TYPE_INVALID,
+			     G_TYPE_STRING, NULL, G_TYPE_INVALID)) {
 				g_warning ("Error sending message: %s",
 					error->message);
 				g_error_free (error);
@@ -218,7 +220,7 @@
 GtkWidget *
 sms_compose_page_new (SmsData *data)
 {
-	GtkWidget *vbox, *frame, *contact_table;
+	GtkWidget *vbox, *frame, *contact_table, *align;
 	
 	/* Connect to new/send button clicked */
 	g_signal_connect (data->new_button, "clicked",
@@ -259,10 +261,18 @@
 	text_changed_cb (gtk_text_view_get_buffer (
 		GTK_TEXT_VIEW (data->sms_textview)), data);
 	
+	align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
+	gtk_alignment_set_padding (GTK_ALIGNMENT (align), 6, 6, 6, 6);
+	data->delivery_checkbox = gtk_check_button_new_with_label (
+		"Request delivery report");
+	gtk_container_add (GTK_CONTAINER (align), data->delivery_checkbox);
+	
 	/* Pack widgets */
 	vbox = gtk_vbox_new (FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (vbox), contact_table, FALSE, TRUE, 0);
 	gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (vbox), align,
+		FALSE, TRUE, 0);
 
 	/* Add events for detecting whether the page has been hidden/shown */
 	gtk_widget_add_events (data->sms_textview, GDK_VISIBILITY_NOTIFY_MASK);

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-21 13:00:39 UTC (rev 3716)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-notes.c	2007-12-21 13:01:56 UTC (rev 3717)
@@ -93,6 +93,7 @@
 {
 	GtkTreePath *start_path, *end_path;
 	
+	data->notes_scroll_idle = 0;
 	if (gtk_tree_view_get_visible_range (
 	    GTK_TREE_VIEW (data->notes_treeview), &start_path, &end_path)) {
 		
@@ -101,8 +102,12 @@
 			GtkTreeIter iter;
 			gchar *uid;
 
-			gtk_tree_model_get_iter (data->note_filter,
-				&iter, start_path);
+			if (!gtk_tree_model_get_iter (data->note_filter,
+			     &iter, start_path)) {
+				gtk_tree_path_next (start_path);
+				continue;
+			}
+			
 			gtk_tree_model_get (data->note_filter, &iter,
 				JANA_GTK_NOTE_STORE_COL_UID, &uid, -1);
 			

Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms.h
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms.h	2007-12-21 13:00:39 UTC (rev 3716)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms.h	2007-12-21 13:01:56 UTC (rev 3717)
@@ -75,6 +75,7 @@
 	GtkWidget *contact_image;
 	GtkWidget *contact_label;
 	GtkWidget *number_combo;
+	GtkWidget *delivery_checkbox;
 
 	DBusGProxy *sms_proxy;
 } SmsData;





More information about the commitlog mailing list