[gnome-session] gsm: Don't export gsm_consolekit_get_current_session_type

[Vincent Untz <vuntz src gnome org>]

commit e3151d516dbf187b93eb19ea03a4fab27e4a07f8
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Dec 26 22:06:12 2011 -0500

    gsm: Don't export gsm_consolekit_get_current_session_type
    
    We already have gsm_consolekit_is_current_session_login to
    replace direct session type manipulation, so use it as the
    public API, and keep the session type private.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=666891

 gnome-session/gsm-consolekit.c    |    4 +++-
 gnome-session/gsm-consolekit.h    |    4 ----
 gnome-session/gsm-logout-dialog.c |   11 +----------
 3 files changed, 4 insertions(+), 15 deletions(-)
---
diff --git a/gnome-session/gsm-consolekit.c b/gnome-session/gsm-consolekit.c
index e83a559..12f2f2c 100644
--- a/gnome-session/gsm-consolekit.c
+++ b/gnome-session/gsm-consolekit.c
@@ -43,6 +43,8 @@
 #define CK_SEAT_INTERFACE    "org.freedesktop.ConsoleKit.Seat"
 #define CK_SESSION_INTERFACE "org.freedesktop.ConsoleKit.Session"
 
+#define GSM_CONSOLEKIT_SESSION_TYPE_LOGIN_WINDOW "LoginWindow"
+
 #define GSM_CONSOLEKIT_GET_PRIVATE(o)                                   \
         (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_CONSOLEKIT, GsmConsolekitPrivate))
 
@@ -804,7 +806,7 @@ gsm_consolekit_can_stop (GsmConsolekit *manager)
 	return can_stop;
 }
 
-gchar *
+static gchar *
 gsm_consolekit_get_current_session_type (GsmConsolekit *manager)
 {
         GError *gerror;
diff --git a/gnome-session/gsm-consolekit.h b/gnome-session/gsm-consolekit.h
index 376a11e..0d2f8a5 100644
--- a/gnome-session/gsm-consolekit.h
+++ b/gnome-session/gsm-consolekit.h
@@ -62,8 +62,6 @@ enum _GsmConsolekitError {
         GSM_CONSOLEKIT_ERROR_STOPPING
 };
 
-#define GSM_CONSOLEKIT_SESSION_TYPE_LOGIN_WINDOW "LoginWindow"
-
 GType            gsm_consolekit_get_type        (void);
 
 GQuark           gsm_consolekit_error_quark     (void);
@@ -83,8 +81,6 @@ void             gsm_consolekit_attempt_restart (GsmConsolekit *manager);
 void             gsm_consolekit_set_session_idle (GsmConsolekit *manager,
                                                   gboolean       is_idle);
 
-gchar           *gsm_consolekit_get_current_session_type (GsmConsolekit *manager);
-
 GsmConsolekit   *gsm_get_consolekit             (void);
 
 gboolean         gsm_consolekit_is_current_session_login (void);
diff --git a/gnome-session/gsm-logout-dialog.c b/gnome-session/gsm-logout-dialog.c
index c66d5c4..776da33 100644
--- a/gnome-session/gsm-logout-dialog.c
+++ b/gnome-session/gsm-logout-dialog.c
@@ -249,7 +249,6 @@ gsm_logout_dialog_timeout (gpointer data)
         char            *seconds_warning;
         char            *secondary_text;
         int              seconds_to_show;
-        static char     *session_type = NULL;
 
         logout_dialog = (GsmLogoutDialog *) data;
 
@@ -291,15 +290,7 @@ gsm_logout_dialog_timeout (gpointer data)
                 g_assert_not_reached ();
         }
 
-        if (session_type == NULL) {
-		GsmConsolekit *consolekit;
-
-                consolekit = gsm_get_consolekit ();
-                session_type = gsm_consolekit_get_current_session_type (consolekit);
-                g_object_unref (consolekit);
-        }
-
-        if (g_strcmp0 (session_type, GSM_CONSOLEKIT_SESSION_TYPE_LOGIN_WINDOW) != 0) {
+        if (!gsm_consolekit_is_current_session_login ()) {
                 char *name, *tmp;
 
                 name = g_locale_to_utf8 (g_get_real_name (), -1, NULL, NULL, NULL);