system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-02 22:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

libnm-glib: refactor _nm_device_type_for_path()

Browse source 
Refactor nm-device.c to expose a private _nm_device_type_for_path()
function which can be used by subclasses to query the actual device
type. In particular, NMDeviceGeneric will use the result of this
function to figure out which interface to use for the D-Bus proxy.
This commit is contained in:
Beniamino Galvani 2015-11-10 19:09:36 +01:00
parent 877de231b8
commit 33e76cf0e0
2 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libnm-glib/nm-device-private.h
View file

@ -22,5 +22,6 @@
#define NM_DEVICE_PRIVATE_H
void _nm_device_set_device_type (NMDevice *device, NMDeviceType dtype);
NMDeviceType _nm_device_type_for_path (DBusGConnection *connection, const char *path);
#endif /* NM_DEVICE_PRIVATE_H */

36
libnm-glib/nm-device.c
View file

@ -50,17 +50,17 @@
#include "nm-utils.h"
#include "nm-dbus-helpers-private.h"
static GType _nm_device_type_for_path (DBusGConnection *connection,
const char *path);
static void _nm_device_type_for_path_async (DBusGConnection *connection,
const char *path,
NMObjectTypeCallbackFunc callback,
gpointer user_data);
static GType _nm_device_gtype_for_path (DBusGConnection *connection,
const char *path);
static void _nm_device_gtype_for_path_async (DBusGConnection *connection,
const char *path,
NMObjectTypeCallbackFunc callback,
gpointer user_data);
gboolean connection_compatible (NMDevice *device, NMConnection *connection, GError **error);
G_DEFINE_TYPE_WITH_CODE (NMDevice, nm_device, NM_TYPE_OBJECT,
_nm_object_register_type_func (g_define_type_id, _nm_device_type_for_path,
_nm_device_type_for_path_async);
_nm_object_register_type_func (g_define_type_id, _nm_device_gtype_for_path,
_nm_device_gtype_for_path_async);
)
#define DBUS_G_TYPE_UINT_STRUCT (dbus_g_type_get_struct ("GValueArray", G_TYPE_UINT, G_TYPE_UINT, G_TYPE_INVALID))
@ -882,14 +882,12 @@ _nm_device_set_device_type (NMDevice *device, NMDeviceType dtype)
g_warn_if_fail (dtype == priv->device_type);
}
static GType
_nm_device_type_for_path (DBusGConnection *connection,
const char *path)
NMDeviceType
_nm_device_type_for_path (DBusGConnection *connection, const char *path)
{
DBusGProxy *proxy;
GError *err = NULL;
GValue value = G_VALUE_INIT;
NMDeviceType nm_dtype;
proxy = _nm_dbus_new_proxy_for_connection (connection, path, DBUS_INTERFACE_PROPERTIES);
if (!proxy) {
@ -910,8 +908,14 @@ _nm_device_type_for_path (DBusGConnection *connection,
}
g_object_unref (proxy);
nm_dtype = g_value_get_uint (&value);
return _nm_device_gtype_from_dtype (nm_dtype);
return g_value_get_uint (&value);
}
static GType
_nm_device_gtype_for_path (DBusGConnection *connection,
const char *path)
{
return _nm_device_gtype_from_dtype (_nm_device_type_for_path (connection, path));
}
/**
@ -932,7 +936,7 @@ nm_device_new (DBusGConnection *connection, const char *path)
g_return_val_if_fail (connection != NULL, NULL);
g_return_val_if_fail (path != NULL, NULL);
dtype = _nm_device_type_for_path (connection, path);
dtype = _nm_device_gtype_for_path (connection, path);
if (dtype == G_TYPE_INVALID)
return NULL;
@ -978,7 +982,7 @@ async_got_type (DBusGProxy *proxy, DBusGProxyCall *call, gpointer user_data)
}
static void
_nm_device_type_for_path_async (DBusGConnection *connection,
_nm_device_gtype_for_path_async (DBusGConnection *connection,
const char *path,
NMObjectTypeCallbackFunc callback,
gpointer user_data)