From 2abdf9f887164998863298aa55a3f12705132524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= Date: Fri, 19 Sep 2014 23:23:11 +0300 Subject: [PATCH] example --- gnome-session/gsm-manager.c | 3 --- gnome-session/gsm-shell.c | 12 ++++++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c index 596db92..48176ad 100644 --- a/gnome-session/gsm-manager.c +++ b/gnome-session/gsm-manager.c @@ -3018,9 +3018,6 @@ static void show_shell_end_session_dialog (GsmManager *manager, GsmShellEndSessionDialogType type) { - if (!gsm_shell_is_running (manager->priv->shell)) - return; - gsm_shell_open_end_session_dialog (manager->priv->shell, type, manager->priv->inhibitors); diff --git a/gnome-session/gsm-shell.c b/gnome-session/gsm-shell.c index da9aec3..244763e 100644 --- a/gnome-session/gsm-shell.c +++ b/gnome-session/gsm-shell.c @@ -36,8 +36,9 @@ #define SHELL_PATH "/org/gnome/Shell" #define SHELL_INTERFACE "org.gnome.Shell" -#define SHELL_END_SESSION_DIALOG_PATH "/org/gnome/SessionManager/EndSessionDialog" -#define SHELL_END_SESSION_DIALOG_INTERFACE "org.gnome.SessionManager.EndSessionDialog" +#define END_SESSION_DIALOG_NAME "org.gnome.SessionManager.EndSessionDialog" +#define END_SESSION_DIALOG_PATH "/org/gnome/SessionManager/EndSessionDialog" +#define END_SESSION_DIALOG_INTERFACE "org.gnome.SessionManager.EndSessionDialog" #define GSM_SHELL_DBUS_TYPE_G_OBJECT_PATH_ARRAY (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH)) @@ -574,7 +575,6 @@ gsm_shell_open_end_session_dialog (GsmShell *shell, g_warning ("Could not connect to the shell: %s", error->message); g_error_free (error); - return FALSE; } if (shell->priv->end_session_open_call != NULL) { @@ -588,9 +588,9 @@ gsm_shell_open_end_session_dialog (GsmShell *shell, DBusGProxy *proxy; proxy = dbus_g_proxy_new_for_name (shell->priv->bus_connection, - SHELL_NAME, - SHELL_END_SESSION_DIALOG_PATH, - SHELL_END_SESSION_DIALOG_INTERFACE); + END_SESSION_DIALOG_NAME, + END_SESSION_DIALOG_PATH, + END_SESSION_DIALOG_INTERFACE); g_assert (proxy != NULL); -- 2.1.0