diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | introspection/Makefile.am | 1 | ||||
| -rw-r--r-- | introspection/all.xml | 1 | ||||
| -rw-r--r-- | src/mm-generic-cdma.c | 2 | ||||
| -rw-r--r-- | src/mm-modem.c | 5 | ||||
| -rwxr-xr-x | test/mm-test.py | 2 |
6 files changed, 6 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 3923b1bc..aae718e9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ(2.52) -AC_INIT(ModemManager, 0.2.998, dcbw@redhat.com, ModemManager) +AC_INIT(ModemManager, 0.3, dcbw@redhat.com, ModemManager) AM_INIT_AUTOMAKE([1.9 subdir-objects tar-ustar no-dist-gzip dist-bzip2]) AM_MAINTAINER_MODE diff --git a/introspection/Makefile.am b/introspection/Makefile.am index e24dca4b..404c1d93 100644 --- a/introspection/Makefile.am +++ b/introspection/Makefile.am @@ -1,4 +1,5 @@ EXTRA_DIST = \ + all.xml \ mm-manager.xml \ mm-mobile-error.xml \ mm-modem.xml \ diff --git a/introspection/all.xml b/introspection/all.xml index 54ac8a85..426baf0e 100644 --- a/introspection/all.xml +++ b/introspection/all.xml @@ -24,6 +24,7 @@ <xi:include href="mm-manager.xml"/> <xi:include href="mm-modem.xml"/> + <xi:include href="mm-modem-simple.xml"/> <xi:include href="mm-modem-cdma.xml"/> <xi:include href="mm-modem-gsm.xml"/> <xi:include href="mm-modem-gsm-card.xml"/> diff --git a/src/mm-generic-cdma.c b/src/mm-generic-cdma.c index dbaeb662..50cd86cb 100644 --- a/src/mm-generic-cdma.c +++ b/src/mm-generic-cdma.c @@ -598,7 +598,7 @@ connect (MMModem *modem, info = mm_callback_info_new (modem, callback, user_data); command = g_strconcat ("DT", number, NULL); - mm_serial_port_queue_command (priv->primary, command, 60, dial_done, info); + mm_serial_port_queue_command (priv->primary, command, 90, dial_done, info); g_free (command); } diff --git a/src/mm-modem.c b/src/mm-modem.c index 27b77954..a65d8831 100644 --- a/src/mm-modem.c +++ b/src/mm-modem.c @@ -36,9 +36,6 @@ static void impl_modem_get_info (MMModem *modem, DBusGMethodInvocation *context) GError * mm_modem_check_removed (MMModem *self, const GError *error) { - if (g_error_matches (error, MM_MODEM_ERROR, MM_MODEM_ERROR_REMOVED)) - return g_error_copy (error); - if (!self) { /* If the modem was NULL, the error *should* have been * MM_MODEM_ERROR_REMOVED. If it wasn't, make it that. @@ -48,7 +45,7 @@ mm_modem_check_removed (MMModem *self, const GError *error) "The modem was removed."); } - return NULL; + return error ? g_error_copy (error) : NULL; } static void diff --git a/test/mm-test.py b/test/mm-test.py index a0af8419..99a355f1 100755 --- a/test/mm-test.py +++ b/test/mm-test.py @@ -83,7 +83,7 @@ def cdma_connect(proxy, user, password): # Modem.Simple interface simple = dbus.Interface(proxy, dbus_interface=MM_DBUS_INTERFACE_MODEM_SIMPLE) try: - simple.Connect({'number':"#777"}, timeout=60) + simple.Connect({'number':"#777"}, timeout=92) print "\nConnected!" return True except Exception, e: |