luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

GDBusObjectManagerServer: make export() return whether the object was removed

Browse Source 
This is useful in conjunction with g_warn_if_fail().

Signed-off-by: David Zeuthen <davidz@redhat.com>
This commit is contained in:
David Zeuthen 2011-04-20 11:54:24 -04:00
parent 35b6c76244
commit f0eeadf306
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gio/gdbusobjectmanagerserver.c
View File

@ -531,17 +531,22 @@ g_dbus_object_manager_server_export_uniquely (GDBusObjectManagerServer *manager,
* Note that @object_path must be in the hierarchy rooted by the * Note that @object_path must be in the hierarchy rooted by the
* object path for @manager. * object path for @manager.
* *
* Returns: %TRUE if object at @object_path was removed, %FALSE otherwise.
*
* Since: 2.30 * Since: 2.30
*/ */
void gboolean
g_dbus_object_manager_server_unexport (GDBusObjectManagerServer *manager, g_dbus_object_manager_server_unexport (GDBusObjectManagerServer *manager,
const gchar *object_path) const gchar *object_path)
{ {
RegistrationData *data; RegistrationData *data;
gboolean ret;
g_return_if_fail (G_IS_DBUS_OBJECT_MANAGER_SERVER (manager)); g_return_val_if_fail (G_IS_DBUS_OBJECT_MANAGER_SERVER (manager), FALSE);
g_return_if_fail (g_variant_is_object_path (object_path)); g_return_val_if_fail (g_variant_is_object_path (object_path), FALSE);
g_return_if_fail (g_str_has_prefix (object_path, manager->priv->object_path_ending_in_slash)); g_return_val_if_fail (g_str_has_prefix (object_path, manager->priv->object_path_ending_in_slash), FALSE);
ret = FALSE;
data = g_hash_table_lookup (manager->priv->map_object_path_to_data, object_path); data = g_hash_table_lookup (manager->priv->map_object_path_to_data, object_path);
if (data != NULL) if (data != NULL)
@ -560,7 +565,10 @@ g_dbus_object_manager_server_unexport (GDBusObjectManagerServer *manager,
g_ptr_array_unref (interface_names); g_ptr_array_unref (interface_names);
g_hash_table_remove (manager->priv->map_object_path_to_data, object_path); g_hash_table_remove (manager->priv->map_object_path_to_data, object_path);
ret = TRUE;
} }
return ret;
} }

2
gio/gdbusobjectmanagerserver.h
View File

@ -76,7 +76,7 @@ void g_dbus_object_manager_server_export (GDBu
GDBusObjectSkeleton *object); GDBusObjectSkeleton *object);
void g_dbus_object_manager_server_export_uniquely (GDBusObjectManagerServer *manager, void g_dbus_object_manager_server_export_uniquely (GDBusObjectManagerServer *manager,
GDBusObjectSkeleton *object); GDBusObjectSkeleton *object);
void g_dbus_object_manager_server_unexport (GDBusObjectManagerServer *manager, gboolean g_dbus_object_manager_server_unexport (GDBusObjectManagerServer *manager,
const gchar *object_path); const gchar *object_path);
G_END_DECLS G_END_DECLS