From b61c94016afe8a598f3b7f576430f790c6898a4f Mon Sep 17 00:00:00 2001
From: Aleksander Morgado <aleksander@lanedo.com>
Date: Thu, 9 Feb 2012 13:07:29 +0100
Subject: [PATCH] api,dbus: remove the option to send the SMS in the Create()
 call

An SMS must be first created with the Messaging interface, and then sent using the
Send() method from the SMS-specific interface.
---
 cli/mmcli-modem-messaging.c                           | 2 --
 libmm-glib/mm-modem-messaging.c                       | 6 ------
 libmm-glib/mm-modem-messaging.h                       | 2 --
 new/org.freedesktop.ModemManager1.Modem.Messaging.xml | 6 ++----
 src/mm-iface-modem-messaging.c                        | 1 -
 5 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/cli/mmcli-modem-messaging.c b/cli/mmcli-modem-messaging.c
index c2156db9..b8052e07 100644
--- a/cli/mmcli-modem-messaging.c
+++ b/cli/mmcli-modem-messaging.c
@@ -272,7 +272,6 @@ get_modem_ready (GObject      *source,
         g_debug ("Asynchronously creating new SMS in modem...");
         mm_modem_messaging_create (ctx->modem_messaging,
                                    properties,
-                                   FALSE, /* never send it here */
                                    ctx->cancellable,
                                    (GAsyncReadyCallback)create_ready,
                                    NULL);
@@ -349,7 +348,6 @@ mmcli_modem_messaging_run_synchronous (GDBusConnection *connection)
         g_debug ("Synchronously creating new SMS in modem...");
         sms = mm_modem_messaging_create_sync (ctx->modem_messaging,
                                               properties,
-                                              FALSE, /* never send it here */
                                               NULL,
                                               &error);
         g_object_unref (properties);
diff --git a/libmm-glib/mm-modem-messaging.c b/libmm-glib/mm-modem-messaging.c
index ca1d583f..7eabf6a3 100644
--- a/libmm-glib/mm-modem-messaging.c
+++ b/libmm-glib/mm-modem-messaging.c
@@ -374,7 +374,6 @@ create_sms_ready (MMModemMessaging *self,
  * mm_modem_messaging_create_sms:
  * @self: A #MMModemMessaging.
  * @properties: A ##MMSmsProperties object with the properties to use.
- * @send: #TRUE if the SMS should be also sent, #FALSE otherwise.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
  * @user_data: User data to pass to @callback.
@@ -389,7 +388,6 @@ create_sms_ready (MMModemMessaging *self,
 void
 mm_modem_messaging_create (MMModemMessaging *self,
                            MMSmsProperties *properties,
-                           gboolean send,
                            GCancellable *cancellable,
                            GAsyncReadyCallback callback,
                            gpointer user_data)
@@ -412,7 +410,6 @@ mm_modem_messaging_create (MMModemMessaging *self,
     mm_gdbus_modem_messaging_call_create (
         self,
         dictionary,
-        send,
         cancellable,
         (GAsyncReadyCallback)create_sms_ready,
         ctx);
@@ -424,7 +421,6 @@ mm_modem_messaging_create (MMModemMessaging *self,
  * mm_modem_create_sms_sync:
  * @self: A #MMModemMessaging.
  * @properties: A ##MMSmsProperties object with the properties to use.
- * @send: #TRUE if the SMS should be also sent, #FALSE otherwise.
  * @cancellable: (allow-none): A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
@@ -438,7 +434,6 @@ mm_modem_messaging_create (MMModemMessaging *self,
 MMSms *
 mm_modem_messaging_create_sync (MMModemMessaging *self,
                                 MMSmsProperties *properties,
-                                gboolean send,
                                 GCancellable *cancellable,
                                 GError **error)
 {
@@ -452,7 +447,6 @@ mm_modem_messaging_create_sync (MMModemMessaging *self,
                       MM_COMMON_SMS_PROPERTIES (properties)));
     mm_gdbus_modem_messaging_call_create_sync (self,
                                                dictionary,
-                                               send,
                                                &sms_path,
                                                cancellable,
                                                error);
diff --git a/libmm-glib/mm-modem-messaging.h b/libmm-glib/mm-modem-messaging.h
index f4243886..7c3c4e53 100644
--- a/libmm-glib/mm-modem-messaging.h
+++ b/libmm-glib/mm-modem-messaging.h
@@ -41,7 +41,6 @@ gchar       *mm_modem_messaging_dup_path (MMModemMessaging *self);
 
 void   mm_modem_messaging_create        (MMModemMessaging *self,
                                          MMSmsProperties *properties,
-                                         gboolean send,
                                          GCancellable *cancellable,
                                          GAsyncReadyCallback callback,
                                          gpointer user_data);
@@ -50,7 +49,6 @@ MMSms *mm_modem_messaging_create_finish (MMModemMessaging *self,
                                          GError **error);
 MMSms *mm_modem_messaging_create_sync   (MMModemMessaging *self,
                                          MMSmsProperties *properties,
-                                         gboolean send,
                                          GCancellable *cancellable,
                                          GError **error);
 
diff --git a/new/org.freedesktop.ModemManager1.Modem.Messaging.xml b/new/org.freedesktop.ModemManager1.Modem.Messaging.xml
index 5c2052d7..aef5063c 100644
--- a/new/org.freedesktop.ModemManager1.Modem.Messaging.xml
+++ b/new/org.freedesktop.ModemManager1.Modem.Messaging.xml
@@ -49,12 +49,11 @@
     <!--
         Create:
         @properties: Message properties from the <link linkend="gdbus-org.freedesktop.ModemManager1.Sms">SMS D-Bus interface</link>.
-        @send: If %TRUE, queue the message for immediate delivery.
         @path: The object path of the new message object.
 
-        Creates a new message object and optionally queues it for delivery.
+        Creates a new message object.
 
-        The '<link linkend="gdbus-property-org-freedesktop-ModemManager1-Sms.To">To</link>'
+        The '<link linkend="gdbus-property-org-freedesktop-ModemManager1-Sms.Number">Number</link>'
         and
         '<link linkend="gdbus-property-org-freedesktop-ModemManager1-Sms.Text">Text</link>'
         properties are mandatory, others are optional.
@@ -64,7 +63,6 @@
     -->
     <method name="Create">
       <arg name="properties" type="a{sv}" direction="in"  />
-      <arg name="send"       type="b"     direction="in"  />
       <arg name="path"       type="o"     direction="out" />
     </method>
 
diff --git a/src/mm-iface-modem-messaging.c b/src/mm-iface-modem-messaging.c
index 68f87497..b461cc61 100644
--- a/src/mm-iface-modem-messaging.c
+++ b/src/mm-iface-modem-messaging.c
@@ -128,7 +128,6 @@ static gboolean
 handle_create (MmGdbusModemMessaging *skeleton,
                GDBusMethodInvocation *invocation,
                GVariant *dictionary,
-               gboolean send,
                MMIfaceModemMessaging *self)
 {
     GError *error = NULL;