luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-02 07:23:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update the GDBus subtree example for the new API

Browse Source
This commit is contained in:
Ryan Lortie
2010-07-19 15:03:54 -04:00
parent c7c573afb6
commit 1a06bd8d3f
2 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gio/tests/gdbus-example-subtree.c
View File

@@ -5,9 +5,9 @@
/* ---------------------------------------------------------------------------------------------------- */
static GDBusNodeInfo *introspection_data = NULL;
static const GDBusInterfaceInfo *manager_interface_info = NULL;
static const GDBusInterfaceInfo *block_interface_info = NULL;
static const GDBusInterfaceInfo *partition_interface_info = NULL;
static GDBusInterfaceInfo *manager_interface_info = NULL;
static GDBusInterfaceInfo *block_interface_info = NULL;
static GDBusInterfaceInfo *partition_interface_info = NULL;
/* Introspection data for the service we are exporting */
static const gchar introspection_xml[] =
@@ -253,7 +253,7 @@ subtree_enumerate (GDBusConnection *connection,
return nodes;
}
static GPtrArray *
static GDBusInterfaceInfo **
subtree_introspect (GDBusConnection *connection,
const gchar *sender,
const gchar *object_path,
@@ -263,18 +263,21 @@ subtree_introspect (GDBusConnection *connection,
GPtrArray *p;
p = g_ptr_array_new ();
if (g_strcmp0 (node, "/") == 0)
if (node == NULL)
{
g_ptr_array_add (p, (gpointer) manager_interface_info);
g_ptr_array_add (p, g_dbus_interface_info_ref (manager_interface_info));
}
else
{
g_ptr_array_add (p, (gpointer) block_interface_info);
g_ptr_array_add (p, g_dbus_interface_info_ref (block_interface_info));
if (strlen (node) == 4)
g_ptr_array_add (p, (gpointer) partition_interface_info);
g_ptr_array_add (p,
g_dbus_interface_info_ref (partition_interface_info));
}
return p;
g_ptr_array_add (p, NULL);
return (GDBusInterfaceInfo **) g_ptr_array_free (p, FALSE);
}
static const GDBusInterfaceVTable *