From c4b10085c982ed4db70b480c7ac9dd3ace4db3ad Mon Sep 17 00:00:00 2001 From: Tambet Ingo Date: Fri, 6 Feb 2009 13:43:18 +0200 Subject: [PATCH] Use the existing dbus-glib macros. --- src/modem-manager/nm-modem-cdma.c | 4 ++-- src/modem-manager/nm-modem-gsm.c | 4 ++-- src/modem-manager/nm-modem.c | 7 ------- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/modem-manager/nm-modem-cdma.c b/src/modem-manager/nm-modem-cdma.c index 690efb554a..18d28c0643 100644 --- a/src/modem-manager/nm-modem-cdma.c +++ b/src/modem-manager/nm-modem-cdma.c @@ -2,6 +2,7 @@ #include +#include "nm-dbus-glib-types.h" #include "nm-modem-cdma.h" #include "nm-modem-types.h" #include "nm-device-interface.h" @@ -80,8 +81,7 @@ real_act_stage1_prepare (NMDevice *device, NMDeviceStateReason *reason) dbus_g_proxy_begin_call_with_timeout (nm_modem_get_proxy (NM_MODEM (device), MM_DBUS_INTERFACE_MODEM_SIMPLE), "Connect", stage1_prepare_done, device, NULL, 120000, - dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), - properties, + DBUS_TYPE_G_MAP_OF_VARIANT, properties, G_TYPE_INVALID); return NM_ACT_STAGE_RETURN_POSTPONE; diff --git a/src/modem-manager/nm-modem-gsm.c b/src/modem-manager/nm-modem-gsm.c index 671814f835..b0d07fad20 100644 --- a/src/modem-manager/nm-modem-gsm.c +++ b/src/modem-manager/nm-modem-gsm.c @@ -1,6 +1,7 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ #include +#include "nm-dbus-glib-types.h" #include "nm-modem-gsm.h" #include "nm-device-private.h" #include "nm-device-interface.h" @@ -137,8 +138,7 @@ real_act_stage1_prepare (NMDevice *device, NMDeviceStateReason *reason) dbus_g_proxy_begin_call_with_timeout (nm_modem_get_proxy (NM_MODEM (device), MM_DBUS_INTERFACE_MODEM_SIMPLE), "Connect", stage1_prepare_done, device, NULL, 120000, - dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), - properties, + DBUS_TYPE_G_MAP_OF_VARIANT, properties, G_TYPE_INVALID); return NM_ACT_STAGE_RETURN_POSTPONE; diff --git a/src/modem-manager/nm-modem.c b/src/modem-manager/nm-modem.c index 500fd2607b..3b460fde58 100644 --- a/src/modem-manager/nm-modem.c +++ b/src/modem-manager/nm-modem.c @@ -274,10 +274,6 @@ static_stage4 (NMDevice *device, NMIP4Config **config, NMDeviceStateReason *reas return NM_ACT_STAGE_RETURN_SUCCESS; } -/*****************************************************************************/ -/* IP method DHCP */ - - /*****************************************************************************/ static NMActStageReturn @@ -387,9 +383,6 @@ real_deactivate_quickly (NMDevice *device) break; } - /* FIXME: This shouldn't be needed */ - dbus_g_proxy_call_no_reply (nm_modem_get_proxy (NM_MODEM (device), NULL), "Disconnect", G_TYPE_INVALID); - if (NM_DEVICE_CLASS (nm_modem_parent_class)->deactivate) NM_DEVICE_CLASS (nm_modem_parent_class)->deactivate (device); }