2008-03-29 Dan Williams <dcbw@redhat.com>
* libnm-util/nm-setting-8021x.c libnm-util/nm-setting-ip4-config.c libnm-util/nm-setting-vpn-properties.c libnm-util/nm-setting-vpn.c libnm-util/nm-setting-wireless-security.c libnm-util/nm-setting-wireless.c libnm-util/nm-utils.c src/dhcp-manager/nm-dhcp-manager.c src/nm-activation-request.c src/nm-ip4-config.c src/nm-manager.c src/nm-properties-changed-signal.c src/ppp-manager/nm-pppd-plugin.c src/supplicant-manager/nm-supplicant-interface.c src/vpn-manager/nm-vpn-connection.c - consistently use nm-dbus-glib-types.h git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3514 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
@@ -36,6 +36,7 @@
|
||||
#include "nm-utils.h"
|
||||
#include "NetworkManagerUtils.h"
|
||||
#include "nm-dbus-manager.h"
|
||||
#include "nm-dbus-glib-types.h"
|
||||
|
||||
#define NM_DHCP_CLIENT_DBUS_SERVICE "org.freedesktop.nm_dhcp_client"
|
||||
#define NM_DHCP_CLIENT_DBUS_IFACE "org.freedesktop.nm_dhcp_client"
|
||||
@@ -441,8 +442,6 @@ out:
|
||||
g_free (reason);
|
||||
}
|
||||
|
||||
#define DBUS_TYPE_G_STRING_VARIANT_HASHTABLE (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE))
|
||||
|
||||
static NMDHCPManager *
|
||||
nm_dhcp_manager_new (void)
|
||||
{
|
||||
@@ -477,7 +476,7 @@ nm_dhcp_manager_new (void)
|
||||
|
||||
dbus_g_proxy_add_signal (priv->proxy,
|
||||
"Event",
|
||||
DBUS_TYPE_G_STRING_VARIANT_HASHTABLE,
|
||||
DBUS_TYPE_G_MAP_OF_VARIANT,
|
||||
G_TYPE_INVALID);
|
||||
|
||||
dbus_g_proxy_connect_signal (priv->proxy, "Event",
|
||||
|
Reference in New Issue
Block a user