[Pkg-xfce-commits] r8030 - in /goodies/trunk/lightdm-gtk-greeter/debian: changelog patches/05_add-enter-shortcut-switch-login-password-fields.patch

[Yves-Alexis Perez]

Author: corsac
Date: Thu Oct 31 08:39:18 2013
New Revision: 8030

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=8030
Log:
update patch by cherry picking the upstream committed one

Modified:
    goodies/trunk/lightdm-gtk-greeter/debian/changelog
    goodies/trunk/lightdm-gtk-greeter/debian/patches/05_add-enter-shortcut-switch-login-password-fields.patch

Modified: goodies/trunk/lightdm-gtk-greeter/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/lightdm-gtk-greeter/debian/changelog?rev=8030&op=diff
==============================================================================
--- goodies/trunk/lightdm-gtk-greeter/debian/changelog	(original)
+++ goodies/trunk/lightdm-gtk-greeter/debian/changelog	Thu Oct 31 08:39:18 2013
@@ -1,8 +1,9 @@
 lightdm-gtk-greeter (1.6.1-3) UNRELEASED; urgency=low
 
   * debian/patches:
-    - 05_add-enter-shortcut-switch-login-password-fields added, support Enter
-      key to move from login to password field.                 closes: #727718
+    - 05_add-enter-shortcut-switch-login-password-fields added, cherry
+      picked from upstream. support Enter key to move from login to password
+      field.                                                    closes: #727718
     - 06_support-session-select-before-authentication added, fix session and
       languages selected in the menu not actually set for the current session.
                                                                 closes: #717702

Modified: goodies/trunk/lightdm-gtk-greeter/debian/patches/05_add-enter-shortcut-switch-login-password-fields.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/lightdm-gtk-greeter/debian/patches/05_add-enter-shortcut-switch-login-password-fields.patch?rev=8030&op=diff
==============================================================================
--- goodies/trunk/lightdm-gtk-greeter/debian/patches/05_add-enter-shortcut-switch-login-password-fields.patch	(original)
+++ goodies/trunk/lightdm-gtk-greeter/debian/patches/05_add-enter-shortcut-switch-login-password-fields.patch	Thu Oct 31 08:39:18 2013
@@ -1,18 +1,46 @@
---- a/src/lightdm-gtk-greeter.c
-+++ b/src/lightdm-gtk-greeter.c
-@@ -707,12 +707,12 @@ G_MODULE_EXPORT
+=== modified file 'lightdm-gtk-greeter/src/lightdm-gtk-greeter.c'
+--- lightdm-gtk-greeter/src/lightdm-gtk-greeter.c	2013-09-24 18:24:20 +0000
++++ lightdm-gtk-greeter/src/lightdm-gtk-greeter.c	2013-10-31 01:27:51 +0000
+@@ -707,25 +707,30 @@
  gboolean
  username_key_press_cb (GtkWidget *widget, GdkEventKey *event, gpointer user_data)
  {
 -    if (gtk_widget_get_visible(GTK_WIDGET(user_combo)))
-+    if (gtk_widget_get_visible(GTK_WIDGET(username_entry)))
-     {
+-    {
  #if GTK_CHECK_VERSION (3, 0, 0)
 -        if (event->keyval == GDK_KEY_Tab)
-+        if (event->keyval == GDK_KEY_Tab || event->keyval == GDK_KEY_Return)
++    if (event->keyval == GDK_KEY_Tab || event->keyval == GDK_KEY_Return)
  #else
 -        if (event->keyval == GDK_Tab)
-+        if (event->keyval == GDK_Tab || event->keyval == GDK_Return)
++    if (event->keyval == GDK_Tab || event->keyval == GDK_Return)
  #endif
++    {
++        /* If Shift+Tab, Cycle backwards to previous widget */
++        if (event->state & GDK_SHIFT_MASK)
          {
-             if (event->state & GDK_SHIFT_MASK)
+-            if (event->state & GDK_SHIFT_MASK)
++            if (gtk_widget_get_visible(GTK_WIDGET(user_combo)))
++            {
++                gtk_widget_grab_focus(GTK_WIDGET(user_combo));
++            }
++            else
+             {
+                 gtk_window_present(panel_window);
+                 gtk_widget_grab_focus(GTK_WIDGET(menubar));
+             }
+-            else
+-            {
+-                gtk_widget_grab_focus(GTK_WIDGET(password_entry));
+-            }
+-            return TRUE;
+-        }
++        }
++        else
++        {
++            gtk_widget_grab_focus(GTK_WIDGET(password_entry));
++        }
++        return TRUE;
+     }
+     return FALSE;
+ }
+