<tp:docstring>Flags describing the access point's capabilities according to the RSN (Robust Secure Network) protocol.</tp:docstring>
</property>
<property name="Ssid" type="ay" access="read">
+ <!-- gdbus-codegen assumes that "ay" means "non-UTF-8 string" and
+ won't deal with '\0' bytes correctly.
+ -->
+ <annotation name="org.gtk.GDBus.C.ForceGVariant" value="1"/>
<tp:docstring>The Service Set Identifier identifying the access point.</tp:docstring>
</property>
<property name="Frequency" type="u" access="read">
<annotation name="org.gtk.GDBus.C.Name" value="DeviceWifi"/>
<method name="GetAccessPoints">
- <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_get_access_points"/>
<arg name="access_points" type="ao" direction="out">
<tp:docstring>
List of access point object paths.
</method>
<method name="GetAllAccessPoints">
- <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_get_all_access_points"/>
<arg name="access_points" type="ao" direction="out">
<tp:docstring>
List of access point object paths.
</method>
<method name="RequestScan">
- <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_request_scan"/>
- <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
<arg name="options" type="a{sv}" direction="in">
<tp:docstring>
Options of scan (currently unused argument).
<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
<interface name="org.freedesktop.NetworkManager.Device.WiMax">
<method name="GetNspList">
- <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_get_nsp_list"/>
<arg name="nsps" type="ao" direction="out">
<tp:docstring>
List of NSP object paths
</property>
<method name="Disconnect">
- <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_disconnect"/>
- <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
<tp:docstring>
Disconnects a device and prevents the device from automatically activating further connections without user intervention.
</tp:docstring>
</method>
<method name="Delete">
- <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_delete"/>
- <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
<tp:docstring>
Deletes a software device from NetworkManager and removes the interface from the system.
The method returns an error when called for a hardware device.
-I${top_builddir}/src \
-I${top_srcdir}/src/devices \
-I${top_srcdir}/src/platform \
+ -I${top_builddir}/introspection \
-I${top_srcdir}/include \
-I${top_builddir}/libnm-core \
-I${top_srcdir}/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager-adsl"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
- $(DBUS_CFLAGS) \
$(GUDEV_CFLAGS)
GLIB_GENERATED = nm-adsl-enum-types.h nm-adsl-enum-types.c
GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
nm_adsl_enum_types_sources = $(srcdir)/nm-device-adsl.h
-nm-device-adsl-glue.h: $(top_srcdir)/introspection/nm-device-adsl.xml
- dbus-binding-tool --prefix=nm_device_adsl --mode=glib-server --output=$@ $<
-
-BUILT_SOURCES = $(GLIB_GENERATED) nm-device-adsl-glue.h
+BUILT_SOURCES = $(GLIB_GENERATED)
pkglib_LTLIBRARIES = libnm-device-plugin-adsl.la
-Wl,--version-script=$(SYMBOL_VIS_FILE)
libnm_device_plugin_adsl_la_LIBADD = \
- $(DBUS_LIBS) \
+ $(top_builddir)/introspection/libnmdbus.la \
$(GUDEV_LIBS)
CLEANFILES = $(BUILT_SOURCES)
#include "nm-setting-adsl.h"
#include "nm-utils.h"
-#include "nm-device-adsl-glue.h"
+#include "nmdbus-device-adsl.h"
#include "nm-device-logging.h"
_LOG_DECLARE_SELF (NMDeviceAdsl);
parent_class->deactivate = deactivate;
nm_exported_object_class_add_interface (NM_EXPORTED_OBJECT_CLASS (klass),
- &dbus_glib_nm_device_adsl_object_info);
+ NMDBUS_TYPE_DEVICE_ADSL_SKELETON,
+ NULL);
}
-I${top_srcdir}/src/settings \
-I${top_srcdir}/src/platform \
-I${top_srcdir}/src/devices/wwan \
+ -I${top_builddir}/introspection \
-I${top_srcdir}/include \
-I${top_builddir}/libnm-core \
-I${top_srcdir}/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager-bluetooth"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
- $(DBUS_CFLAGS)
+ $(GLIB_CFLAGS)
GLIB_GENERATED = nm-bt-enum-types.h nm-bt-enum-types.c
GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM
GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
nm_bt_enum_types_sources = $(srcdir)/nm-bt-error.h
-nm-device-bt-glue.h: $(top_srcdir)/introspection/nm-device-bt.xml
- dbus-binding-tool --prefix=nm_device_bt --mode=glib-server --output=$@ $<
-
-BUILT_SOURCES = $(GLIB_GENERATED) nm-device-bt-glue.h
+BUILT_SOURCES = $(GLIB_GENERATED)
pkglib_LTLIBRARIES = libnm-device-plugin-bluetooth.la
-Wl,--version-script=$(SYMBOL_VIS_FILE)
libnm_device_plugin_bluetooth_la_LIBADD = \
+ $(top_builddir)/introspection/libnmdbus.la \
$(top_builddir)/src/devices/wwan/libnm-wwan.la \
- $(DBUS_LIBS) \
+ $(GLIB_LIBS) \
$(GUDEV_LIBS)
if WITH_BLUEZ5_DUN
#include "nm-device-bt.h"
#include "nm-core-internal.h"
#include "nm-platform.h"
+#include "nm-dbus-compat.h"
typedef struct {
int bluez_version;
#include "nm-setting-gsm.h"
#include "nm-setting-serial.h"
#include "nm-setting-ppp.h"
-#include "nm-device-bt-glue.h"
#include "NetworkManagerUtils.h"
#include "nm-bt-enum-types.h"
#include "nm-utils.h"
#include "nm-bt-error.h"
#include "nm-bt-enum-types.h"
+#include "nmdbus-device-bt.h"
+
#define MM_DBUS_SERVICE "org.freedesktop.ModemManager1"
#define MM_DBUS_PATH "/org/freedesktop/ModemManager1"
#define MM_DBUS_INTERFACE "org.freedesktop.ModemManager1"
G_TYPE_UINT, G_TYPE_UINT);
nm_exported_object_class_add_interface (NM_EXPORTED_OBJECT_CLASS (klass),
- &dbus_glib_nm_device_bt_object_info);
+ NMDBUS_TYPE_DEVICE_BLUETOOTH_SKELETON,
+ NULL);
}
#include "NetworkManagerUtils.h"
#include "nm-device-private.h"
#include "nm-platform.h"
-#include "nm-dbus-glib-types.h"
#include "nm-enum-types.h"
#include "nm-device-factory.h"
#include "nm-core-internal.h"
#include "nm-ip4-config.h"
-#include "nm-device-bond-glue.h"
+#include "nmdbus-device-bond.h"
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceBond);
g_object_class_install_property
(object_class, PROP_SLAVES,
g_param_spec_boxed (NM_DEVICE_BOND_SLAVES, "", "",
- DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH,
+ G_TYPE_STRV,
G_PARAM_READABLE |
G_PARAM_STATIC_STRINGS));
nm_exported_object_class_add_interface (NM_EXPORTED_OBJECT_CLASS (klass),
- &dbus_glib_nm_device_bond_object_info);
+ NMDBUS_TYPE_DEVICE_BOND_SKELETON,
+ NULL);
}
/*************************************************************/
#include "nm-device-bridge.h"
#include "NetworkManagerUtils.h"
#include "nm-device-private.h"
-#include "nm-dbus-glib-types.h"
#include "nm-enum-types.h"
#include "nm-platform.h"
#include "nm-device-factory.h"
#include "nm-core-internal.h"
-#include "nm-device-bridge-glue.h"
+#include "nmdbus-device-bridge.h"
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceBridge);
g_object_class_install_property
(object_class, PROP_SLAVES,
g_param_spec_boxed (NM_DEVICE_BRIDGE_SLAVES, "", "",
- DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH,
+ G_TYPE_STRV,
G_PARAM_READABLE |
G_PARAM_STATIC_STRINGS));
nm_exported_object_class_add_interface (NM_EXPORTED_OBJECT_CLASS (klass),
- &dbus_glib_nm_device_bridge_object_info);
+ NMDBUS_TYPE_DEVICE_BRIDGE_SKELETON,
+ NULL);
}
/*************************************************************/
#include "nm-core-internal.h"
#include "NetworkManagerUtils.h"
-#include "nm-device-ethernet-glue.h"
+#include "nmdbus-device-ethernet.h"
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceEthernet);
G_PARAM_STATIC_STRINGS));
nm_exported_object_class_add_interface (NM_EXPORTED_OBJECT_CLASS (klass),
- &dbus_glib_nm_device_ethernet_object_info);
+ NMDBUS_TYPE_DEVICE_ETHERNET_SKELETON,
+ NULL);
}
/*************************************************************/
#include "nm-platform.h"
#include "nm-core-internal.h"
-#include "nm-device-generic-glue.h"
+#include "nmdbus-device-generic.h"
G_DEFINE_TYPE (NMDeviceGeneric, nm_device_generic, NM_TYPE_DEVICE)
G_PARAM_STATIC_STRINGS));
nm_exported_object_class_add_interface (NM_EXPORTED_OBJECT_CLASS (klass),
- &dbus_glib_nm_device_generic_object_info);
+ NMDBUS_TYPE_DEVICE_GENERIC_SKELETON,
+ NULL);
}
#include "nm-device-factory.h"
#include "nm-core-internal.h"
-#include "nm-device-gre-glue.h"
+#include "nmdbus-device-gre.h"
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceGre);
/* properties */
g_object_class_install_property
(object_class, PROP_PARENT,
- g_param_spec_boxed (NM_DEVICE_GRE_PARENT, "", "",
- DBUS_TYPE_G_OBJECT_PATH,
- G_PARAM_READABLE |
- G_PARAM_STATIC_STRINGS));
+ g_param_spec_string (NM_DEVICE_GRE_PARENT, "", "",
+ NULL,
+ G_PARAM_READABLE |
+ G_PARAM_STATIC_STRINGS));
g_object_class_install_property
(object_class, PROP_INPUT_FLAGS,
G_PARAM_STATIC_STRINGS));
nm_exported_object_class_add_interface (NM_EXPORTED_OBJECT_CLASS (klass),
- &dbus_glib_nm_device_gre_object_info);
+ NMDBUS_TYPE_DEVICE_GRE_SKELETON,
+ NULL);
}
/*************************************************************/
#include "nm-device-factory.h"
#include "nm-core-internal.h"
-#include "nm-device-infiniband-glue.h"
+#include "nmdbus-device-infiniband.h"
G_DEFINE_TYPE (NMDeviceInfiniband, nm_device_infiniband, NM_TYPE_DEVICE)
G_PARAM_STATIC_STRINGS));
nm_exported_object_class_add_interface (NM_EXPORTED_OBJECT_CLASS (klass),
- &dbus_glib_nm_device_infiniband_object_info);
+ NMDBUS_TYPE_DEVICE_INFINIBAND_SKELETON,
+ NULL);
}
/*************************************************************/
#include "nm-platform.h"
#include "nm-device-factory.h"
-#include "nm-device-macvlan-glue.h"
+#include "nmdbus-device-macvlan.h"
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceMacvlan);
/* properties */
g_object_class_install_property
(object_class, PROP_PARENT,
- g_param_spec_boxed (NM_DEVICE_MACVLAN_PARENT, "", "",
- DBUS_TYPE_G_OBJECT_PATH,
- G_PARAM_READABLE |
- G_PARAM_STATIC_STRINGS));
+ g_param_spec_string (NM_DEVICE_MACVLAN_PARENT, "", "",
+ NULL,
+ G_PARAM_READABLE |
+ G_PARAM_STATIC_STRINGS));
g_object_class_install_property
(object_class, PROP_MODE,
G_PARAM_STATIC_STRINGS));
nm_exported_object_class_add_interface (NM_EXPORTED_OBJECT_CLASS (klass),
- &dbus_glib_nm_device_macvlan_object_info);
+ NMDBUS_TYPE_DEVICE_MACVLAN_SKELETON,
+ NULL);
}
/*************************************************************/
#include "nm-platform.h"
#include "nm-device-factory.h"
-#include "nm-device-tun-glue.h"
+#include "nmdbus-device-tun.h"
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceTun);
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
nm_exported_object_class_add_interface (NM_EXPORTED_OBJECT_CLASS (klass),
- &dbus_glib_nm_device_tun_object_info);
+ NMDBUS_TYPE_DEVICE_TUN_SKELETON,
+ NULL);
}
#include "nm-platform.h"
#include "nm-device-factory.h"
-#include "nm-device-veth-glue.h"
+#include "nmdbus-device-veth.h"
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceVeth);
/* properties */
g_object_class_install_property
(object_class, PROP_PEER,
- g_param_spec_boxed (NM_DEVICE_VETH_PEER, "", "",
- DBUS_TYPE_G_OBJECT_PATH,
- G_PARAM_READABLE |
- G_PARAM_STATIC_STRINGS));
+ g_param_spec_string (NM_DEVICE_VETH_PEER, "", "",
+ NULL,
+ G_PARAM_READABLE |
+ G_PARAM_STATIC_STRINGS));
nm_exported_object_class_add_interface (NM_EXPORTED_OBJECT_CLASS (klass),
- &dbus_glib_nm_device_veth_object_info);
+ NMDBUS_TYPE_DEVICE_VETH_SKELETON,
+ NULL);
}
/*************************************************************/
#include "nm-manager.h"
#include "nm-core-internal.h"
-#include "nm-device-vlan-glue.h"
+#include "nmdbus-device-vlan.h"
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceVlan);
/* properties */
g_object_class_install_property
(object_class, PROP_PARENT,
- g_param_spec_boxed (NM_DEVICE_VLAN_PARENT, "", "",
- DBUS_TYPE_G_OBJECT_PATH,
- G_PARAM_READABLE |
- G_PARAM_STATIC_STRINGS));
+ g_param_spec_string (NM_DEVICE_VLAN_PARENT, "", "",
+ NULL,
+ G_PARAM_READABLE |
+ G_PARAM_STATIC_STRINGS));
g_object_class_install_property
(object_class, PROP_VLAN_ID,
g_param_spec_uint (NM_DEVICE_VLAN_ID, "", "",
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
nm_exported_object_class_add_interface (NM_EXPORTED_OBJECT_CLASS (klass),
- &dbus_glib_nm_device_vlan_object_info);
+ NMDBUS_TYPE_DEVICE_VLAN_SKELETON,
+ NULL);
}
/*************************************************************/
#include "nm-utils.h"
#include "nm-device-factory.h"
-#include "nm-device-vxlan-glue.h"
+#include "nmdbus-device-vxlan.h"
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceVxlan);
/* properties */
g_object_class_install_property
(object_class, PROP_PARENT,
- g_param_spec_boxed (NM_DEVICE_VXLAN_PARENT, "", "",
- DBUS_TYPE_G_OBJECT_PATH,
- G_PARAM_READABLE |
- G_PARAM_STATIC_STRINGS));
+ g_param_spec_string (NM_DEVICE_VXLAN_PARENT, "", "",
+ NULL,
+ G_PARAM_READABLE |
+ G_PARAM_STATIC_STRINGS));
g_object_class_install_property
(object_class, PROP_ID,
G_PARAM_STATIC_STRINGS));
nm_exported_object_class_add_interface (NM_EXPORTED_OBJECT_CLASS (klass),
- &dbus_glib_nm_device_vxlan_object_info);
+ NMDBUS_TYPE_DEVICE_VXLAN_SKELETON,
+ NULL);
}
/*************************************************************/
#include "config.h"
-#include <dbus/dbus.h>
#include <netinet/in.h>
#include <string.h>
#include <unistd.h>
#include "nm-settings-connection.h"
#include "nm-connection-provider.h"
#include "nm-auth-utils.h"
-#include "nm-dbus-glib-types.h"
#include "nm-dispatcher.h"
#include "nm-config.h"
#include "nm-dns-manager.h"
#include "nm-device-logging.h"
_LOG_DECLARE_SELF (NMDevice);
-static void impl_device_disconnect (NMDevice *self, DBusGMethodInvocation *context);
-static void impl_device_delete (NMDevice *self, DBusGMethodInvocation *context);
+#include "nmdbus-device.h"
+
static void nm_device_update_metered (NMDevice *self);
static void ip_check_ping_watch_cb (GPid pid, gint status, gpointer user_data);
-#include "nm-device-glue.h"
-
G_DEFINE_ABSTRACT_TYPE (NMDevice, nm_device, NM_TYPE_EXPORTED_OBJECT)
#define NM_DEVICE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DEVICE, NMDevicePrivate))
static void
disconnect_cb (NMDevice *self,
- DBusGMethodInvocation *context,
+ GDBusMethodInvocation *context,
NMAuthSubject *subject,
GError *error,
gpointer user_data)
GError *local = NULL;
if (error) {
- dbus_g_method_return_error (context, error);
+ g_dbus_method_invocation_return_gerror (context, error);
nm_audit_log_device_op (NM_AUDIT_OP_DEVICE_DISCONNECT, self, FALSE, subject, error->message);
return;
}
local = g_error_new_literal (NM_DEVICE_ERROR,
NM_DEVICE_ERROR_NOT_ACTIVE,
"Device is not active");
- dbus_g_method_return_error (context, local);
nm_audit_log_device_op (NM_AUDIT_OP_DEVICE_DISCONNECT, self, FALSE, subject, local->message);
- g_error_free (local);
+ g_dbus_method_invocation_take_error (context, local);
} else {
nm_device_set_autoconnect (self, FALSE);
nm_device_state_changed (self,
NM_DEVICE_STATE_DEACTIVATING,
NM_DEVICE_STATE_REASON_USER_REQUESTED);
- dbus_g_method_return (context);
+ g_dbus_method_invocation_return_value (context, NULL);
nm_audit_log_device_op (NM_AUDIT_OP_DEVICE_DISCONNECT, self, TRUE, subject, NULL);
}
}
}
static void
-impl_device_disconnect (NMDevice *self, DBusGMethodInvocation *context)
+impl_device_disconnect (NMDevice *self, GDBusMethodInvocation *context)
{
NMConnection *connection;
GError *error = NULL;
error = g_error_new_literal (NM_DEVICE_ERROR,
NM_DEVICE_ERROR_NOT_ACTIVE,
"This device is not active");
- dbus_g_method_return_error (context, error);
- g_error_free (error);
+ g_dbus_method_invocation_take_error (context, error);
return;
}
static void
delete_cb (NMDevice *self,
- DBusGMethodInvocation *context,
+ GDBusMethodInvocation *context,
NMAuthSubject *subject,
GError *error,
gpointer user_data)
{
if (error) {
- dbus_g_method_return_error (context, error);
+ g_dbus_method_invocation_return_gerror (context, error);
nm_audit_log_device_op (NM_AUDIT_OP_DEVICE_DELETE, self, FALSE, subject, error->message);
return;
}
/* Authorized */
nm_platform_link_delete (NM_PLATFORM_GET, nm_device_get_ifindex (self));
- dbus_g_method_return (context);
+ g_dbus_method_invocation_return_value (context, NULL);
nm_audit_log_device_op (NM_AUDIT_OP_DEVICE_DELETE, self, TRUE, subject, NULL);
}
static void
-impl_device_delete (NMDevice *self, DBusGMethodInvocation *context)
+impl_device_delete (NMDevice *self, GDBusMethodInvocation *context)
{
GError *error = NULL;
error = g_error_new_literal (NM_DEVICE_ERROR,
NM_DEVICE_ERROR_NOT_SOFTWARE,
"This device is not a software device");
- dbus_g_method_return_error (context, error);
- g_error_free (error);
+ g_dbus_method_invocation_take_error (context, error);
return;
}
}
}
-#define DBUS_TYPE_STATE_REASON_STRUCT (dbus_g_type_get_struct ("GValueArray", G_TYPE_UINT, G_TYPE_UINT, G_TYPE_INVALID))
-
static void
get_property (GObject *object, guint prop_id,
GValue *value, GParamSpec *pspec)
g_value_set_uint (value, priv->state);
break;
case PROP_STATE_REASON:
- g_value_take_boxed (value, dbus_g_type_specialized_construct (DBUS_TYPE_STATE_REASON_STRUCT));
- dbus_g_type_struct_set (value, 0, priv->state, 1, priv->state_reason, G_MAXUINT);
+ g_value_take_variant (value,
+ g_variant_new ("(uu)", priv->state, priv->state_reason));
break;
case PROP_ACTIVE_CONNECTION:
nm_utils_g_value_set_object_path (value, priv->act_request);
g_hash_table_iter_init (&iter, priv->available_connections);
while (g_hash_table_iter_next (&iter, (gpointer) &connection, NULL))
g_ptr_array_add (array, g_strdup (nm_connection_get_path (connection)));
- g_value_take_boxed (value, array);
+ g_ptr_array_add (array, NULL);
+ g_value_take_boxed (value, (char **) g_ptr_array_free (array, FALSE));
break;
case PROP_PHYSICAL_PORT_ID:
g_value_set_string (value, priv->physical_port_id);
g_object_class_install_property
(object_class, PROP_IP4_CONFIG,
- g_param_spec_boxed (NM_DEVICE_IP4_CONFIG, "", "",
- DBUS_TYPE_G_OBJECT_PATH,
- G_PARAM_READWRITE |
- G_PARAM_STATIC_STRINGS));
+ g_param_spec_string (NM_DEVICE_IP4_CONFIG, "", "",
+ NULL,
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS));
g_object_class_install_property
(object_class, PROP_DHCP4_CONFIG,
- g_param_spec_boxed (NM_DEVICE_DHCP4_CONFIG, "", "",
- DBUS_TYPE_G_OBJECT_PATH,
- G_PARAM_READWRITE |
- G_PARAM_STATIC_STRINGS));
+ g_param_spec_string (NM_DEVICE_DHCP4_CONFIG, "", "",
+ NULL,
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS));
g_object_class_install_property
(object_class, PROP_IP6_CONFIG,
- g_param_spec_boxed (NM_DEVICE_IP6_CONFIG, "", "",
- DBUS_TYPE_G_OBJECT_PATH,
- G_PARAM_READWRITE |
- G_PARAM_STATIC_STRINGS));
+ g_param_spec_string (NM_DEVICE_IP6_CONFIG, "", "",
+ NULL,
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS));
g_object_class_install_property
(object_class, PROP_DHCP6_CONFIG,
- g_param_spec_boxed (NM_DEVICE_DHCP6_CONFIG, "", "",
- DBUS_TYPE_G_OBJECT_PATH,
- G_PARAM_READWRITE |
- G_PARAM_STATIC_STRINGS));
+ g_param_spec_string (NM_DEVICE_DHCP6_CONFIG, "", "",
+ NULL,
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS));
g_object_class_install_property
(object_class, PROP_STATE,
g_object_class_install_property
(object_class, PROP_STATE_REASON,
- g_param_spec_boxed (NM_DEVICE_STATE_REASON, "", "",
- DBUS_TYPE_STATE_REASON_STRUCT,
- G_PARAM_READABLE |
- G_PARAM_STATIC_STRINGS));
+ g_param_spec_variant (NM_DEVICE_STATE_REASON, "", "",
+ G_VARIANT_TYPE ("(uu)"),
+ NULL,
+ G_PARAM_READABLE |
+ G_PARAM_STATIC_STRINGS));
g_object_class_install_property
(object_class, PROP_ACTIVE_CONNECTION,
- g_param_spec_boxed (NM_DEVICE_ACTIVE_CONNECTION, "", "",
- DBUS_TYPE_G_OBJECT_PATH,
- G_PARAM_READABLE |
- G_PARAM_STATIC_STRINGS));
+ g_param_spec_string (NM_DEVICE_ACTIVE_CONNECTION, "", "",
+ NULL,
+ G_PARAM_READABLE |
+ G_PARAM_STATIC_STRINGS));
g_object_class_install_property
(object_class, PROP_DEVICE_TYPE,
g_object_class_install_property
(object_class, PROP_AVAILABLE_CONNECTIONS,
g_param_spec_boxed (NM_DEVICE_AVAILABLE_CONNECTIONS, "", "",
- DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH,
+ G_TYPE_STRV,
G_PARAM_READABLE |
G_PARAM_STATIC_STRINGS));
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
0, NULL, NULL, NULL,
- /* dbus-glib context, connection, permission, allow_interaction, callback, user_data */
- G_TYPE_NONE, 6, G_TYPE_POINTER, G_TYPE_POINTER, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_POINTER, G_TYPE_POINTER);
+ /* context, connection, permission, allow_interaction, callback, user_data */
+ G_TYPE_NONE, 6, G_TYPE_DBUS_METHOD_INVOCATION, NM_TYPE_CONNECTION, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_POINTER, G_TYPE_POINTER);
signals[IP4_CONFIG_CHANGED] =
g_signal_new (NM_DEVICE_IP4_CONFIG_CHANGED,
G_TYPE_NONE, 0);
nm_exported_object_class_add_interface (NM_EXPORTED_OBJECT_CLASS (klass),
- &dbus_glib_nm_device_object_info);
-
- dbus_g_error_domain_register (NM_DEVICE_ERROR, NULL, NM_TYPE_DEVICE_ERROR);
+ NMDBUS_TYPE_DEVICE_SKELETON,
+ "Disconnect", impl_device_disconnect,
+ "Delete", impl_device_delete,
+ NULL);
}
#ifndef __NETWORKMANAGER_DEVICE_H__
#define __NETWORKMANAGER_DEVICE_H__
-#include <dbus/dbus-glib.h>
#include <netinet/in.h>
#include "nm-exported-object.h"
} NMDeviceClass;
typedef void (*NMDeviceAuthRequestFunc) (NMDevice *device,
- DBusGMethodInvocation *context,
+ GDBusMethodInvocation *context,
NMAuthSubject *subject,
GError *error,
gpointer user_data);
-I${top_builddir}/src \
-I${top_srcdir}/src/devices \
-I${top_srcdir}/src/platform \
+ -I${top_builddir}/introspection \
-I${top_srcdir}/include \
-I${top_builddir}/libnm-core \
-I${top_srcdir}/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager-team"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
- $(DBUS_CFLAGS)
+ $(GLIB_CFLAGS)
if WITH_TEAMDCTL
AM_CPPFLAGS += ${LIBTEAMDCTL_CFLAGS}
GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
nm_team_enum_types_sources = $(srcdir)/nm-device-team.h
-glue_sources = \
- nm-device-team-glue.h
-
-%-glue.h: $(top_srcdir)/introspection/%.xml
- $(AM_V_GEN) dbus-binding-tool --prefix=$(subst -,_,$(subst -glue.h,,$@)) --mode=glib-server --output=$@ $<
-
-BUILT_SOURCES = $(GLIB_GENERATED) $(glue_sources)
+BUILT_SOURCES = $(GLIB_GENERATED)
pkglib_LTLIBRARIES = libnm-device-plugin-team.la
-Wl,--version-script=$(SYMBOL_VIS_FILE)
libnm_device_plugin_team_la_LIBADD = \
- $(DBUS_LIBS) \
+ $(top_builddir)/introspection/libnmdbus.la \
+ $(GLIB_LIBS) \
$(GUDEV_LIBS)
if WITH_TEAMDCTL
#include "NetworkManagerUtils.h"
#include "nm-device-private.h"
#include "nm-platform.h"
-#include "nm-dbus-glib-types.h"
#include "nm-enum-types.h"
#include "nm-team-enum-types.h"
#include "nm-core-internal.h"
+#include "nm-dbus-compat.h"
-#include "nm-device-team-glue.h"
+#include "nmdbus-device-team.h"
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceTeam);
g_object_class_install_property
(object_class, PROP_SLAVES,
g_param_spec_boxed (NM_DEVICE_TEAM_SLAVES, "", "",
- DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH,
+ G_TYPE_STRV,
G_PARAM_READABLE |
G_PARAM_STATIC_STRINGS));
nm_exported_object_class_add_interface (NM_EXPORTED_OBJECT_CLASS (klass),
- &dbus_glib_nm_device_team_object_info);
+ NMDBUS_TYPE_DEVICE_TEAM_SKELETON,
+ NULL);
}
-I${top_srcdir}/src/settings \
-I${top_srcdir}/src/platform \
-I${top_srcdir}/src/supplicant-manager \
+ -I${top_builddir}/introspection \
-I${top_srcdir}/include \
-I${top_builddir}/libnm-core \
-I${top_srcdir}/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager-wifi"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
- $(DBUS_CFLAGS)
+ $(GLIB_CFLAGS)
GLIB_GENERATED = nm-wifi-enum-types.h nm-wifi-enum-types.c
GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM
$(srcdir)/nm-wifi-ap.h \
$(srcdir)/nm-device-olpc-mesh.h
-glue_sources = \
- nm-device-wifi-glue.h \
- nm-device-olpc-mesh-glue.h
-
-%-glue.h: $(top_srcdir)/introspection/%.xml
- $(AM_V_GEN) dbus-binding-tool --prefix=$(subst -,_,$(subst -glue.h,,$@)) --mode=glib-server --output=$@ $<
-
-BUILT_SOURCES = $(GLIB_GENERATED) $(glue_sources)
+BUILT_SOURCES = $(GLIB_GENERATED)
pkglib_LTLIBRARIES = libnm-device-plugin-wifi.la
-Wl,--version-script=$(SYMBOL_VIS_FILE)
libnm_device_plugin_wifi_la_LIBADD = \
- $(DBUS_LIBS) \
+ $(top_builddir)/introspection/libnmdbus.la \
+ $(GLIB_LIBS) \
$(GUDEV_LIBS)
CLEANFILES = $(BUILT_SOURCES)
#include "config.h"
-#include <dbus/dbus.h>
#include <netinet/in.h>
#include <string.h>
#include <sys/stat.h>
/* This is a bug; but we can't really change API now... */
#include "nm-vpn-dbus-interface.h"
-#include "nm-device-olpc-mesh-glue.h"
+#include "nmdbus-device-olpc-mesh.h"
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceOlpcMesh);
/* Properties */
g_object_class_install_property
(object_class, PROP_COMPANION,
- g_param_spec_boxed (NM_DEVICE_OLPC_MESH_COMPANION, "", "",
- DBUS_TYPE_G_OBJECT_PATH,
- G_PARAM_READABLE |
- G_PARAM_STATIC_STRINGS));
+ g_param_spec_string (NM_DEVICE_OLPC_MESH_COMPANION, "", "",
+ NULL,
+ G_PARAM_READABLE |
+ G_PARAM_STATIC_STRINGS));
g_object_class_install_property
(object_class, PROP_ACTIVE_CHANNEL,
G_PARAM_STATIC_STRINGS));
nm_exported_object_class_add_interface (NM_EXPORTED_OBJECT_CLASS (klass),
- &dbus_glib_nm_device_olpc_mesh_object_info);
+ NMDBUS_TYPE_DEVICE_OLPC_MESH_SKELETON,
+ NULL);
}
#include "config.h"
-#include <dbus/dbus.h>
#include <netinet/in.h>
#include <string.h>
#include <unistd.h>
#include "nm-auth-utils.h"
#include "nm-settings-connection.h"
#include "nm-enum-types.h"
-#include "nm-dbus-glib-types.h"
#include "nm-wifi-enum-types.h"
#include "nm-connection-provider.h"
-static gboolean impl_device_get_access_points (NMDeviceWifi *device,
- GPtrArray **aps,
- GError **err);
-
-static gboolean impl_device_get_all_access_points (NMDeviceWifi *device,
- GPtrArray **aps,
- GError **err);
-
-static void impl_device_request_scan (NMDeviceWifi *device,
- GHashTable *options,
- DBusGMethodInvocation *context);
-
-#include "nm-device-wifi-glue.h"
+#include "nmdbus-device-wifi.h"
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceWifi);
return g_slist_sort (sorted, (GCompareFunc) ap_id_compare);
}
-static gboolean
-impl_device_get_access_points (NMDeviceWifi *self,
- GPtrArray **aps,
- GError **err)
+static void
+impl_device_wifi_get_access_points (NMDeviceWifi *self,
+ GDBusMethodInvocation *context)
{
GSList *sorted, *iter;
+ GPtrArray *paths;
- *aps = g_ptr_array_new ();
+ paths = g_ptr_array_new ();
sorted = get_sorted_ap_list (self);
for (iter = sorted; iter; iter = iter->next) {
NMAccessPoint *ap = NM_AP (iter->data);
if (nm_ap_get_ssid (ap))
- g_ptr_array_add (*aps, g_strdup (nm_exported_object_get_path (NM_EXPORTED_OBJECT (ap))));
+ g_ptr_array_add (paths, g_strdup (nm_exported_object_get_path (NM_EXPORTED_OBJECT (ap))));
}
+ g_ptr_array_add (paths, NULL);
g_slist_free (sorted);
- return TRUE;
+
+ g_dbus_method_invocation_return_value (context, g_variant_new ("(^ao)", (char **) paths->pdata));
+ g_ptr_array_unref (paths);
}
-static gboolean
-impl_device_get_all_access_points (NMDeviceWifi *self,
- GPtrArray **aps,
- GError **err)
+static void
+impl_device_wifi_get_all_access_points (NMDeviceWifi *self,
+ GDBusMethodInvocation *context)
{
GSList *sorted, *iter;
+ GPtrArray *paths;
- *aps = g_ptr_array_new ();
+ paths = g_ptr_array_new ();
sorted = get_sorted_ap_list (self);
for (iter = sorted; iter; iter = iter->next)
- g_ptr_array_add (*aps, g_strdup (nm_exported_object_get_path (NM_EXPORTED_OBJECT (iter->data))));
+ g_ptr_array_add (paths, g_strdup (nm_exported_object_get_path (NM_EXPORTED_OBJECT (iter->data))));
+ g_ptr_array_add (paths, NULL);
g_slist_free (sorted);
- return TRUE;
+
+ g_dbus_method_invocation_return_value (context, g_variant_new ("(^ao)", (char **) paths->pdata));
+ g_ptr_array_unref (paths);
}
static void
request_scan_cb (NMDevice *device,
- DBusGMethodInvocation *context,
+ GDBusMethodInvocation *context,
NMAuthSubject *subject,
GError *error,
gpointer user_data)
{
NMDeviceWifi *self = NM_DEVICE_WIFI (device);
- GError *local = NULL;
if (error) {
- dbus_g_method_return_error (context, error);
+ g_dbus_method_invocation_return_gerror (context, error);
return;
}
if (!check_scanning_allowed (self)) {
- local = g_error_new_literal (NM_DEVICE_ERROR,
- NM_DEVICE_ERROR_NOT_ALLOWED,
- "Scanning not allowed at this time");
- dbus_g_method_return_error (context, local);
- g_error_free (local);
+ g_dbus_method_invocation_return_error_literal (context,
+ NM_DEVICE_ERROR,
+ NM_DEVICE_ERROR_NOT_ALLOWED,
+ "Scanning not allowed at this time");
return;
}
cancel_pending_scan (self);
request_wireless_scan (self);
- dbus_g_method_return (context);
+ g_dbus_method_invocation_return_value (context, NULL);
}
static void
-impl_device_request_scan (NMDeviceWifi *self,
- GHashTable *options,
- DBusGMethodInvocation *context)
+impl_device_wifi_request_scan (NMDeviceWifi *self,
+ GDBusMethodInvocation *context,
+ GVariant *options)
{
NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
NMDevice *device = NM_DEVICE (self);
gint32 last_scan;
- GError *error;
if ( !priv->enabled
|| !priv->sup_iface
|| nm_device_get_state (device) < NM_DEVICE_STATE_DISCONNECTED
|| nm_device_is_activating (device)) {
- error = g_error_new_literal (NM_DEVICE_ERROR,
- NM_DEVICE_ERROR_NOT_ALLOWED,
- "Scanning not allowed while unavailable or activating");
- goto error;
+ g_dbus_method_invocation_return_error_literal (context,
+ NM_DEVICE_ERROR,
+ NM_DEVICE_ERROR_NOT_ALLOWED,
+ "Scanning not allowed while unavailable or activating");
+ return;
}
if (nm_supplicant_interface_get_scanning (priv->sup_iface)) {
- error = g_error_new_literal (NM_DEVICE_ERROR,
- NM_DEVICE_ERROR_NOT_ALLOWED,
- "Scanning not allowed while already scanning");
- goto error;
+ g_dbus_method_invocation_return_error_literal (context,
+ NM_DEVICE_ERROR,
+ NM_DEVICE_ERROR_NOT_ALLOWED,
+ "Scanning not allowed while already scanning");
+ return;
}
last_scan = nm_supplicant_interface_get_last_scan_time (priv->sup_iface);
if (last_scan && (nm_utils_get_monotonic_timestamp_s () - last_scan) < 10) {
- error = g_error_new_literal (NM_DEVICE_ERROR,
- NM_DEVICE_ERROR_NOT_ALLOWED,
- "Scanning not allowed immediately following previous scan");
- goto error;
+ g_dbus_method_invocation_return_error_literal (context,
+ NM_DEVICE_ERROR,
+ NM_DEVICE_ERROR_NOT_ALLOWED,
+ "Scanning not allowed immediately following previous scan");
+ return;
}
/* Ask the manager to authenticate this request for us */
TRUE,
request_scan_cb,
NULL);
- return;
-
-error:
- dbus_g_method_return_error (context, error);
- g_error_free (error);
}
static gboolean
g_value_set_uint (value, priv->capabilities);
break;
case PROP_ACCESS_POINTS:
- array = g_ptr_array_sized_new (g_hash_table_size (priv->aps));
+ array = g_ptr_array_sized_new (g_hash_table_size (priv->aps) + 1);
g_hash_table_iter_init (&iter, priv->aps);
while (g_hash_table_iter_next (&iter, (gpointer) &dbus_path, NULL))
g_ptr_array_add (array, g_strdup (dbus_path));
- g_value_take_boxed (value, array);
+ g_ptr_array_add (array, NULL);
+ g_value_take_boxed (value, (char **) g_ptr_array_free (array, FALSE));
break;
case PROP_ACTIVE_ACCESS_POINT:
nm_utils_g_value_set_object_path (value, priv->current_ap);
g_object_class_install_property
(object_class, PROP_ACCESS_POINTS,
g_param_spec_boxed (NM_DEVICE_WIFI_ACCESS_POINTS, "", "",
- DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH,
+ G_TYPE_STRV,
G_PARAM_READABLE |
G_PARAM_STATIC_STRINGS));
g_object_class_install_property
(object_class, PROP_ACTIVE_ACCESS_POINT,
- g_param_spec_boxed (NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT, "", "",
- DBUS_TYPE_G_OBJECT_PATH,
- G_PARAM_READABLE |
- G_PARAM_STATIC_STRINGS));
+ g_param_spec_string (NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT, "", "",
+ NULL,
+ G_PARAM_READABLE |
+ G_PARAM_STATIC_STRINGS));
g_object_class_install_property
(object_class, PROP_CAPABILITIES,
G_STRUCT_OFFSET (NMDeviceWifiClass, access_point_added),
NULL, NULL, NULL,
G_TYPE_NONE, 1,
- G_TYPE_OBJECT);
+ NM_TYPE_AP);
signals[ACCESS_POINT_REMOVED] =
g_signal_new ("access-point-removed",
0,
NULL, NULL, NULL,
G_TYPE_NONE, 1,
- G_TYPE_OBJECT);
+ NM_TYPE_AP);
signals[SCANNING_ALLOWED] =
g_signal_new ("scanning-allowed",
G_TYPE_BOOLEAN, 0);
nm_exported_object_class_add_interface (NM_EXPORTED_OBJECT_CLASS (klass),
- &dbus_glib_nm_device_wifi_object_info);
+ NMDBUS_TYPE_DEVICE_WIFI_SKELETON,
+ "GetAccessPoints", impl_device_wifi_get_access_points,
+ "GetAllAccessPoints", impl_device_wifi_get_all_access_points,
+ "RequestScan", impl_device_wifi_request_scan,
+ NULL);
}
#include "nm-setting-wireless.h"
-#include "nm-access-point-glue.h"
+#include "nmdbus-access-point.h"
/*
* Encapsulates Access Point information
GByteArray * ssid;
char * address;
NM80211Mode mode;
- gint8 strength;
+ guint8 strength;
guint32 freq; /* Frequency in MHz; ie 2412 (== 2.412 GHz) */
guint32 max_bitrate;/* Maximum bitrate of the AP in Kbit/s (ie 54000 Kb/s == 54Mbit/s) */
GValue *value, GParamSpec *pspec)
{
NMAccessPointPrivate *priv = NM_AP_GET_PRIVATE (object);
- GArray * ssid;
- int len;
- int i;
+ GVariant *ssid;
switch (prop_id) {
case PROP_FLAGS:
g_value_set_uint (value, priv->rsn_flags);
break;
case PROP_SSID:
- len = priv->ssid ? priv->ssid->len : 0;
- ssid = g_array_sized_new (FALSE, TRUE, sizeof (unsigned char), len);
- for (i = 0; i < len; i++)
- g_array_append_val (ssid, priv->ssid->data[i]);
- g_value_set_boxed (value, ssid);
- g_array_free (ssid, TRUE);
+ if (priv->ssid) {
+ ssid = g_variant_new_fixed_array (G_VARIANT_TYPE_BYTE,
+ priv->ssid->data, priv->ssid->len, 1);
+ } else
+ ssid = g_variant_new_array (G_VARIANT_TYPE_BYTE, NULL, 0);
+ g_value_take_variant (value, ssid);
break;
case PROP_FREQUENCY:
g_value_set_uint (value, priv->freq);
g_value_set_uint (value, priv->max_bitrate);
break;
case PROP_STRENGTH:
- g_value_set_schar (value, priv->strength);
+ g_value_set_uchar (value, priv->strength);
break;
case PROP_LAST_SEEN:
g_value_set_int (value,
g_object_class_install_property
(object_class, PROP_SSID,
- g_param_spec_boxed (NM_AP_SSID, "", "",
- DBUS_TYPE_G_UCHAR_ARRAY,
- G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+ g_param_spec_variant (NM_AP_SSID, "", "",
+ G_VARIANT_TYPE ("ay"),
+ NULL,
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property
(object_class, PROP_FREQUENCY,
g_object_class_install_property
(object_class, PROP_STRENGTH,
- g_param_spec_char (NM_AP_STRENGTH, "", "",
- G_MININT8, G_MAXINT8, 0,
- G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
+ g_param_spec_uchar (NM_AP_STRENGTH, "", "",
+ 0, G_MAXINT8, 0,
+ G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property
(object_class, PROP_LAST_SEEN,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
nm_exported_object_class_add_interface (NM_EXPORTED_OBJECT_CLASS (ap_class),
- &dbus_glib_nm_access_point_object_info);
+ NMDBUS_TYPE_ACCESS_POINT_SKELETON,
+ NULL);
}
AM_CPPFLAGS = \
+ -I$(top_builddir)/introspection \
-I$(top_srcdir)/include \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager-wifi"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
- $(GLIB_CFLAGS) \
- $(DBUS_CFLAGS)
+ $(GLIB_CFLAGS)
noinst_PROGRAMS = test-wifi-ap-utils
#include "nm-default.h"
#include "nm-wifi-ap-utils.h"
-#include "nm-dbus-glib-types.h"
#include "nm-core-internal.h"
-I${top_srcdir}/src/devices \
-I${top_srcdir}/src/settings \
-I${top_srcdir}/src/platform \
+ -I${top_builddir}/introspection \
-I${top_srcdir}/include \
-I${top_builddir}/libnm-core \
-I${top_srcdir}/libnm-core \
-DG_LOG_DOMAIN=\""NetworkManager-wwan"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
- $(DBUS_CFLAGS) \
+ $(GLIB_CFLAGS) \
$(MM_GLIB_CFLAGS)
BUILT_SOURCES = $(null)
libnm_wwan_la_LDFLAGS = \
-avoid-version \
-Wl,--version-script=$(WWAN_SYMBOL_VIS_FILE)
-libnm_wwan_la_LIBADD = $(DBUS_LIBS) $(MM_GLIB_LIBS)
+libnm_wwan_la_LIBADD = \
+ $(top_builddir)/introspection/libnmdbus.la \
+ $(GLIB_LIBS) \
+ $(MM_GLIB_LIBS)
###########################################################
-nm-device-modem-glue.h: $(top_srcdir)/introspection/nm-device-modem.xml
- dbus-binding-tool --prefix=nm_device_modem --mode=glib-server --output=$@ $<
-
-BUILT_SOURCES += nm-device-modem-glue.h
-
SYMBOL_VIS_FILE=$(srcdir)/exports.ver
libnm_device_plugin_wwan_la_SOURCES = \
nm-wwan-factory.c \
nm-wwan-factory.h \
nm-device-modem.c \
- nm-device-modem.h \
- nm-device-modem-glue.h
+ nm-device-modem.h
libnm_device_plugin_wwan_la_LDFLAGS = \
-module -avoid-version \
-Wl,--version-script=$(SYMBOL_VIS_FILE)
libnm_device_plugin_wwan_la_LIBADD = \
+ $(top_builddir)/introspection/libnmdbus.la \
libnm-wwan.la \
- $(DBUS_LIBS)
+ $(GLIB_LIBS)
###########################################################
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceModem);
+#include "nmdbus-device-modem.h"
+
G_DEFINE_TYPE (NMDeviceModem, nm_device_modem, NM_TYPE_DEVICE)
#define NM_DEVICE_MODEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DEVICE_MODEM, NMDeviceModemPrivate))
-#include "nm-device-modem-glue.h"
-
typedef struct {
NMModem *modem;
NMDeviceModemCapabilities caps;
G_PARAM_STATIC_STRINGS));
nm_exported_object_class_add_interface (NM_EXPORTED_OBJECT_CLASS (mclass),
- &dbus_glib_nm_device_modem_object_info);
+ NMDBUS_TYPE_DEVICE_MODEM_SKELETON,
+ NULL);
}
#include "nm-default.h"
#include "NetworkManagerUtils.h"
#include "nm-device-private.h"
-#include "nm-dbus-glib-types.h"
#include "nm-modem-enum-types.h"
#include "nm-route-manager.h"
device = nm_active_connection_get_device (NM_ACTIVE_CONNECTION (object));
if (!device) {
- g_value_set_boxed (value, "/");
+ g_value_set_string (value, "/");
return;
}
#include "nm-default.h"
#include "nm-active-connection.h"
#include "nm-dbus-interface.h"
-#include "nm-dbus-glib-types.h"
#include "nm-device.h"
#include "nm-settings-connection.h"
#include "nm-auth-utils.h"
#include "nm-auth-subject.h"
#include "NetworkManagerUtils.h"
-#include "nm-active-connection-glue.h"
+
+#include "nmdbus-active-connection.h"
/* Base class for anything implementing the Connection.Active D-Bus interface */
G_DEFINE_ABSTRACT_TYPE (NMActiveConnection, nm_active_connection, NM_TYPE_EXPORTED_OBJECT)
static void
auth_done (NMAuthChain *chain,
GError *error,
- DBusGMethodInvocation *unused,
+ GDBusMethodInvocation *unused,
gpointer user_data)
{
NMActiveConnection *self = NM_ACTIVE_CONNECTION (user_data);
nm_active_connection_set_master (NM_ACTIVE_CONNECTION (object), g_value_get_object (value));
break;
case PROP_SPECIFIC_OBJECT:
- tmp = g_value_get_boxed (value);
+ tmp = g_value_get_string (value);
/* NM uses "/" to mean NULL */
if (g_strcmp0 (tmp, "/") != 0)
- priv->specific_object = g_value_dup_boxed (value);
+ priv->specific_object = g_strdup (tmp);
break;
case PROP_DEFAULT:
priv->is_default = !!g_value_get_boolean (value);
switch (prop_id) {
case PROP_CONNECTION:
- g_value_set_boxed (value, nm_connection_get_path (priv->connection));
+ g_value_set_string (value, nm_connection_get_path (priv->connection));
break;
case PROP_ID:
g_value_set_string (value, nm_connection_get_id (priv->connection));
g_value_set_string (value, nm_connection_get_connection_type (priv->connection));
break;
case PROP_SPECIFIC_OBJECT:
- g_value_set_boxed (value, priv->specific_object ? priv->specific_object : "/");
+ g_value_set_string (value, priv->specific_object ? priv->specific_object : "/");
break;
case PROP_DEVICES:
- devices = g_ptr_array_sized_new (1);
+ devices = g_ptr_array_sized_new (2);
if (priv->device && priv->state < NM_ACTIVE_CONNECTION_STATE_DEACTIVATED)
g_ptr_array_add (devices, g_strdup (nm_exported_object_get_path (NM_EXPORTED_OBJECT (priv->device))));
- g_value_take_boxed (value, devices);
+ g_ptr_array_add (devices, NULL);
+ g_value_take_boxed (value, (char **) g_ptr_array_free (devices, FALSE));
break;
case PROP_STATE:
if (priv->state_set)
break;
case PROP_IP4_CONFIG:
/* The IP and DHCP config properties may be overridden by a subclass */
- g_value_set_boxed (value, "/");
+ g_value_set_string (value, "/");
break;
case PROP_DHCP4_CONFIG:
- g_value_set_boxed (value, "/");
+ g_value_set_string (value, "/");
break;
case PROP_DEFAULT6:
g_value_set_boolean (value, priv->is_default6);
break;
case PROP_IP6_CONFIG:
- g_value_set_boxed (value, "/");
+ g_value_set_string (value, "/");
break;
case PROP_DHCP6_CONFIG:
- g_value_set_boxed (value, "/");
+ g_value_set_string (value, "/");
break;
case PROP_VPN:
g_value_set_boolean (value, priv->vpn);
/* D-Bus exported properties */
g_object_class_install_property
(object_class, PROP_CONNECTION,
- g_param_spec_boxed (NM_ACTIVE_CONNECTION_CONNECTION, "", "",
- DBUS_TYPE_G_OBJECT_PATH,
- G_PARAM_READABLE |
- G_PARAM_STATIC_STRINGS));
+ g_param_spec_string (NM_ACTIVE_CONNECTION_CONNECTION, "", "",
+ NULL,
+ G_PARAM_READABLE |
+ G_PARAM_STATIC_STRINGS));
g_object_class_install_property
(object_class, PROP_ID,
g_object_class_install_property
(object_class, PROP_SPECIFIC_OBJECT,
- g_param_spec_boxed (NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT, "", "",
- DBUS_TYPE_G_OBJECT_PATH,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
- G_PARAM_STATIC_STRINGS));
+ g_param_spec_string (NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT, "", "",
+ NULL,
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
+ G_PARAM_STATIC_STRINGS));
g_object_class_install_property
(object_class, PROP_DEVICES,
g_param_spec_boxed (NM_ACTIVE_CONNECTION_DEVICES, "", "",
- DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH,
+ G_TYPE_STRV,
G_PARAM_READABLE |
G_PARAM_STATIC_STRINGS));
g_object_class_install_property
(object_class, PROP_IP4_CONFIG,
- g_param_spec_boxed (NM_ACTIVE_CONNECTION_IP4_CONFIG, "", "",
- DBUS_TYPE_G_OBJECT_PATH,
- G_PARAM_READABLE |
- G_PARAM_STATIC_STRINGS));
+ g_param_spec_string (NM_ACTIVE_CONNECTION_IP4_CONFIG, "", "",
+ NULL,
+ G_PARAM_READABLE |
+ G_PARAM_STATIC_STRINGS));
g_object_class_install_property
(object_class, PROP_DHCP4_CONFIG,
- g_param_spec_boxed (NM_ACTIVE_CONNECTION_DHCP4_CONFIG, "", "",
- DBUS_TYPE_G_OBJECT_PATH,
- G_PARAM_READABLE |
- G_PARAM_STATIC_STRINGS));
+ g_param_spec_string (NM_ACTIVE_CONNECTION_DHCP4_CONFIG, "", "",
+ NULL,
+ G_PARAM_READABLE |
+ G_PARAM_STATIC_STRINGS));
g_object_class_install_property
(object_class, PROP_DEFAULT6,
g_object_class_install_property
(object_class, PROP_IP6_CONFIG,
- g_param_spec_boxed (NM_ACTIVE_CONNECTION_IP6_CONFIG, "", "",
- DBUS_TYPE_G_OBJECT_PATH,
- G_PARAM_READABLE |
- G_PARAM_STATIC_STRINGS));
+ g_param_spec_string (NM_ACTIVE_CONNECTION_IP6_CONFIG, "", "",
+ NULL,
+ G_PARAM_READABLE |
+ G_PARAM_STATIC_STRINGS));
g_object_class_install_property
(object_class, PROP_DHCP6_CONFIG,
- g_param_spec_boxed (NM_ACTIVE_CONNECTION_DHCP6_CONFIG, "", "",
- DBUS_TYPE_G_OBJECT_PATH,
- G_PARAM_READABLE |
- G_PARAM_STATIC_STRINGS));
+ g_param_spec_string (NM_ACTIVE_CONNECTION_DHCP6_CONFIG, "", "",
+ NULL,
+ G_PARAM_READABLE |
+ G_PARAM_STATIC_STRINGS));
g_object_class_install_property
(object_class, PROP_VPN,
g_object_class_install_property
(object_class, PROP_MASTER,
- g_param_spec_boxed (NM_ACTIVE_CONNECTION_MASTER, "", "",
- DBUS_TYPE_G_OBJECT_PATH,
- G_PARAM_READABLE |
- G_PARAM_STATIC_STRINGS));
+ g_param_spec_string (NM_ACTIVE_CONNECTION_MASTER, "", "",
+ NULL,
+ G_PARAM_READABLE |
+ G_PARAM_STATIC_STRINGS));
/* Internal properties */
g_object_class_install_property
G_TYPE_NONE, 1, G_TYPE_UINT);
nm_exported_object_class_add_interface (NM_EXPORTED_OBJECT_CLASS (ac_class),
- &dbus_glib_nm_active_connection_object_info);
+ NMDBUS_TYPE_ACTIVE_CONNECTION_SKELETON,
+ NULL);
}
#include "nm-ip6-config.h"
#include "nm-platform.h"
#include "nm-active-connection.h"
-#include "nm-dbus-glib-types.h"
#include "NetworkManagerUtils.h"
#include "settings/nm-settings-connection.h"
#include "nm-dispatcher.h"
#include "nm-route-manager.h"
#include "nm-firewall-manager.h"
-#include "nm-vpn-connection-glue.h"
+#include "nmdbus-vpn-connection.h"
G_DEFINE_TYPE (NMVpnConnection, nm_vpn_connection, NM_TYPE_ACTIVE_CONNECTION)
G_TYPE_NONE, 0);
nm_exported_object_class_add_interface (NM_EXPORTED_OBJECT_CLASS (connection_class),
- &dbus_glib_nm_vpn_connection_object_info);
+ NMDBUS_TYPE_VPN_CONNECTION_SKELETON,
+ NULL);
}
projects / NetworkManager.git / commitdiff