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

GDBus: Minor renames and doc fixes

Browse Source 
As requested by Simon in https://bugzilla.gnome.org/show_bug.cgi?id=647577

Signed-off-by: David Zeuthen <davidz@redhat.com>
This commit is contained in:
David Zeuthen
2011-04-12 20:15:48 -04:00
parent 6bf978f35e
commit 6a4ab7c5d3
5 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/reference/gio/gio-sections.txt
View File

@@ -3287,7 +3287,7 @@ GDBusObjectManagerServerClass
g_dbus_object_manager_server_new g_dbus_object_manager_server_new
g_dbus_object_manager_server_get_connection g_dbus_object_manager_server_get_connection
g_dbus_object_manager_server_export g_dbus_object_manager_server_export
g_dbus_object_manager_server_export_and_uniquify g_dbus_object_manager_server_export_uniquely
g_dbus_object_manager_server_unexport g_dbus_object_manager_server_unexport
<SUBSECTION Standard> <SUBSECTION Standard>
G_DBUS_OBJECT_MANAGER_SERVER G_DBUS_OBJECT_MANAGER_SERVER

8
gio/gdbusinterfacestub.c
View File

@@ -315,13 +315,17 @@ g_dbus_interface_stub_get_vtable (GDBusInterfaceStub *interface_)
return ret; return ret;
} }
/* TODO: use G_VARIANT_TYPE_TYPE_ASV below when that is in GVariant.
* See https://bugzilla.gnome.org/show_bug.cgi?id=647614
*/
/** /**
* g_dbus_interface_stub_get_properties: * g_dbus_interface_stub_get_properties:
* @interface_: A #GDBusInterfaceStub. * @interface_: A #GDBusInterfaceStub.
* *
* Gets all D-Bus properties for @interface_. * Gets all D-Bus properties for @interface_.
* *
* Returns: A new, floating, #GVariant. Free with g_variant_unref(). * Returns: A new, floating, #GVariant of type <link linkend="G-VARIANT-TYPE-DICTIONARY:CAPS">'a{sv}'</link>. Free with g_variant_unref().
* *
* Since: 2.30 * Since: 2.30
*/ */
@@ -602,7 +606,7 @@ g_dbus_interface_stub_get_connection (GDBusInterfaceStub *interface_)
* g_dbus_interface_stub_get_object_path: * g_dbus_interface_stub_get_object_path:
* @interface_: A #GDBusInterfaceStub. * @interface_: A #GDBusInterfaceStub.
* *
* Gets the object that that @interface_ is exported on, if any. * Gets the object path that @interface_ is exported on, if any.
* *
* Returns: A string owned by @interface_ or %NULL if @interface_ is not exported * Returns: A string owned by @interface_ or %NULL if @interface_ is not exported
* anywhere. Do not free, the string belongs to @interface_. * anywhere. Do not free, the string belongs to @interface_.

6
gio/gdbusobjectmanagerserver.c
View File

@@ -468,7 +468,7 @@ g_dbus_object_manager_server_export (GDBusObjectManagerServer *manager,
} }
/** /**
* g_dbus_object_manager_server_export_and_uniquify: * g_dbus_object_manager_server_export_uniquely:
* @manager: A #GDBusObjectManagerServer. * @manager: A #GDBusObjectManagerServer.
* @object: An object. * @object: An object.
* *
@@ -481,8 +481,8 @@ g_dbus_object_manager_server_export (GDBusObjectManagerServer *manager,
* Since: 2.30 * Since: 2.30
*/ */
void void
g_dbus_object_manager_server_export_and_uniquify (GDBusObjectManagerServer *manager, g_dbus_object_manager_server_export_uniquely (GDBusObjectManagerServer *manager,
GDBusObjectStub *object) GDBusObjectStub *object)
{ {
gchar *orig_object_path; gchar *orig_object_path;
gchar *object_path; gchar *object_path;

2
gio/gdbusobjectmanagerserver.h
View File

@@ -74,7 +74,7 @@ GDBusObjectManagerServer *g_dbus_object_manager_server_new (GDBu
GDBusConnection *g_dbus_object_manager_server_get_connection (GDBusObjectManagerServer *manager); GDBusConnection *g_dbus_object_manager_server_get_connection (GDBusObjectManagerServer *manager);
void g_dbus_object_manager_server_export (GDBusObjectManagerServer *manager, void g_dbus_object_manager_server_export (GDBusObjectManagerServer *manager,
GDBusObjectStub *object); GDBusObjectStub *object);
void g_dbus_object_manager_server_export_and_uniquify (GDBusObjectManagerServer *manager, void g_dbus_object_manager_server_export_uniquely (GDBusObjectManagerServer *manager,
GDBusObjectStub *object); GDBusObjectStub *object);
void g_dbus_object_manager_server_unexport (GDBusObjectManagerServer *manager, void g_dbus_object_manager_server_unexport (GDBusObjectManagerServer *manager,
const gchar *object_path); const gchar *object_path);

2
gio/gio.symbols
View File

@@ -2175,7 +2175,7 @@ g_dbus_object_manager_client_new_sync
#if IN_HEADER(__G_DBUS_OBJECT_MANAGER_SERVER_H__) #if IN_HEADER(__G_DBUS_OBJECT_MANAGER_SERVER_H__)
#if IN_FILE(__G_DBUS_OBJECT_MANAGER_SERVER_C__) #if IN_FILE(__G_DBUS_OBJECT_MANAGER_SERVER_C__)
g_dbus_object_manager_server_export g_dbus_object_manager_server_export
g_dbus_object_manager_server_export_and_uniquify g_dbus_object_manager_server_export_uniquely
g_dbus_object_manager_server_get_connection g_dbus_object_manager_server_get_connection
g_dbus_object_manager_server_get_type g_dbus_object_manager_server_get_type
g_dbus_object_manager_server_new g_dbus_object_manager_server_new