[network-manager-applet] applet: remove obsolete support for ModemManager <= 0.7
- From: Dan Williams <dcbw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet] applet: remove obsolete support for ModemManager <= 0.7
- Date: Mon, 16 Feb 2015 22:03:42 +0000 (UTC)
commit 6f75bfefbd6c0605666191d5153b8a83974a3f1c
Author: Dan Williams <dcbw redhat com>
Date: Mon Feb 16 15:49:06 2015 -0600
applet: remove obsolete support for ModemManager <= 0.7
NetworkManager 1.0 and later don't support the old ModemManager, and
the applet doesn't support old versions of NetworkManager, so remove
the obsolete support and bump the version requirements to NM 1.0+.
configure.ac | 26 +-
src/Makefile.am | 20 +-
src/applet-device-cdma.c | 746 ---------------------
src/applet-device-cdma.h | 32 -
src/applet-device-gsm.c | 1221 -----------------------------------
src/applet-device-gsm.h | 33 -
src/applet.c | 88 +--
src/applet.h | 8 +-
src/gnome-bluetooth/Makefile.am | 13 +-
src/gnome-bluetooth/nma-bt-device.c | 178 +-----
10 files changed, 60 insertions(+), 2305 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f6ce1d5..5452784 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,10 +74,10 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
PKG_CHECK_MODULES(NMA,
[dbus-glib-1 >= 0.74
gio-2.0 >= 2.32
- NetworkManager >= 0.9.10
- libnm-glib >= 0.9.10
- libnm-util >= 0.9.10
- libnm-glib-vpn >= 0.9.10
+ NetworkManager >= 1.0
+ libnm-glib >= 1.0
+ libnm-util >= 1.0
+ libnm-glib-vpn >= 1.0
gmodule-export-2.0])
NMA_CFLAGS="$NMA_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32"
@@ -147,9 +147,9 @@ esac
AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes")
-dnl ModemManager1 with libmm-glib
-AC_ARG_WITH(modem-manager-1, AS_HELP_STRING([--with-modem-manager-1], [Enable new ModemManager1 interface
support]),,[with_modem_manager_1=auto])
-if (test "${with_modem_manager_1}" != "no"); then
+dnl ModemManager1 with libmm-glib for WWAN support
+AC_ARG_WITH(wwan, AS_HELP_STRING([--with-wwan], [Enable WWAN support]),,[with_wwan=auto])
+if (test "${with_wwan}" != "no"); then
PKG_CHECK_MODULES(MM_GLIB,
[mm-glib],
[have_libmm_glib=yes],
@@ -158,20 +158,20 @@ if (test "${with_modem_manager_1}" != "no"); then
AC_SUBST(MM_GLIB_LIBS)
if (test "${have_libmm_glib}" = "no"); then
- if (test "${with_modem_manager_1}" = "yes"); then
+ if (test "${with_wwan}" = "yes"); then
AC_MSG_ERROR([Couldn't find libmm-glib])
fi
else
- with_modem_manager_1="yes"
+ with_wwan="yes"
fi
fi
-if (test "${with_modem_manager_1}" = "yes"); then
- AC_DEFINE(WITH_MODEM_MANAGER_1, 1, [Define if you have ModemManager1 support])
+if (test "${with_wwan}" = "yes"); then
+ AC_DEFINE(WITH_WWAN, 1, [Define if you have ModemManager/WWAN support])
else
- AC_DEFINE(WITH_MODEM_MANAGER_1, 0, [Define if you have ModemManager1 support])
+ AC_DEFINE(WITH_WWAN, 0, [Define if you have ModemManager/WWAN support])
fi
-AM_CONDITIONAL(WITH_MODEM_MANAGER_1, test "${with_modem_manager_1}" = "yes")
+AM_CONDITIONAL(WITH_WWAN, test "${with_wwan}" = "yes")
dnl Check for gudev
PKG_CHECK_MODULES(GUDEV, gudev-1.0 >= 147)
diff --git a/src/Makefile.am b/src/Makefile.am
index acf6c13..903102c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,6 +7,7 @@ nm_applet_CPPFLAGS = \
$(NMA_CFLAGS) \
$(LIBSECRET_CFLAGS) \
$(NOTIFY_CFLAGS) \
+ $(MM_GLIB_CFLAGS) \
-DNM_VERSION_MIN_REQUIRED=NM_VERSION_0_9_10 \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_0_9_10 \
-DICONDIR=\""$(datadir)/icons"\" \
@@ -50,10 +51,6 @@ nm_applet_SOURCES = \
ap-menu-item.c \
mb-menu-item.h \
mb-menu-item.c \
- applet-device-gsm.h \
- applet-device-gsm.c \
- applet-device-cdma.h \
- applet-device-cdma.c \
mobile-helpers.c \
mobile-helpers.h \
applet-device-bt.h \
@@ -72,25 +69,24 @@ nm_applet_SOURCES = \
applet-device-infiniband.c \
fallback-icon.h
+if WITH_WWAN
+nm_applet_SOURCES += \
+ applet-device-broadband.h \
+ applet-device-broadband.c
+endif
+
nm_applet_LDADD = \
-lm \
$(GTK_LIBS) \
$(NMA_LIBS) \
$(LIBSECRET_LIBS) \
$(NOTIFY_LIBS) \
+ $(MM_GLIB_LIBS) \
${top_builddir}/src/marshallers/libmarshallers.la \
${top_builddir}/src/utils/libutils.la \
${top_builddir}/src/wireless-security/libwireless-security.la \
${top_builddir}/src/libnm-gtk/libnm-gtk.la
-if WITH_MODEM_MANAGER_1
-nm_applet_SOURCES += \
- applet-device-broadband.h \
- applet-device-broadband.c
-nm_applet_CPPFLAGS += $(MM_GLIB_CFLAGS)
-nm_applet_LDADD += $(MM_GLIB_LIBS)
-endif
-
if BUILD_MIGRATION_TOOL
SUBDIRS += gconf-helpers
diff --git a/src/applet.c b/src/applet.c
index 2ecf591..5989b62 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -76,10 +76,8 @@
#include "applet-device-team.h"
#include "applet-device-bridge.h"
#include "applet-device-bt.h"
-#include "applet-device-cdma.h"
#include "applet-device-ethernet.h"
#include "applet-device-infiniband.h"
-#include "applet-device-gsm.h"
#include "applet-device-vlan.h"
#include "applet-device-wifi.h"
#include "applet-device-wimax.h"
@@ -90,7 +88,7 @@
#include "nm-ui-utils.h"
#include "nm-glib-compat.h"
-#if WITH_MODEM_MANAGER_1
+#if WITH_WWAN
# include "applet-device-broadband.h"
#endif
@@ -198,7 +196,6 @@ impl_dbus_connect_to_3g_network (NMApplet *applet,
GError **error)
{
NMDevice *device;
- NMDeviceModemCapabilities caps;
device = nm_client_get_device_by_path (applet->nm_client, device_path);
if (!device || NM_IS_DEVICE_MODEM (device) == FALSE) {
@@ -209,35 +206,18 @@ impl_dbus_connect_to_3g_network (NMApplet *applet,
return FALSE;
}
-#if WITH_MODEM_MANAGER_1
- if (g_str_has_prefix (nm_device_get_udi (device), "/org/freedesktop/ModemManager1/Modem/")) {
- if (applet->mm1_running) {
- applet_broadband_connect_network (applet, device);
- return TRUE;
- }
-
- g_set_error_literal (error,
- NM_SECRET_AGENT_ERROR,
- NM_SECRET_AGENT_ERROR_INTERNAL_ERROR,
- "ModemManager was not found");
- return FALSE;
+#if WITH_WWAN
+ if (applet->mm1_running) {
+ applet_broadband_connect_network (applet, device);
+ return TRUE;
}
#endif
- caps = nm_device_modem_get_current_capabilities (NM_DEVICE_MODEM (device));
- if (caps & NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS) {
- applet_gsm_connect_network (applet, device);
- } else if (caps & NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO) {
- applet_cdma_connect_network (applet, device);
- } else {
- g_set_error_literal (error,
- NM_SECRET_AGENT_ERROR,
- NM_SECRET_AGENT_ERROR_INTERNAL_ERROR,
- "The device had no GSM or CDMA capabilities.");
- return FALSE;
- }
-
- return TRUE;
+ g_set_error_literal (error,
+ NM_SECRET_AGENT_ERROR,
+ NM_SECRET_AGENT_ERROR_INTERNAL_ERROR,
+ "ModemManager was not found");
+ return FALSE;
}
#include "applet-dbus-bindings.h"
@@ -255,20 +235,11 @@ get_device_class (NMDevice *device, NMApplet *applet)
else if (NM_IS_DEVICE_WIFI (device))
return applet->wifi_class;
else if (NM_IS_DEVICE_MODEM (device)) {
- NMDeviceModemCapabilities caps;
-
-#if WITH_MODEM_MANAGER_1
- if (g_str_has_prefix (nm_device_get_udi (device), "/org/freedesktop/ModemManager1/Modem/"))
- return applet->broadband_class;
+#if WITH_WWAN
+ return applet->broadband_class;
+#else
+ g_debug ("%s: modem found but WWAN support not enabled", __func__);
#endif
-
- caps = nm_device_modem_get_current_capabilities (NM_DEVICE_MODEM (device));
- if (caps & NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS)
- return applet->gsm_class;
- else if (caps & NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO)
- return applet->cdma_class;
- else
- g_debug ("%s: unhandled modem capabilities 0x%X", __func__, caps);
} else if (NM_IS_DEVICE_BT (device))
return applet->bt_class;
else if (NM_IS_DEVICE_WIMAX (device))
@@ -307,14 +278,10 @@ get_device_class_from_connection (NMConnection *connection, NMApplet *applet)
return applet->ethernet_class;
else if (!strcmp (ctype, NM_SETTING_WIRELESS_SETTING_NAME))
return applet->wifi_class;
-#if WITH_MODEM_MANAGER_1
- else if (applet->mm1_running && (!strcmp (ctype, NM_SETTING_GSM_SETTING_NAME) || !strcmp (ctype,
NM_SETTING_CDMA_SETTING_NAME)))
+#if WITH_WWAN
+ else if (!strcmp (ctype, NM_SETTING_GSM_SETTING_NAME) || !strcmp (ctype,
NM_SETTING_CDMA_SETTING_NAME))
return applet->broadband_class;
#endif
- else if (!strcmp (ctype, NM_SETTING_GSM_SETTING_NAME))
- return applet->gsm_class;
- else if (!strcmp (ctype, NM_SETTING_CDMA_SETTING_NAME))
- return applet->cdma_class;
else if (!strcmp (ctype, NM_SETTING_BLUETOOTH_SETTING_NAME))
return applet->bt_class;
else if (!strcmp (ctype, NM_SETTING_BOND_SETTING_NAME))
@@ -1603,7 +1570,8 @@ add_device_items (NMDeviceType type, const GPtrArray *all_devices, GSList *all_c
GSList *connections;
dclass = get_device_class (device, applet);
- g_assert (dclass != NULL);
+ if (!dclass)
+ continue;
connections = nm_device_filter_connections (device, all_connections);
active = applet_find_active_connection_for_device (device, applet, NULL);
@@ -2683,7 +2651,7 @@ foo_client_setup (NMApplet *applet)
applet_schedule_update_icon (applet);
}
-#if WITH_MODEM_MANAGER_1
+#if WITH_WWAN
static void
mm1_name_owner_changed_cb (GDBusObjectManagerClient *mm1,
@@ -2739,7 +2707,7 @@ mm1_client_setup (NMApplet *applet)
}
}
-#endif /* WITH_MODEM_MANAGER_1 */
+#endif /* WITH_WWAN */
static void
applet_common_get_device_icon (NMDeviceState state,
@@ -3617,13 +3585,7 @@ initable_init (GInitable *initable, GCancellable *cancellable, GError **error)
applet->wifi_class = applet_device_wifi_get_class (applet);
g_assert (applet->wifi_class);
- applet->gsm_class = applet_device_gsm_get_class (applet);
- g_assert (applet->gsm_class);
-
- applet->cdma_class = applet_device_cdma_get_class (applet);
- g_assert (applet->cdma_class);
-
-#if WITH_MODEM_MANAGER_1
+#if WITH_WWAN
applet->broadband_class = applet_device_broadband_get_class (applet);
g_assert (applet->broadband_class);
#endif
@@ -3649,7 +3611,7 @@ initable_init (GInitable *initable, GCancellable *cancellable, GError **error)
applet->infiniband_class = applet_device_infiniband_get_class (applet);
g_assert (applet->infiniband_class);
-#if WITH_MODEM_MANAGER_1
+#if WITH_WWAN
mm1_client_setup (applet);
#endif
@@ -3671,9 +3633,7 @@ static void finalize (GObject *object)
g_slice_free (NMADeviceClass, applet->ethernet_class);
g_slice_free (NMADeviceClass, applet->wifi_class);
- g_slice_free (NMADeviceClass, applet->gsm_class);
- g_slice_free (NMADeviceClass, applet->cdma_class);
-#if WITH_MODEM_MANAGER_1
+#if WITH_WWAN
g_slice_free (NMADeviceClass, applet->broadband_class);
#endif
g_slice_free (NMADeviceClass, applet->bt_class);
@@ -3707,7 +3667,7 @@ static void finalize (GObject *object)
g_clear_object (&applet->gsettings);
g_clear_object (&applet->nm_client);
-#if WITH_MODEM_MANAGER_1
+#if WITH_WWAN
g_clear_object (&applet->mm1);
#endif
diff --git a/src/applet.h b/src/applet.h
index 66ca945..95bc287 100644
--- a/src/applet.h
+++ b/src/applet.h
@@ -45,7 +45,7 @@
#include <nm-remote-settings.h>
#include "applet-agent.h"
-#if WITH_MODEM_MANAGER_1
+#if WITH_WWAN
#include <libmm-glib.h>
#endif
@@ -92,7 +92,7 @@ typedef struct
GSettings *gsettings;
-#if WITH_MODEM_MANAGER_1
+#if WITH_WWAN
MMManager *mm1;
gboolean mm1_running;
#endif
@@ -105,9 +105,7 @@ typedef struct
/* Device classes */
NMADeviceClass *ethernet_class;
NMADeviceClass *wifi_class;
- NMADeviceClass *gsm_class;
- NMADeviceClass *cdma_class;
-#if WITH_MODEM_MANAGER_1
+#if WITH_WWAN
NMADeviceClass *broadband_class;
#endif
NMADeviceClass *bt_class;
diff --git a/src/gnome-bluetooth/Makefile.am b/src/gnome-bluetooth/Makefile.am
index 940aeba..1e3ec5e 100644
--- a/src/gnome-bluetooth/Makefile.am
+++ b/src/gnome-bluetooth/Makefile.am
@@ -22,11 +22,7 @@ plugin_LTLIBRARIES = libnma.la
libnma_la_SOURCES = $(BT_WIDGET_SOURCES)
-libnma_la_CPPFLAGS = $(AM_CPPFLAGS)
-
-if WITH_MODEM_MANAGER_1
-libnma_la_CPPFLAGS += $(MM_GLIB_CFLAGS)
-endif
+libnma_la_CPPFLAGS = $(AM_CPPFLAGS) $(MM_GLIB_CFLAGS)
libnma_la_LDFLAGS = -module -avoid-version
@@ -34,11 +30,8 @@ libnma_la_LIBADD = \
$(top_builddir)/src/marshallers/libmarshallers.la \
$(top_builddir)/src/utils/libutils.la \
$(top_builddir)/src/libnm-gtk/libnm-gtk.la \
- $(GNOME_BLUETOOTH_LIBS)
-
-if WITH_MODEM_MANAGER_1
-libnma_la_LIBADD += $(MM_GLIB_LIBS)
-endif
+ $(GNOME_BLUETOOTH_LIBS) \
+ $(MM_GLIB_LIBS)
endif
diff --git a/src/gnome-bluetooth/nma-bt-device.c b/src/gnome-bluetooth/nma-bt-device.c
index 870d2be..7af6c49 100644
--- a/src/gnome-bluetooth/nma-bt-device.c
+++ b/src/gnome-bluetooth/nma-bt-device.c
@@ -43,7 +43,7 @@
#include "nm-utils.h"
#include "utils.h"
-#if WITH_MODEM_MANAGER_1
+#if WITH_WWAN
#include <libmm-glib.h>
#endif
@@ -69,15 +69,12 @@ typedef struct {
gboolean dun_enabled;
/* DUN stuff */
+#if WITH_WWAN
+ GDBusConnection *dbus_connection;
+ MMManager *modem_manager_1;
DBusGProxy *dun_proxy;
- DBusGProxy *mm_proxy;
- GSList *modem_proxies;
char *rfcomm_iface;
guint dun_timeout_id;
-
-#if WITH_MODEM_MANAGER_1
- GDBusConnection *dbus_connection;
- MMManager *modem_manager_1;
#endif
GtkWindow *parent_window;
@@ -114,15 +111,6 @@ static void _set_dun_enabled (NmaBtDevice *device, gboolean enabled);
#define BLUEZ_SERIAL_INTERFACE "org.bluez.Serial"
#define BLUEZ_NETWORK_INTERFACE "org.bluez.Network"
-#define MM_SERVICE "org.freedesktop.ModemManager"
-#define MM_PATH "/org/freedesktop/ModemManager"
-#define MM_INTERFACE "org.freedesktop.ModemManager"
-#define MM_MODEM_INTERFACE "org.freedesktop.ModemManager.Modem"
-
-#if WITH_MODEM_MANAGER_1
-#include <libmm-glib.h>
-#endif
-
/*********************************************************************/
static gboolean
@@ -282,16 +270,8 @@ static void
dun_cleanup (NmaBtDevice *self)
{
NmaBtDevicePrivate *priv = NMA_BT_DEVICE_GET_PRIVATE (self);
- GSList *iter;
-
- /* ModemManager */
- for (iter = priv->modem_proxies; iter; iter = g_slist_next (iter))
- g_object_unref (DBUS_G_PROXY (iter->data));
- g_slist_free (priv->modem_proxies);
- priv->modem_proxies = NULL;
- g_clear_object (&priv->mm_proxy);
-#if WITH_MODEM_MANAGER_1
+#if WITH_WWAN
g_clear_object (&priv->dbus_connection);
g_clear_object (&priv->modem_manager_1);
#endif
@@ -517,124 +497,7 @@ start_wizard (NmaBtDevice *self,
nma_mobile_wizard_present (priv->wizard);
}
-static void
-modem_get_all_cb (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
-{
- NmaBtDevice *self = NMA_BT_DEVICE (user_data);
- NmaBtDevicePrivate *priv = NMA_BT_DEVICE_GET_PRIVATE (self);
- const char *path;
- GHashTable *properties = NULL;
- GError *error = NULL;
- GValue *value;
- NMDeviceModemCapabilities caps = NM_DEVICE_MODEM_CAPABILITY_NONE;
-
- path = dbus_g_proxy_get_path (proxy);
- g_message ("%s: (%s) processing GetAll reply", __func__, path);
-
- if (!dbus_g_proxy_end_call (proxy, call, &error,
- DBUS_TYPE_G_MAP_OF_VARIANT, &properties,
- G_TYPE_INVALID)) {
- g_warning ("%s: (%s) Error getting modem properties: (%d) %s",
- __func__,
- path,
- error ? error->code : -1,
- (error && error->message) ? error->message : "(unknown)");
- g_error_free (error);
- goto out;
- }
-
- /* check whether this is the device we care about */
- value = g_hash_table_lookup (properties, "Device");
- if (value && G_VALUE_HOLDS_STRING (value) && g_value_get_string (value)) {
- char *iface_basename = g_path_get_basename (priv->rfcomm_iface);
- const char *modem_iface = g_value_get_string (value);
-
- if (strcmp (iface_basename, modem_iface) == 0) {
- /* yay, found it! */
-
- value = g_hash_table_lookup (properties, "Type");
- if (value && G_VALUE_HOLDS_UINT (value)) {
- switch (g_value_get_uint (value)) {
- case 1:
- caps = NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS;
- break;
- case 2:
- caps = NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO;
- break;
- default:
- g_message ("%s: (%s) unknown modem type", __func__, path);
- break;
- }
- }
- } else {
- g_message ("%s: (%s) (%s) not the modem we're looking for (%s)",
- __func__, path, modem_iface, iface_basename);
- }
-
- g_free (iface_basename);
- } else
- g_message ("%s: (%s) modem had no 'Device' property", __func__, path);
-
- g_hash_table_unref (properties);
-
- /* Launch wizard! */
- start_wizard (self, path, caps);
-
-out:
- g_message ("%s: finished", __func__);
-}
-
-static void
-modem_added (DBusGProxy *proxy, const char *path, gpointer user_data)
-{
- NmaBtDevice *self = NMA_BT_DEVICE (user_data);
- NmaBtDevicePrivate *priv = NMA_BT_DEVICE_GET_PRIVATE (self);
- DBusGProxy *props_proxy;
-
- g_return_if_fail (path != NULL);
-
- g_message ("%s: (%s) modem found", __func__, path);
-
- /* Create a proxy for the modem and get its properties */
- props_proxy = dbus_g_proxy_new_for_name (priv->bus,
- MM_SERVICE,
- path,
- "org.freedesktop.DBus.Properties");
- g_assert (proxy);
- priv->modem_proxies = g_slist_append (priv->modem_proxies, props_proxy);
-
- g_message ("%s: (%s) calling GetAll...", __func__, path);
-
- dbus_g_proxy_begin_call (props_proxy, "GetAll",
- modem_get_all_cb,
- self,
- NULL,
- G_TYPE_STRING, MM_MODEM_INTERFACE,
- G_TYPE_INVALID);
-}
-
-static void
-modem_removed (DBusGProxy *proxy, const char *path, gpointer user_data)
-{
- NmaBtDevice *self = NMA_BT_DEVICE (user_data);
- NmaBtDevicePrivate *priv = NMA_BT_DEVICE_GET_PRIVATE (self);
- GSList *iter;
-
- g_return_if_fail (path != NULL);
-
- g_message ("%s: (%s) modem removed", __func__, path);
-
- /* Clean up if a modem gets removed */
- for (iter = priv->modem_proxies; iter; iter = g_slist_next (iter)) {
- if (!strcmp (path, dbus_g_proxy_get_path (DBUS_G_PROXY (iter->data)))) {
- priv->modem_proxies = g_slist_remove (priv->modem_proxies, iter->data);
- g_object_unref (iter->data);
- break;
- }
- }
-}
-
-#if WITH_MODEM_MANAGER_1
+#if WITH_WWAN
static gboolean
check_modem (NmaBtDevice *self,
@@ -697,7 +560,7 @@ modem_object_added (MMManager *modem_manager,
check_modem (self, modem_object);
}
-#endif /* WITH_MODEM_MANAGER_1 */
+#endif /* WITH_WWAN */
static void
dun_connect_cb (DBusGProxy *proxy,
@@ -708,7 +571,7 @@ dun_connect_cb (DBusGProxy *proxy,
NmaBtDevicePrivate *priv = NMA_BT_DEVICE_GET_PRIVATE (self);
GError *error = NULL;
char *device;
-#if WITH_MODEM_MANAGER_1
+#if WITH_WWAN
GList *modems, *iter;
gboolean matched = FALSE;
#endif
@@ -733,7 +596,7 @@ dun_connect_cb (DBusGProxy *proxy,
priv->rfcomm_iface = device;
g_message ("%s: new rfcomm interface '%s'", __func__, device);
-#if WITH_MODEM_MANAGER_1
+#if WITH_WWAN
/* ModemManager1 stuff */
priv->dbus_connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
if (!priv->dbus_connection) {
@@ -814,29 +677,6 @@ dun_start (NmaBtDevice *self)
_set_status (self, _("Detecting phone configuration..."));
- /* ModemManager stuff */
- priv->mm_proxy = dbus_g_proxy_new_for_name (priv->bus,
- MM_SERVICE,
- MM_PATH,
- MM_INTERFACE);
- g_assert (priv->mm_proxy);
-
- dbus_g_object_register_marshaller (g_cclosure_marshal_VOID__BOXED,
- G_TYPE_NONE,
- G_TYPE_BOXED,
- G_TYPE_INVALID);
- dbus_g_proxy_add_signal (priv->mm_proxy, "DeviceAdded",
- DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID);
- dbus_g_proxy_connect_signal (priv->mm_proxy, "DeviceAdded",
- G_CALLBACK (modem_added), self,
- NULL);
-
- dbus_g_proxy_add_signal (priv->mm_proxy, "DeviceRemoved",
- DBUS_TYPE_G_OBJECT_PATH, G_TYPE_INVALID);
- dbus_g_proxy_connect_signal (priv->mm_proxy, "DeviceRemoved",
- G_CALLBACK (modem_removed), self,
- NULL);
-
/* Bluez */
priv->dun_proxy = dbus_g_proxy_new_for_name (priv->bus,
BLUEZ_SERVICE,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
