fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-01 08:20:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use the existing dbus-glib macros.

Browse source
This commit is contained in:
Tambet Ingo 2009-02-06 13:43:18 +02:00
parent eaa93b0387
commit c4b10085c9
3 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/modem-manager/nm-modem-cdma.c
View file

@ -2,6 +2,7 @@
#include <string.h>
#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;

4
src/modem-manager/nm-modem-gsm.c
View file

@ -1,6 +1,7 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
#include <string.h>
#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;

7
src/modem-manager/nm-modem.c
View file

@ -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);
}