colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

exported-object: fix type of @interface variables to be GDBusInterfaceSkeleton

Browse Source
This commit is contained in:
Thomas Haller
2015-09-17 16:57:22 +02:00
parent ed85fcc711
commit d20948647c
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/nm-exported-object.c
View File

@@ -130,7 +130,7 @@ nm_exported_object_signal_hook (GSignalInvocationHint *ihint,
NMExportedObject *self = g_value_get_object (&param_values[0]); NMExportedObject *self = g_value_get_object (&param_values[0]);
NMExportedObjectPrivate *priv; NMExportedObjectPrivate *priv;
GSignalQuery *signal_info = data; GSignalQuery *signal_info = data;
GDBusObjectSkeleton *interface = NULL; GDBusInterfaceSkeleton *interface = NULL;
GSList *iter; GSList *iter;
GValue *dbus_param_values; GValue *dbus_param_values;
int i; int i;
@@ -141,7 +141,7 @@ nm_exported_object_signal_hook (GSignalInvocationHint *ihint,
for (iter = priv->interfaces; iter; iter = iter->next) { for (iter = priv->interfaces; iter; iter = iter->next) {
if (g_type_is_a (G_OBJECT_TYPE (iter->data), signal_info->itype)) { if (g_type_is_a (G_OBJECT_TYPE (iter->data), signal_info->itype)) {
interface = iter->data; interface = G_DBUS_INTERFACE_SKELETON (iter->data);
break; break;
} }
} }
@@ -177,7 +177,7 @@ nm_exported_object_signal_hook (GSignalInvocationHint *ihint,
/** /**
* nm_exported_object_class_add_interface: * nm_exported_object_class_add_interface:
* @object_class: an #NMExportedObjectClass * @object_class: an #NMExportedObjectClass
* @dbus_skeleton_type: the type of the #GDBusObjectSkeleton to add * @dbus_skeleton_type: the type of the #GDBusInterfaceSkeleton to add
* @...: method name / handler pairs, %NULL-terminated * @...: method name / handler pairs, %NULL-terminated
* *
* Adds @dbus_skeleton_type to the list of D-Bus interfaces implemented by * Adds @dbus_skeleton_type to the list of D-Bus interfaces implemented by
@@ -361,7 +361,7 @@ nm_exported_object_create_skeletons (NMExportedObject *self,
GObjectClass *object_class = g_type_class_peek (object_type); GObjectClass *object_class = g_type_class_peek (object_type);
NMExportedObjectClassInfo *classinfo; NMExportedObjectClassInfo *classinfo;
GSList *iter; GSList *iter;
GDBusObjectSkeleton *interface; GDBusInterfaceSkeleton *interface;
guint n_properties; guint n_properties;
int i; int i;
@@ -373,7 +373,8 @@ nm_exported_object_create_skeletons (NMExportedObject *self,
GType dbus_skeleton_type = GPOINTER_TO_SIZE (iter->data); GType dbus_skeleton_type = GPOINTER_TO_SIZE (iter->data);
gs_free GParamSpec **properties = NULL; gs_free GParamSpec **properties = NULL;
interface = g_object_new (dbus_skeleton_type, NULL); interface = G_DBUS_INTERFACE_SKELETON (g_object_new (dbus_skeleton_type, NULL));
priv->interfaces = g_slist_prepend (priv->interfaces, interface); priv->interfaces = g_slist_prepend (priv->interfaces, interface);
/* Bind properties */ /* Bind properties */
@@ -582,7 +583,7 @@ idle_emit_properties_changed (gpointer self)
NMExportedObjectPrivate *priv = NM_EXPORTED_OBJECT_GET_PRIVATE (self); NMExportedObjectPrivate *priv = NM_EXPORTED_OBJECT_GET_PRIVATE (self);
GVariant *notifies; GVariant *notifies;
GSList *iter; GSList *iter;
GDBusObjectSkeleton *interface = NULL; GDBusInterfaceSkeleton *interface = NULL;
guint signal_id = 0; guint signal_id = 0;
priv->notify_idle_id = 0; priv->notify_idle_id = 0;
@@ -593,7 +594,7 @@ idle_emit_properties_changed (gpointer self)
for (iter = priv->interfaces; iter; iter = iter->next) { for (iter = priv->interfaces; iter; iter = iter->next) {
signal_id = g_signal_lookup ("properties-changed", G_OBJECT_TYPE (iter->data)); signal_id = g_signal_lookup ("properties-changed", G_OBJECT_TYPE (iter->data));
if (signal_id != 0) { if (signal_id != 0) {
interface = iter->data; interface = G_DBUS_INTERFACE_SKELETON (iter->data);
break; break;
} }
} }