isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 10:00:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

wayland: Shut up about Setenv if we're past initialization

Browse Source 
I'm a bit tired of hearing about this when I launch mutter-wayland
nested. Ideally, this would be part of display server integration,
not GNOME integration, so we could simply not make the call when
nested, but oh well.
This commit is contained in:
Jasper St. Pierre 2014-03-26 12:02:08 -04:00
parent cc0488f1e2
commit 208296a619
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/wayland/meta-wayland.c
View File

@ -575,14 +575,13 @@ set_gnome_env (const char *name,
const char *value) const char *value)
{ {
GDBusConnection *session_bus; GDBusConnection *session_bus;
GError *error; GError *error = NULL;
setenv (name, value, TRUE); setenv (name, value, TRUE);
session_bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL); session_bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
g_assert (session_bus); g_assert (session_bus);
error = NULL;
g_dbus_connection_call_sync (session_bus, g_dbus_connection_call_sync (session_bus,
"org.gnome.SessionManager", "org.gnome.SessionManager",
"/org/gnome/SessionManager", "/org/gnome/SessionManager",
@ -594,8 +593,10 @@ set_gnome_env (const char *name,
-1, NULL, &error); -1, NULL, &error);
if (error) if (error)
{ {
meta_warning ("Failed to set environment variable %s for gnome-session: %s\n", name, error->message); if (g_strcmp0 (g_dbus_error_get_remote_error (error), "org.gnome.SessionManager.NotInInitialization") != 0)
g_clear_error (&error); meta_warning ("Failed to set environment variable %s for gnome-session: %s\n", name, error->message);
g_error_free (error);
} }
} }