[gnome-session] Use GsmSystem instead of GsmConsolekit

[Matthias Clasen <matthiasc src gnome org>]

commit 62df42e33cef8b537f5cb6217d5fbc981492c2c9
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Jan 24 18:16:37 2012 -0500

    Use GsmSystem instead of GsmConsolekit
    
    https://bugzilla.gnome.org/show_bug.cgi?id=666891

 gnome-session/gsm-logout-dialog.c |   19 +++++-------
 gnome-session/gsm-manager.c       |   60 ++++++++++++++++++------------------
 gnome-session/gsm-session-fill.c  |   10 +++---
 3 files changed, 43 insertions(+), 46 deletions(-)
---
diff --git a/gnome-session/gsm-logout-dialog.c b/gnome-session/gsm-logout-dialog.c
index d79dd76..b6cf489 100644
--- a/gnome-session/gsm-logout-dialog.c
+++ b/gnome-session/gsm-logout-dialog.c
@@ -30,7 +30,7 @@
 #include <upower.h>
 
 #include "gsm-logout-dialog.h"
-#include "gsm-consolekit.h"
+#include "gsm-system.h"
 #include "gsm-icon-names.h"
 #include "gdm.h"
 
@@ -53,7 +53,7 @@ struct _GsmLogoutDialogPrivate
         GsmDialogLogoutType  type;
 
         UpClient            *up_client;
-        GsmConsolekit       *consolekit;
+        GsmSystem           *system;
 
         int                  timeout;
         unsigned int         timeout_id;
@@ -146,7 +146,7 @@ gsm_logout_dialog_init (GsmLogoutDialog *logout_dialog)
 
         logout_dialog->priv->up_client = up_client_new ();
 
-        logout_dialog->priv->consolekit = gsm_get_consolekit ();
+        logout_dialog->priv->system = gsm_get_system ();
 
         g_signal_connect (logout_dialog,
                           "destroy",
@@ -173,10 +173,7 @@ gsm_logout_dialog_destroy (GsmLogoutDialog *logout_dialog,
                 logout_dialog->priv->up_client = NULL;
         }
 
-        if (logout_dialog->priv->consolekit) {
-                g_object_unref (logout_dialog->priv->consolekit);
-                logout_dialog->priv->consolekit = NULL;
-        }
+        g_clear_object (&logout_dialog->priv->system);
 
         current_dialog = NULL;
 }
@@ -205,7 +202,7 @@ gsm_logout_supports_switch_user (GsmLogoutDialog *logout_dialog)
         g_object_unref (settings);
 
         if (ret)
-                ret = gsm_consolekit_can_switch_user (logout_dialog->priv->consolekit);
+                ret = gsm_system_can_switch_user (logout_dialog->priv->system);
 
         return ret;
 }
@@ -215,7 +212,7 @@ gsm_logout_supports_reboot (GsmLogoutDialog *logout_dialog)
 {
         gboolean ret;
 
-        ret = gsm_consolekit_can_restart (logout_dialog->priv->consolekit);
+        ret = gsm_system_can_restart (logout_dialog->priv->system);
         if (!ret) {
                 ret = gdm_supports_logout_action (GDM_LOGOUT_ACTION_REBOOT);
         }
@@ -228,7 +225,7 @@ gsm_logout_supports_shutdown (GsmLogoutDialog *logout_dialog)
 {
         gboolean ret;
 
-        ret = gsm_consolekit_can_stop (logout_dialog->priv->consolekit);
+        ret = gsm_system_can_stop (logout_dialog->priv->system);
         if (!ret) {
                 ret = gdm_supports_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN);
         }
@@ -290,7 +287,7 @@ gsm_logout_dialog_timeout (gpointer data)
                 g_assert_not_reached ();
         }
 
