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

[chris at sita.openmoko.org]

Author: chris
Date: 2007-12-06 12:22:14 +0100 (Thu, 06 Dec 2007)
New Revision: 3599

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-main.c
Log:
        * src/sms-compose.c: (send_clicked_cb):
        * src/sms-main.c: (main):
        Sync with phone-kit changes


Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog	2007-12-06 11:22:03 UTC (rev 3598)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/ChangeLog	2007-12-06 11:22:14 UTC (rev 3599)
@@ -1,3 +1,9 @@
+2007-12-06  Chris Lord  <chris at openedhand.com>
+
+	* src/sms-compose.c: (send_clicked_cb):
+	* src/sms-main.c: (main):
+	Sync with phone-kit changes
+
 2007-11-26  Chris Lord  <chris at openedhand.com>
 
 	* src/sms-compose.c: (page_shown):

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-06 11:22:03 UTC (rev 3598)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-compose.c	2007-12-06 11:22:14 UTC (rev 3599)
@@ -149,9 +149,6 @@
 	
 	if (hidden) return;
 	
-	gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (
-		data->new_button), FALSE);
-
 	number = gtk_entry_get_text (GTK_ENTRY (
 		GTK_BIN (data->number_combo)->child));
 	
@@ -166,7 +163,7 @@
 		
 		if (message && (message[0] != '\0')) {
 			g_debug ("Sending message '%s' to %s", message, number);
-			if (!dbus_g_proxy_call (data->sms_proxy, "SendSms",
+			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)) {

Modified: trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-main.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-main.c	2007-12-06 11:22:03 UTC (rev 3598)
+++ trunk/src/target/OM-2007.2/applications/openmoko-messages2/src/sms-main.c	2007-12-06 11:22:14 UTC (rev 3599)
@@ -66,8 +66,8 @@
 		data.sms_proxy = NULL;
 	} else {
 		data.sms_proxy = dbus_g_proxy_new_for_name (connection,
-			"org.openmoko.Dialer", "/org/openmoko/Dialer",
-			"org.openmoko.Dialer");
+			"org.openmoko.PhoneKit", "/org/openmoko/PhoneKit/Sms",
+			"org.openmoko.PhoneKit.Sms");
 	}
 
 	data.window = gtk_window_new (GTK_WINDOW_TOPLEVEL);