[gnome-session] GsmManager: remove obsolete code for talking with GDM



commit d19cf2d981811e32640a89ce7af7c9202f95d1d5
Author: Giovanni Campagna <gcampagn redhat com>
Date:   Tue Aug 20 11:09:01 2013 +0200

    GsmManager: remove obsolete code for talking with GDM
    
    These days shutdown and reboot is handled by logind everywhere, no
    need for this ancient code.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=706420

 data/gnome-wayland.session.desktop.in.in |    3 +
 gnome-session/Makefile.am                |    2 -
 gnome-session/gdm.c                      |  471 ------------------------------
 gnome-session/gdm.h                      |   54 ----
 gnome-session/gsm-manager.c              |   20 +--
 5 files changed, 4 insertions(+), 546 deletions(-)
---
diff --git a/data/gnome-wayland.session.desktop.in.in b/data/gnome-wayland.session.desktop.in.in
new file mode 100644
index 0000000..cc2bc93
--- /dev/null
+++ b/data/gnome-wayland.session.desktop.in.in
@@ -0,0 +1,3 @@
+[GNOME Session]
+_Name=GNOME on Wayland
+RequiredComponents=gnome-settings-daemon;
diff --git a/gnome-session/Makefile.am b/gnome-session/Makefile.am
index cf28814..8d6835f 100644
--- a/gnome-session/Makefile.am
+++ b/gnome-session/Makefile.am
@@ -39,8 +39,6 @@ gnome_session_SOURCES =                               \
        gsm-presence.h                          \
        gsm-presence-flag.h                     \
        gsm-presence.c                          \
-       gdm.h                                   \
-       gdm.c                                   \
        gdm-log.h                               \
        gdm-log.c                               \
        main.c                                  \
diff --git a/gnome-session/gsm-manager.c b/gnome-session/gsm-manager.c
index 572dd37..8f9f729 100644
--- a/gnome-session/gsm-manager.c
+++ b/gnome-session/gsm-manager.c
@@ -60,7 +60,6 @@
 #include "gsm-autostart-app.h"
 
 #include "gsm-util.h"
-#include "gdm.h"
 #include "gsm-logout-dialog.h"
 #include "gsm-icon-names.h"
 #include "gsm-inhibit-dialog.h"
@@ -116,10 +115,8 @@ typedef enum
         GSM_MANAGER_LOGOUT_LOGOUT,
         GSM_MANAGER_LOGOUT_REBOOT,
         GSM_MANAGER_LOGOUT_REBOOT_INTERACT,
-        GSM_MANAGER_LOGOUT_REBOOT_GDM,
         GSM_MANAGER_LOGOUT_SHUTDOWN,
         GSM_MANAGER_LOGOUT_SHUTDOWN_INTERACT,
-        GSM_MANAGER_LOGOUT_SHUTDOWN_GDM
 } GsmManagerLogoutType;
 
 struct GsmManagerPrivate
@@ -496,26 +493,16 @@ gsm_manager_quit (GsmManager *manager)
 
         switch (manager->priv->logout_type) {
         case GSM_MANAGER_LOGOUT_LOGOUT:
-                gtk_main_quit ();
+                gsm_quit ();
                 break;
         case GSM_MANAGER_LOGOUT_REBOOT:
         case GSM_MANAGER_LOGOUT_REBOOT_INTERACT:
-                gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE);
                 gsm_system_complete_shutdown (manager->priv->system);
                 break;
-        case GSM_MANAGER_LOGOUT_REBOOT_GDM:
-                gdm_set_logout_action (GDM_LOGOUT_ACTION_REBOOT);
-                gtk_main_quit ();
-                break;
         case GSM_MANAGER_LOGOUT_SHUTDOWN:
         case GSM_MANAGER_LOGOUT_SHUTDOWN_INTERACT:
-                gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE);
                 gsm_system_complete_shutdown (manager->priv->system);
                 break;
-        case GSM_MANAGER_LOGOUT_SHUTDOWN_GDM:
-                gdm_set_logout_action (GDM_LOGOUT_ACTION_SHUTDOWN);
-                gtk_main_quit ();
-                break;
         default:
                 g_assert_not_reached ();
                 break;
@@ -1102,7 +1089,6 @@ cancel_end_session (GsmManager *manager)
         manager->priv->logout_mode = GSM_MANAGER_LOGOUT_MODE_NORMAL;
 
         manager->priv->logout_type = GSM_MANAGER_LOGOUT_NONE;
-        gdm_set_logout_action (GDM_LOGOUT_ACTION_NONE);
 
         start_phase (manager);
 }
@@ -1328,12 +1314,10 @@ end_session_or_show_shell_dialog (GsmManager *manager)
                 break;
         case GSM_MANAGER_LOGOUT_REBOOT:
         case GSM_MANAGER_LOGOUT_REBOOT_INTERACT:
-        case GSM_MANAGER_LOGOUT_REBOOT_GDM:
                 type = GSM_SHELL_END_SESSION_DIALOG_TYPE_RESTART;
                 break;
         case GSM_MANAGER_LOGOUT_SHUTDOWN:
         case GSM_MANAGER_LOGOUT_SHUTDOWN_INTERACT:
-        case GSM_MANAGER_LOGOUT_SHUTDOWN_GDM:
                 type = GSM_SHELL_END_SESSION_DIALOG_TYPE_SHUTDOWN;
                 break;
         default:
@@ -4303,12 +4287,10 @@ do_query_end_session_exit (GsmManager *manager)
                 break;
         case GSM_MANAGER_LOGOUT_REBOOT:
         case GSM_MANAGER_LOGOUT_REBOOT_INTERACT:
-        case GSM_MANAGER_LOGOUT_REBOOT_GDM:
                 action = GSM_LOGOUT_ACTION_REBOOT;
                 break;
         case GSM_MANAGER_LOGOUT_SHUTDOWN:
         case GSM_MANAGER_LOGOUT_SHUTDOWN_INTERACT:
-        case GSM_MANAGER_LOGOUT_SHUTDOWN_GDM:
                 action = GSM_LOGOUT_ACTION_SHUTDOWN;
                 break;
         default:


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]