brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "launcher: simplify getting session dbus proxy"

Browse Source 
Signals are sent to a specific ID, so we can't use "self" here. After
this revert, VT switching works again.

This reverts commit 8e22bf5bc96a7d9ff1aba8ea8217a4c3ca06b4ce.

https://bugzilla.gnome.org/show_bug.cgi?id=753434
This commit is contained in:
Jonas Ådahl 2015-09-17 11:40:59 +08:00
parent dc780d2c44
commit b7aca07844
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/backends/native/meta-launcher.c
View File

@ -71,17 +71,26 @@ report_error_and_die (const char *prefix,
static Login1Session * static Login1Session *
get_session_proxy (GCancellable *cancellable) get_session_proxy (GCancellable *cancellable)
{ {
char *proxy_path;
char *session_id;
Login1Session *session_proxy; Login1Session *session_proxy;
GError *error = NULL; GError *error = NULL;
if (sd_pid_get_session (getpid (), &session_id) < 0)
return NULL;
proxy_path = get_escaped_dbus_path ("/org/freedesktop/login1/session", session_id);
session_proxy = login1_session_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, session_proxy = login1_session_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START, G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
"org.freedesktop.login1", "org.freedesktop.login1",
"/org/freedesktop/login1/session/self", proxy_path,
cancellable, &error); cancellable, &error);
if (!session_proxy) if (!session_proxy)
report_error_and_die ("Failed getting session proxy", error); report_error_and_die ("Failed getting session proxy", error);
free (proxy_path);
return session_proxy; return session_proxy;
} }