- 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.
*

git-svn-id: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/lightdm@5945 0c9b3bff-18ee-0310-b944-d1aa2700132f

diff --git a/debian/changelog b/debian/changelog
index 47543fec625adaa87f55ac826a7953f53c965ac8..1a83a9bf352397dfb29afd8eafb434d66085b3c0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ lightdm (0.9.4-1) UNRELEASED; urgency=low
     - 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 @@ lightdm (0.9.4-1) UNRELEASED; urgency=low
     - 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@debian.org>  Tue, 09 Aug 2011 20:55:24 +0200
 

diff --git a/debian/patches/06_fix-gtk-greeter-cancel-button.patch b/debian/patches/06_fix-gtk-greeter-cancel-button.patch
new file mode 100644 (file)
index 0000000..dfd1de9
--- /dev/null
+++ b/debian/patches/06_fix-gtk-greeter-cancel-button.patch
@@ -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));
+     }
+ }
+ 
+

diff --git a/debian/patches/series b/debian/patches/series
index ca7e224ac6570956d2c306935936f5835f5db079..ba5553d99198fceb750c05ff1a811781c6d834fa 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -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