r23171 - in /desktop/unstable/gnome-session/debian: changelog patches/12_no_gdm_fallback.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Mar  2 08:53:11 2010
New Revision: 23171

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23171
Log:
12_no_gdm_fallback.patch: new patch. Don’t fall back on GDM if 
ConsoleKit failed to reboot. CK will not even be attempted if it is 
not available, anyway. Closes: #572085.

Added:
    desktop/unstable/gnome-session/debian/patches/12_no_gdm_fallback.patch
Modified:
    desktop/unstable/gnome-session/debian/changelog
    desktop/unstable/gnome-session/debian/patches/series

Modified: desktop/unstable/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/changelog?rev=23171&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/changelog [utf-8] Tue Mar  2 08:53:11 2010
@@ -1,3 +1,11 @@
+gnome-session (2.28.0-7) UNRELEASED; urgency=low
+
+  * 12_no_gdm_fallback.patch: new patch. Don’t fall back on GDM if 
+    ConsoleKit failed to reboot. CK will not even be attempted if it is 
+    not available, anyway. Closes: #572085.
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 02 Mar 2010 09:52:28 +0100
+
 gnome-session (2.28.0-6) unstable; urgency=low
 
   * debian/control.in

Added: desktop/unstable/gnome-session/debian/patches/12_no_gdm_fallback.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/12_no_gdm_fallback.patch?rev=23171&op=file
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/12_no_gdm_fallback.patch (added)
+++ desktop/unstable/gnome-session/debian/patches/12_no_gdm_fallback.patch [utf-8] Tue Mar  2 08:53:11 2010
@@ -1,0 +1,27 @@
+Debian #572085
+
+Don’t fall back to GDM when ConsoleKit fails. If CK is not available, it 
+will not be attempted anyway.
+
+Index: gnome-session-2.28.0/gnome-session/gsm-manager.c
+===================================================================
+--- gnome-session-2.28.0.orig/gnome-session/gsm-manager.c	2010-03-02 09:50:28.083214273 +0100
++++ gnome-session-2.28.0/gnome-session/gsm-manager.c	2010-03-02 09:51:19.974714717 +0100
+@@ -424,7 +424,7 @@ gsm_manager_quit (GsmManager *manager)
+                 g_signal_connect (consolekit,
+                                   "request-completed",
+                                   G_CALLBACK (quit_request_completed),
+-                                  GINT_TO_POINTER (GDM_LOGOUT_ACTION_REBOOT));
++                                  GINT_TO_POINTER (GDM_LOGOUT_ACTION_NONE));
+                 gsm_consolekit_attempt_restart (consolekit);
+                 break;
+         case GSM_MANAGER_LOGOUT_REBOOT_GDM:
+@@ -439,7 +439,7 @@ gsm_manager_quit (GsmManager *manager)
+                 g_signal_connect (consolekit,
+                                   "request-completed",
+                                   G_CALLBACK (quit_request_completed),
+-                                  GINT_TO_POINTER (GDM_LOGOUT_ACTION_SHUTDOWN));
++                                  GINT_TO_POINTER (GDM_LOGOUT_ACTION_NONE));
+                 gsm_consolekit_attempt_stop (consolekit);
+                 break;
+         case GSM_MANAGER_LOGOUT_SHUTDOWN_GDM:

Modified: desktop/unstable/gnome-session/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/series?rev=23171&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-session/debian/patches/series [utf-8] Tue Mar  2 08:53:11 2010
@@ -2,4 +2,5 @@
 03_devicekit_optional.patch
 10_session_save.patch
 11_saved_session_name.patch
+12_no_gdm_fallback.patch
 90_relibtoolize.patch