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

Merge branch 'mcatanzaro/gdbus-error' into 'master'

Browse Source 
gdbus: Improve error when well-known name is unowned

See merge request GNOME/glib!316
This commit is contained in:
Matthias Clasen 2018-09-12 19:40:01 +00:00
commit 54074a3187
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gio/gdbusproxy.c
View File

@ -2723,7 +2723,8 @@ g_dbus_proxy_call_internal (GDBusProxy *proxy,
g_task_return_new_error (task,
G_IO_ERROR,
G_IO_ERROR_FAILED,
_("Cannot invoke method; proxy is for a well-known name without an owner and proxy was constructed with the G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START flag"));
_("Cannot invoke method; proxy is for the well-known name %s without an owner, and proxy was constructed with the G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START flag"),
proxy->priv->name);
g_object_unref (task);
}
G_UNLOCK (properties_lock);
@ -2854,10 +2855,11 @@ g_dbus_proxy_call_sync_internal (GDBusProxy *proxy,
destination = g_strdup (get_destination_for_call (proxy));
if (destination == NULL)
{
g_set_error_literal (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
_("Cannot invoke method; proxy is for a well-known name without an owner and proxy was constructed with the G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START flag"));
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_FAILED,
_("Cannot invoke method; proxy is for the well-known name %s without an owner, and proxy was constructed with the G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START flag"),
proxy->priv->name);
ret = NULL;
G_UNLOCK (properties_lock);
goto out;