[gnome-session] GsmConsolekit: make api more uniform

[Matthias Clasen <matthiasc src gnome org>]

commit f7dfc5ffea22635e19f363d0d147ed86dced5370
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Jan 24 18:00:05 2012 -0500

    GsmConsolekit: make api more uniform
    
    gsm_consolekit_is_current_session_login was called out as
    'not like the others' in patch review, so change it
    to gsm_consolekit_is_login_session and give it a GsmConsolekit
    argument. Adjust all callers.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=666891

 gnome-session/gsm-consolekit.c    |    7 ++-----
 gnome-session/gsm-consolekit.h    |    2 +-
 gnome-session/gsm-logout-dialog.c |    2 +-
 gnome-session/gsm-manager.c       |   12 ++++++++++--
 gnome-session/gsm-session-fill.c  |    9 ++++++++-
 5 files changed, 22 insertions(+), 10 deletions(-)
---
diff --git a/gnome-session/gsm-consolekit.c b/gnome-session/gsm-consolekit.c
index 0d1b971..f20828e 100644
--- a/gnome-session/gsm-consolekit.c
+++ b/gnome-session/gsm-consolekit.c
@@ -844,18 +844,15 @@ gsm_get_consolekit (void)
 }
 
 gboolean
-gsm_consolekit_is_current_session_login (void)
+gsm_consolekit_is_login_session (GsmConsolekit *manager)
 {
-        GsmConsolekit *consolekit;
         char *session_type;
         gboolean ret;
 
-        consolekit = gsm_get_consolekit ();
-        session_type = gsm_consolekit_get_current_session_type (consolekit);
+        session_type = gsm_consolekit_get_current_session_type (manager);
 
         ret = (g_strcmp0 (session_type, GSM_CONSOLEKIT_SESSION_TYPE_LOGIN_WINDOW) == 0);
 
-        g_object_unref (consolekit);
         g_free (session_type);
 
         return ret;
diff --git a/gnome-session/gsm-consolekit.h b/gnome-session/gsm-consolekit.h
index 0d2f8a5..25beb86 100644
--- a/gnome-session/gsm-consolekit.h
+++ b/gnome-session/gsm-consolekit.h
@@ -83,7 +83,7 @@ void             gsm_consolekit_set_session_idle (GsmConsolekit *manager,
 
 GsmConsolekit   *gsm_get_consolekit             (void);
 
-gboolean         gsm_consolekit_is_current_session_login (void);
+gboolean         gsm_consolekit_is_login_session (GsmConsolekit *manager);
 
 G_END_DECLS
 
diff --git a/gnome-session/gsm-logout-dialog.c b/gnome-session/gsm-logout-dialog.c
index 776da33..d79dd76 100644
--- a/gnome-session/gsm-logout-dialog.c
+++ b/gnome-session/gsm-logout-dialog.c
@@ -290,7 +290,7 @@ gsm_logout_dialog_timeout (gpointer data)
                 g_assert_not_reached ();
         }
 
-        if (!gsm_consolekit_is_current_session_login ()) {
+        if (!gsm_consolekit_is_login_session (logout_dialog->priv->consolekit)) {
                 char *name, *tmp;
 
                 name = g_locale_to_utf8 (g_get_real_name (), -1, NULL, NULL, NULL);
diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c
index 4982aa4..d51acb2 100644
--- a/gnome-session/gsm-manager.c
+++ b/gnome-session/gsm-manager.c
@@ -276,15 +276,18 @@ on_required_app_failure (GsmManager  *manager,
         const gchar *app_id;
         gboolean want_extensions_ui;
         gboolean allow_logout;
+        GsmConsolekit *consolekit;
 
         app_id = gsm_app_peek_app_id (app);
         want_extensions_ui = g_str_equal (app_id, "gnome-shell.desktop");
 
-        if (gsm_consolekit_is_current_session_login ()) {
+        consolekit = gsm_get_consolekit ();
+        if (gsm_consolekit_is_login_session (consolekit)) {
                 allow_logout = FALSE;
         } else {
                 allow_logout = !_log_out_is_locked_down (manager);
         }
+        g_object_unref (consolekit);
 
         gsm_fail_whale_dialog_we_failed (FALSE,
                                          allow_logout,
@@ -2178,9 +2181,14 @@ auto_save_is_enabled (GsmManager *manager)
 static void
 maybe_save_session (GsmManager *manager)
 {
+        GsmConsolekit *consolekit;
         GError *error;
+        gboolean is_login;
 
-        if (gsm_consolekit_is_current_session_login ())
+        consolekit = gsm_get_consolekit ();
+        is_login = gsm_consolekit_is_login_session (consolekit);
+        g_object_unref (consolekit);
+        if (is_login)
                 return;
 
         /* We only allow session saving when session is running or when
diff --git a/gnome-session/gsm-session-fill.c b/gnome-session/gsm-session-fill.c
index 61541b5..64ad786 100644
--- a/gnome-session/gsm-session-fill.c
+++ b/gnome-session/gsm-session-fill.c
@@ -181,7 +181,14 @@ check_required (GKeyFile *keyfile)
 static void
 maybe_load_saved_session_apps (GsmManager *manager)
 {
-        if (gsm_consolekit_is_current_session_login ())
+        GsmConsolekit *consolekit;
+        gboolean is_login;
+
+        consolekit = gsm_get_consolekit ();
+        is_login = gsm_consolekit_is_login_session (consolekit);
+        g_object_unref (consolekit);
+
+        if (is_login)
                 return;
 
         gsm_manager_add_autostart_apps_from_dir (manager, gsm_util_get_saved_session_dir ());