-        if (!gsm_consolekit_is_login_session (logout_dialog->priv->consolekit)) {
+        if (!gsm_system_is_login_session (logout_dialog->priv->system)) {
                 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 d51acb2..6c52655 100644
--- a/gnome-session/gsm-manager.c
+++ b/gnome-session/gsm-manager.c
@@ -61,7 +61,7 @@
 #include "gsm-fail-whale-dialog.h"
 #include "gsm-icon-names.h"
 #include "gsm-inhibit-dialog.h"
-#include "gsm-consolekit.h"
+#include "gsm-system.h"
 #include "gsm-session-save.h"
 
 #define GSM_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_MANAGER, GsmManagerPrivate))
@@ -276,18 +276,18 @@ on_required_app_failure (GsmManager  *manager,
         const gchar *app_id;
         gboolean want_extensions_ui;
         gboolean allow_logout;
-        GsmConsolekit *consolekit;
+        GsmSystem *system;
 
         app_id = gsm_app_peek_app_id (app);
         want_extensions_ui = g_str_equal (app_id, "gnome-shell.desktop");
 
-        consolekit = gsm_get_consolekit ();
-        if (gsm_consolekit_is_login_session (consolekit)) {
+        system = gsm_get_system ();
+        if (gsm_system_is_login_session (system)) {
                 allow_logout = FALSE;
         } else {
                 allow_logout = !_log_out_is_locked_down (manager);
         }
-        g_object_unref (consolekit);
+        g_object_unref (system);
 
         gsm_fail_whale_dialog_we_failed (FALSE,
                                          allow_logout,
@@ -462,9 +462,9 @@ phase_num_to_name (guint phase)
 static void start_phase (GsmManager *manager);
 
 static void
-quit_request_completed (GsmConsolekit *consolekit,
-                        GError        *error,
-                        gpointer       user_data)
+quit_request_completed (GsmSystem *system,
+                        GError    *error,
+                        gpointer   user_data)
 {
         GdmLogoutAction fallback_action = GPOINTER_TO_INT (user_data);
 
@@ -472,7 +472,7 @@ quit_request_completed (GsmConsolekit *consolekit,
                 gdm_set_logout_action (fallback_action);
         }
 
-        g_object_unref (consolekit);
+        g_object_unref (system);
 
         gtk_main_quit ();
 }
@@ -480,7 +480,7 @@ quit_request_completed (GsmConsolekit *consolekit,
 static void
 gsm_manager_quit (GsmManager *manager)
 {
-        GsmConsolekit *consolekit;
+        GsmSystem *system;
 
         /* See the comment in request_reboot() for some more details about how
          * this works. */
@@ -493,12 +493,12 @@ gsm_manager_quit (GsmManager *manager)
         case GSM_MANAGER_LOGOUT_REBOOT_INTERACT:
                 gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE);
 
-                consolekit = gsm_get_consolekit ();
-                g_signal_connect (consolekit,
+                system = gsm_get_system ();
+                g_signal_connect (system,
                                   "request-completed",
                                   G_CALLBACK (quit_request_completed),
                                   GINT_TO_POINTER (GDM_LOGOUT_ACTION_REBOOT));
-                gsm_consolekit_attempt_restart (consolekit);
+                gsm_system_attempt_restart (system);
                 break;
         case GSM_MANAGER_LOGOUT_REBOOT_GDM:
                 gdm_set_logout_action (GDM_LOGOUT_ACTION_REBOOT);
@@ -508,12 +508,12 @@ gsm_manager_quit (GsmManager *manager)
         case GSM_MANAGER_LOGOUT_SHUTDOWN_INTERACT:
                 gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE);
 
-                consolekit = gsm_get_consolekit ();
-                g_signal_connect (consolekit,
+                system = gsm_get_system ();
+                g_signal_connect (system,
                                   "request-completed",
                                   G_CALLBACK (quit_request_completed),
                                   GINT_TO_POINTER (GDM_LOGOUT_ACTION_SHUTDOWN));
-                gsm_consolekit_attempt_stop (consolekit);
+                gsm_system_attempt_stop (system);
                 break;
         case GSM_MANAGER_LOGOUT_SHUTDOWN_GDM:
                 gdm_set_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN);
@@ -2181,13 +2181,13 @@ auto_save_is_enabled (GsmManager *manager)
 static void
 maybe_save_session (GsmManager *manager)
 {
-        GsmConsolekit *consolekit;
+        GsmSystem *system;
         GError *error;
         gboolean is_login;
 
-        consolekit = gsm_get_consolekit ();
-        is_login = gsm_consolekit_is_login_session (consolekit);
-        g_object_unref (consolekit);
+        system = gsm_get_system ();
+        is_login = gsm_system_is_login_session (system);
+        g_object_unref (system);
         if (is_login)
                 return;
 
@@ -2730,12 +2730,12 @@ on_presence_status_changed (GsmPresence  *presence,
                             guint         status,
                             GsmManager   *manager)
 {
-        GsmConsolekit *consolekit;
+        GsmSystem *system;
 
-        consolekit = gsm_get_consolekit ();
-        gsm_consolekit_set_session_idle (consolekit,
-                                         (status == GSM_PRESENCE_STATUS_IDLE));
-        g_object_unref (consolekit);
+        system = gsm_get_system ();
+        gsm_system_set_session_idle (system,
+                                     (status == GSM_PRESENCE_STATUS_IDLE));
+        g_object_unref (system);
 }
 
 static gboolean
@@ -3389,7 +3389,7 @@ gsm_manager_can_shutdown (GsmManager *manager,
                           gboolean   *shutdown_available,
                           GError    **error)
 {
-        GsmConsolekit *consolekit;
+        GsmSystem *system;
         gboolean can_suspend;
         gboolean can_hibernate;
 
@@ -3402,13 +3402,13 @@ gsm_manager_can_shutdown (GsmManager *manager,
 
         g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE);
 
-        consolekit = gsm_get_consolekit ();
+        system = gsm_get_system ();
         *shutdown_available = !_log_out_is_locked_down (manager) &&
-                              (gsm_consolekit_can_stop (consolekit)
-                               || gsm_consolekit_can_restart (consolekit)
+                              (gsm_system_can_stop (system)
+                               || gsm_system_can_restart (system)
                                || can_suspend
                                || can_hibernate);
-        g_object_unref (consolekit);
+        g_object_unref (system);
 
         return TRUE;
 }
diff --git a/gnome-session/gsm-session-fill.c b/gnome-session/gsm-session-fill.c
index 64ad786..9c45e54 100644
--- a/gnome-session/gsm-session-fill.c
+++ b/gnome-session/gsm-session-fill.c
@@ -23,7 +23,7 @@
 
 #include "gsm-session-fill.h"
 
-#include "gsm-consolekit.h"
+#include "gsm-system.h"
 #include "gsm-manager.h"
 #include "gsm-process-helper.h"
 #include "gsm-util.h"
@@ -181,12 +181,12 @@ check_required (GKeyFile *keyfile)
 static void
 maybe_load_saved_session_apps (GsmManager *manager)
 {
-        GsmConsolekit *consolekit;
+        GsmSystem *system;
         gboolean is_login;
 
-        consolekit = gsm_get_consolekit ();
-        is_login = gsm_consolekit_is_login_session (consolekit);
-        g_object_unref (consolekit);
+        system = gsm_get_system ();
+        is_login = gsm_system_is_login_session (system);
+        g_object_unref (system);
 
         if (is_login)
                 return;