r29630 - in /desktop/unstable/gdm3: ./ debian/changelog debian/patches/14_pam_dialog.patch debian/patches/35_double_free.patch debian/patches/36_windowpath.patch debian/patches/37_shutdown_buttons.patch debian/patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Sep 11 08:28:59 2011
New Revision: 29630

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29630
Log:
* 35_double_free.patch: stolen from 2.30.7. Fix a double free issue in 
  the chooser code.
* 36_windowpath.patch: stolen from 2.30.7. Only set the WINDOWPATH 
  variable if not null.
* 37_shutdown_buttons.patch: stolen from upstream git. Only show 
  shutdown options when requested. Closes: #628032.
* 14_pam_dialog.patch: remove the beep, since it happens after the 
  session has been reaped and can lock the sound device.

Added:
    desktop/unstable/gdm3/debian/patches/35_double_free.patch
      - copied unchanged from r29415, desktop/squeeze/gdm3/debian/patches/35_double_free.patch
    desktop/unstable/gdm3/debian/patches/36_windowpath.patch
      - copied unchanged from r29415, desktop/squeeze/gdm3/debian/patches/36_windowpath.patch
    desktop/unstable/gdm3/debian/patches/37_shutdown_buttons.patch
      - copied unchanged from r29415, desktop/squeeze/gdm3/debian/patches/37_shutdown_buttons.patch
Modified:
    desktop/unstable/gdm3/   (props changed)
    desktop/unstable/gdm3/debian/changelog
    desktop/unstable/gdm3/debian/patches/14_pam_dialog.patch
    desktop/unstable/gdm3/debian/patches/series

Propchange: desktop/unstable/gdm3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 11 08:28:59 2011
@@ -1,1 +1,2 @@
 /desktop/experimental/gdm3:23944,23947
+/desktop/squeeze/gdm3:29415

Modified: desktop/unstable/gdm3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/changelog?rev=29630&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm3/debian/changelog [utf-8] Sun Sep 11 08:28:59 2011
@@ -1,3 +1,16 @@
+gdm3 (2.30.5-11) unstable; urgency=low
+
+  * 35_double_free.patch: stolen from 2.30.7. Fix a double free issue in 
+    the chooser code.
+  * 36_windowpath.patch: stolen from 2.30.7. Only set the WINDOWPATH 
+    variable if not null.
+  * 37_shutdown_buttons.patch: stolen from upstream git. Only show 
+    shutdown options when requested. Closes: #628032.
+  * 14_pam_dialog.patch: remove the beep, since it happens after the 
+    session has been reaped and can lock the sound device.
+
+ -- Josselin Mouette <joss at debian.org>  Thu, 18 Aug 2011 18:21:15 +0200
+
 gdm3 (2.30.5-10) unstable; urgency=low
 
   * 33_reset_signal_handler.patch: stolen upstream. Reset SIGPIPE 

Modified: desktop/unstable/gdm3/debian/patches/14_pam_dialog.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/14_pam_dialog.patch?rev=29630&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/14_pam_dialog.patch [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/14_pam_dialog.patch [utf-8] Sun Sep 11 08:28:59 2011
@@ -3,9 +3,9 @@
 
 Index: gdm-2.30.5/daemon/gdm-session-worker.c
 ===================================================================
---- gdm-2.30.5.orig/daemon/gdm-session-worker.c	2010-09-16 11:29:04.000000000 +0200
-+++ gdm-2.30.5/daemon/gdm-session-worker.c	2010-09-16 11:31:42.000000000 +0200
-@@ -815,7 +815,7 @@
+--- gdm-2.30.5.orig/daemon/gdm-session-worker.c	2011-08-18 18:18:46.369202613 +0200
++++ gdm-2.30.5/daemon/gdm-session-worker.c	2011-08-18 18:18:46.689204182 +0200
+@@ -815,7 +815,7 @@ gdm_session_worker_process_pam_message (
                  res = gdm_session_worker_ask_for_secret (worker, utf8_msg, &user_answer);
                  break;
          case PAM_TEXT_INFO:
@@ -17,12 +17,13 @@
 Index: gdm-2.30.5/gui/simple-greeter/gdm-greeter-login-window.c
 ===================================================================
 --- gdm-2.30.5.orig/gui/simple-greeter/gdm-greeter-login-window.c	2010-08-11 19:40:07.000000000 +0200
-+++ gdm-2.30.5/gui/simple-greeter/gdm-greeter-login-window.c	2010-09-16 11:31:06.000000000 +0200
-@@ -667,9 +667,68 @@
++++ gdm-2.30.5/gui/simple-greeter/gdm-greeter-login-window.c	2011-08-18 18:19:25.741393775 +0200
+@@ -667,8 +667,65 @@ gdm_greeter_login_window_problem (GdmGre
  
          g_debug ("GdmGreeterLoginWindow: problem: %s", text);
  
 -        set_message (GDM_GREETER_LOGIN_WINDOW (login_window), text);
+-        gdk_window_beep (GTK_WIDGET (login_window)->window);
 +        _gdm_greeter_login_window_set_interactive (login_window, FALSE);
 +
 +        GtkWidget *dialog;
@@ -81,10 +82,7 @@
 +        gtk_dialog_run (GTK_DIALOG (dialog));
 +        gtk_widget_destroy (dialog);
 +
-         gdk_window_beep (GTK_WIDGET (login_window)->window);
++        _gdm_greeter_login_window_set_interactive (login_window, TRUE);
  
-+        _gdm_greeter_login_window_set_interactive (login_window, TRUE);
-+
          return TRUE;
  }
- 

Modified: desktop/unstable/gdm3/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm3/debian/patches/series?rev=29630&op=diff
==============================================================================
--- desktop/unstable/gdm3/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gdm3/debian/patches/series [utf-8] Sun Sep 11 08:28:59 2011
@@ -34,4 +34,7 @@
 32_CVE-2011-0727.patch
 33_reset_signal_handler.patch
 34_postsession_shutdown.patch
+35_double_free.patch
+36_windowpath.patch
+37_shutdown_buttons.patch
 90_relibtoolize.patch