[Pkg-xfce-commits] r5945 - in goodies/trunk/lightdm/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2011-08-29 13:09:32 +0000 (Mon, 29 Aug 2011)
New Revision: 5945

Added:
   goodies/trunk/lightdm/debian/patches/06_fix-gtk-greeter-cancel-button.patch
Modified:
   goodies/trunk/lightdm/debian/changelog
   goodies/trunk/lightdm/debian/patches/series
Log:
  - 06_fix-gtk-greeter-cancel-button added, cherry-picked from upstream, fix
    cancel button in GTK+ greeter which prevented cancelling authentication
    when a wrong username was entered.
* 

Modified: goodies/trunk/lightdm/debian/changelog
===================================================================
--- goodies/trunk/lightdm/debian/changelog	2011-08-26 18:35:53 UTC (rev 5944)
+++ goodies/trunk/lightdm/debian/changelog	2011-08-29 13:09:32 UTC (rev 5945)
@@ -6,6 +6,9 @@
     - 05_always-export-XAUTHORITY dropped, included upstream. 
     - 05_dont-add-pkglibexecdir-path added, don't add /usr/lib/lightdm/lightdm
       to the PATH, it's ugly.
+    - 06_fix-gtk-greeter-cancel-button added, cherry-picked from upstream, fix
+      cancel button in GTK+ greeter which prevented cancelling authentication
+      when a wrong username was entered.
   * debian/rules:
     - don't install gdmflexiserver script for now until the PATH issue is
       solved.
@@ -15,6 +18,7 @@
     - provide a way to select the current greeter through debconf. Other
       packages providing a greeter use the same templates/config to register
       themselves in debconf.
+  * 
 
  -- Yves-Alexis Perez <corsac at debian.org>  Tue, 09 Aug 2011 20:55:24 +0200
 

Added: goodies/trunk/lightdm/debian/patches/06_fix-gtk-greeter-cancel-button.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/06_fix-gtk-greeter-cancel-button.patch	                        (rev 0)
+++ goodies/trunk/lightdm/debian/patches/06_fix-gtk-greeter-cancel-button.patch	2011-08-29 13:09:32 UTC (rev 5945)
@@ -0,0 +1,32 @@
+--- lightdm/greeters/gtk/lightdm-gtk-greeter.c	2011-08-16 04:36:26 +0000
++++ lightdm/greeters/gtk/lightdm-gtk-greeter.c	2011-08-26 01:02:43 +0000
+@@ -110,19 +110,22 @@
+ static void
+ cancel_authentication (void)
+ {
++    /* If in authentication then stop that first */
++    cancelling = FALSE;
+     if (lightdm_greeter_get_in_authentication (greeter))
+     {
+         cancelling = TRUE;
+         lightdm_greeter_cancel_authentication (greeter);
++        return;
+     }
++
++    /* Start a new login or return to the user list */
++    if (lightdm_greeter_get_hide_users_hint (greeter))
++        start_authentication (NULL);
+     else
+     {
+-        cancelling = FALSE;
+-        if (!lightdm_greeter_get_hide_users_hint (greeter))
+-        {
+-            gtk_widget_hide (login_box);
+-            gtk_widget_grab_focus (GTK_WIDGET (user_view));
+-        }
++        gtk_widget_hide (login_box);
++        gtk_widget_grab_focus (GTK_WIDGET (user_view));
+     }
+ }
+ 
+

Modified: goodies/trunk/lightdm/debian/patches/series
===================================================================
--- goodies/trunk/lightdm/debian/patches/series	2011-08-26 18:35:53 UTC (rev 5944)
+++ goodies/trunk/lightdm/debian/patches/series	2011-08-29 13:09:32 UTC (rev 5945)
@@ -3,3 +3,4 @@
 03_quit-plymouth.patch
 04_default-gtk-greeter-config.patch
 05_dont-add-pkglibexecdir-path.patch
+06_fix-gtk-greeter-cancel-button.patch