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

exported-object: allow exporting multiple ifaces

Browse Source 
Allow exporting more than one interface per object class.
This commit is contained in:
Alfonso Sanchez-Beato
2016-08-10 11:54:29 +02:00
committed by Thomas Haller
parent f04baa63c0
commit 3bc5c7dbc1
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -257,12 +257,16 @@ nm_exported_object_class_add_interface (NMExportedObjectClass *object_class,
g_return_if_fail (NM_IS_EXPORTED_OBJECT_CLASS (object_class)); g_return_if_fail (NM_IS_EXPORTED_OBJECT_CLASS (object_class));
g_return_if_fail (g_type_is_a (dbus_skeleton_type, G_TYPE_DBUS_INTERFACE_SKELETON)); g_return_if_fail (g_type_is_a (dbus_skeleton_type, G_TYPE_DBUS_INTERFACE_SKELETON));
classinfo = g_slice_new (NMExportedObjectClassInfo); classinfo = g_type_get_qdata (G_TYPE_FROM_CLASS (object_class),
classinfo->skeleton_types = NULL; nm_exported_object_class_info_quark ());
classinfo->methods = g_array_new (FALSE, FALSE, sizeof (NMExportedObjectDBusMethodImpl)); if (!classinfo) {
classinfo->properties = g_hash_table_new (g_str_hash, g_str_equal); classinfo = g_slice_new (NMExportedObjectClassInfo);
g_type_set_qdata (G_TYPE_FROM_CLASS (object_class), classinfo->skeleton_types = NULL;
nm_exported_object_class_info_quark (), classinfo); classinfo->methods = g_array_new (FALSE, FALSE, sizeof (NMExportedObjectDBusMethodImpl));
classinfo->properties = g_hash_table_new (g_str_hash, g_str_equal);
g_type_set_qdata (G_TYPE_FROM_CLASS (object_class),
nm_exported_object_class_info_quark (), classinfo);
}
classinfo->skeleton_types = g_slist_prepend (classinfo->skeleton_types, classinfo->skeleton_types = g_slist_prepend (classinfo->skeleton_types,
GSIZE_TO_POINTER (dbus_skeleton_type)); GSIZE_TO_POINTER (dbus_skeleton_type));
@@ -342,8 +346,6 @@ nm_exported_object_class_add_interface (NMExportedObjectClass *object_class,
} }
} }
g_assert_cmpint (n_method_signals, ==, classinfo->methods->len);
g_type_class_unref (dbus_object_class); g_type_class_unref (dbus_object_class);
} }