diff options
Diffstat (limited to 'gio/gdbusobjectmanagerserver.c')
| -rw-r--r-- | gio/gdbusobjectmanagerserver.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gio/gdbusobjectmanagerserver.c b/gio/gdbusobjectmanagerserver.c index 39f4ed500..a68594765 100644 --- a/gio/gdbusobjectmanagerserver.c +++ b/gio/gdbusobjectmanagerserver.c @@ -318,7 +318,7 @@ g_dbus_object_manager_server_set_connection (GDBusObjectManagerServer *manager, * * Gets the #GDBusConnection used by @manager. * - * Returns: (transfer full): A #GDBusConnection object or %NULL if + * Returns: (transfer full) (nullable): A #GDBusConnection object or %NULL if * @manager isn't exported on a connection. The returned object should * be freed with g_object_unref(). * @@ -565,12 +565,12 @@ void g_dbus_object_manager_server_export_uniquely (GDBusObjectManagerServer *manager, GDBusObjectSkeleton *object) { - gchar *orig_object_path; + const gchar *orig_object_path; gchar *object_path; guint count; gboolean modified; - orig_object_path = g_strdup (g_dbus_object_get_object_path (G_DBUS_OBJECT (object))); + orig_object_path = g_dbus_object_get_object_path (G_DBUS_OBJECT (object)); g_return_if_fail (G_IS_DBUS_OBJECT_MANAGER_SERVER (manager)); g_return_if_fail (G_IS_DBUS_OBJECT (object)); @@ -602,7 +602,6 @@ g_dbus_object_manager_server_export_uniquely (GDBusObjectManagerServer *manager, g_dbus_object_skeleton_set_object_path (G_DBUS_OBJECT_SKELETON (object), object_path); g_free (object_path); - g_free (orig_object_path); } |