GDBus: Minor renames and doc fixes

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

Signed-off-by: David Zeuthen <davidz@redhat.com>

diff --git a/docs/reference/gio/gio-sections.txt b/docs/reference/gio/gio-sections.txt
index 5ce48ea..bd040f4 100644 (file)
--- a/docs/reference/gio/gio-sections.txt
+++ b/docs/reference/gio/gio-sections.txt
@@ -3287,7 +3287,7 @@ GDBusObjectManagerServerClass
 g_dbus_object_manager_server_new
 g_dbus_object_manager_server_get_connection
 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
 <SUBSECTION Standard>
 G_DBUS_OBJECT_MANAGER_SERVER

diff --git a/gio/gdbusinterfacestub.c b/gio/gdbusinterfacestub.c
index 3f221a8..ac57eb0 100644 (file)
--- a/gio/gdbusinterfacestub.c
+++ b/gio/gdbusinterfacestub.c
@@ -315,13 +315,17 @@ g_dbus_interface_stub_get_vtable (GDBusInterfaceStub *interface_)
   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:
  * @interface_: A #GDBusInterfaceStub.
  *
  * 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
  */
@@ -602,7 +606,7 @@ g_dbus_interface_stub_get_connection (GDBusInterfaceStub *interface_)
  * g_dbus_interface_stub_get_object_path:
  * @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
  * anywhere. Do not free, the string belongs to @interface_.

diff --git a/gio/gdbusobjectmanagerserver.c b/gio/gdbusobjectmanagerserver.c
index e7a97a1..3b305ca 100644 (file)
--- a/gio/gdbusobjectmanagerserver.c
+++ b/gio/gdbusobjectmanagerserver.c
@@ -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.
  * @object: An object.
  *
@@ -481,8 +481,8 @@ g_dbus_object_manager_server_export (GDBusObjectManagerServer  *manager,
  * Since: 2.30
  */
 void
-g_dbus_object_manager_server_export_and_uniquify (GDBusObjectManagerServer  *manager,
-                                           GDBusObjectStub     *object)
+g_dbus_object_manager_server_export_uniquely (GDBusObjectManagerServer  *manager,
+                                              GDBusObjectStub     *object)
 {
   gchar *orig_object_path;
   gchar *object_path;

diff --git a/gio/gdbusobjectmanagerserver.h b/gio/gdbusobjectmanagerserver.h
index 9248feb..e2bff9c 100644 (file)
--- a/gio/gdbusobjectmanagerserver.h
+++ b/gio/gdbusobjectmanagerserver.h
@@ -74,7 +74,7 @@ GDBusObjectManagerServer *g_dbus_object_manager_server_new                 (GDBu
 GDBusConnection          *g_dbus_object_manager_server_get_connection      (GDBusObjectManagerServer  *manager);
 void                      g_dbus_object_manager_server_export              (GDBusObjectManagerServer  *manager,
                                                                             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);
 void                      g_dbus_object_manager_server_unexport            (GDBusObjectManagerServer  *manager,
                                                                             const gchar               *object_path);

diff --git a/gio/gio.symbols b/gio/gio.symbols
index 49e65c5..29085b3 100644 (file)
--- a/gio/gio.symbols
+++ b/gio/gio.symbols
@@ -2175,7 +2175,7 @@ g_dbus_object_manager_client_new_sync
 #if IN_HEADER(__G_DBUS_OBJECT_MANAGER_SERVER_H__)
 #if IN_FILE(__G_DBUS_OBJECT_MANAGER_SERVER_C__)
 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_type
 g_dbus_object_manager_server_new