From 8b863c5a4bd03a6b8ff668e25f750b51bc19ddbe Mon Sep 17 00:00:00 2001
From: Aleksander Morgado <aleksander@lanedo.com>
Date: Wed, 25 Jul 2012 10:15:38 +0200
Subject: libmm-glib: don't change default DBus timeout when running
 Modem.Command()

Just warn if the default DBus timeout is shorter than the one being requested.
---
 libmm-glib/mm-modem.c | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

(limited to 'libmm-glib/mm-modem.c')

diff --git a/libmm-glib/mm-modem.c b/libmm-glib/mm-modem.c
index 99fbd8fc..db7d7299 100644
--- a/libmm-glib/mm-modem.c
+++ b/libmm-glib/mm-modem.c
@@ -1487,19 +1487,17 @@ mm_modem_command (MMModem *self,
                   GAsyncReadyCallback callback,
                   gpointer user_data)
 {
-    gint old_timeout;
 
     g_return_if_fail (MM_GDBUS_IS_MODEM (self));
 
-    old_timeout = g_dbus_proxy_get_default_timeout (G_DBUS_PROXY (self));
-    g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (self), (timeout + 1) * 1000);
+    if (g_dbus_proxy_get_default_timeout (G_DBUS_PROXY (self)) < timeout)
+        g_warning ("Requested command timeout is shorter than the default DBus timeout");
     mm_gdbus_modem_call_command (self,
                                  cmd,
                                  timeout,
                                  cancellable,
                                  callback,
                                  user_data);
-    g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (self), old_timeout);
 }
 
 gchar *
@@ -1528,22 +1526,18 @@ mm_modem_command_sync (MMModem *self,
                        GError **error)
 {
     gchar *result;
-    gboolean success;
-    gint old_timeout;
 
     g_return_val_if_fail (MM_GDBUS_IS_MODEM (self), NULL);
 
-    old_timeout = g_dbus_proxy_get_default_timeout (G_DBUS_PROXY (self));
-    g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (self), (timeout + 1) * 1000);
-    success = mm_gdbus_modem_call_command_sync (self,
-                                                cmd,
-                                                timeout,
-                                                &result,
-                                                cancellable,
-                                                error);
-    g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (self), old_timeout);
+    if (g_dbus_proxy_get_default_timeout (G_DBUS_PROXY (self)) < timeout)
+        g_warning ("Requested command timeout is shorter than the default DBus timeout");
 
-    if (!success)
+    if (!mm_gdbus_modem_call_command_sync (self,
+                                           cmd,
+                                           timeout,
+                                           &result,
+                                           cancellable,
+                                           error))
         return NULL;
 
     return result;
-- 
cgit v1.2.3-70-g09d2