luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-12 07:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

GDBusMenuModel: Allow NULL bus name for peer-to-peer connection

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=720380
This commit is contained in:
Daiki Ueno 2013-12-13 18:29:46 +09:00 committed by Philip Withnall
parent 3b89702bcf
commit e8a09b3f85
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gio/gdbusmenumodel.c
View File

@ -203,7 +203,7 @@ path_identifier_equal (gconstpointer a,
ConstPathIdentifier *id_b = b; ConstPathIdentifier *id_b = b;
return id_a->connection == id_b->connection && return id_a->connection == id_b->connection &&
g_str_equal (id_a->bus_name, id_b->bus_name) && g_strcmp0 (id_a->bus_name, id_b->bus_name) == 0 &&
g_str_equal (id_a->object_path, id_b->object_path); g_str_equal (id_a->object_path, id_b->object_path);
} }
@ -857,7 +857,8 @@ g_dbus_menu_model_get_from_group (GDBusMenuGroup *group,
/** /**
* g_dbus_menu_model_get: * g_dbus_menu_model_get:
* @connection: a #GDBusConnection * @connection: a #GDBusConnection
* @bus_name: the bus name which exports the menu model * @bus_name: (nullable): the bus name which exports the menu model
* or %NULL if @connection is not a message bus connection
* @object_path: the object path at which the menu model is exported * @object_path: the object path at which the menu model is exported
* *
* Obtains a #GDBusMenuModel for the menu model which is exported * Obtains a #GDBusMenuModel for the menu model which is exported
@ -883,6 +884,8 @@ g_dbus_menu_model_get (GDBusConnection *connection,
GDBusMenuModel *proxy; GDBusMenuModel *proxy;
GMainContext *context; GMainContext *context;
g_return_val_if_fail (bus_name != NULL || g_dbus_connection_get_unique_name (connection) == NULL, NULL);
context = g_main_context_get_thread_default (); context = g_main_context_get_thread_default ();
if (context == NULL) if (context == NULL)
context = g_main_context_default (); context = g_main_context_default ();