diff options
Diffstat (limited to 'mate-session/gsm-manager.c')
| -rw-r--r-- | mate-session/gsm-manager.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/mate-session/gsm-manager.c b/mate-session/gsm-manager.c index 9b5374e..37ca39d 100644 --- a/mate-session/gsm-manager.c +++ b/mate-session/gsm-manager.c @@ -83,7 +83,6 @@ #define GDM_FLEXISERVER_COMMAND "gdmflexiserver" #define GDM_FLEXISERVER_ARGS "--startnew Standard" - #define LOCKDOWN_SCHEMA "org.mate.lockdown" #define KEY_LOCK_DISABLE "disable-lock-screen" #define KEY_LOG_OUT_DISABLE "disable-log-out" @@ -145,7 +144,7 @@ typedef struct { GSettings *settings_lockdown; GSettings *settings_screensaver; - const char *renderer; + char *renderer; DBusGProxy *bus_proxy; DBusGConnection *connection; @@ -768,7 +767,6 @@ typedef struct { guint flags; } ClientEndSessionData; - static gboolean _client_end_session (GsmClient *client, ClientEndSessionData *data) @@ -1697,7 +1695,8 @@ _gsm_manager_set_renderer (GsmManager *manager, { GsmManagerPrivate *priv; priv = gsm_manager_get_instance_private (manager); - priv->renderer = renderer; + g_free (priv->renderer); + priv->renderer = g_strdup (renderer); } static gboolean @@ -1877,7 +1876,6 @@ _disconnect_client (GsmManager *manager, goto out; } - if (app == NULL) { g_debug ("GsmManager: unable to find application for client - not restarting"); goto out; @@ -2494,7 +2492,6 @@ gsm_manager_set_client_store (GsmManager *manager, g_object_unref (priv->clients); } - g_debug ("GsmManager: setting client store %p", store); priv->clients = store; @@ -2660,6 +2657,9 @@ gsm_manager_dispose (GObject *object) g_object_unref (priv->settings_screensaver); priv->settings_screensaver = NULL; } + + g_clear_pointer (&priv->renderer, g_free); + G_OBJECT_CLASS (gsm_manager_parent_class)->dispose (object); } @@ -3349,7 +3349,6 @@ request_hibernate (GsmManager *manager) gtk_widget_show (priv->inhibit_dialog); } - static void request_logout (GsmManager *manager, GsmManagerLogoutMode mode) @@ -4093,7 +4092,6 @@ gsm_manager_get_inhibitors (GsmManager *manager, return TRUE; } - static gboolean _app_has_autostart_condition (const char *id, GsmApp *app, |