[arch-commits] Commit in lightdm-gtk3-greeter/trunk (3 files)

[Maxime Gauduin]

    Date: Thursday, April 24, 2014 @ 10:33:39
  Author: alucryd
Revision: 110104

FS#39859: lightdm-gtk3-greeter 1:1.8.4-1

Added:
  lightdm-gtk3-greeter/trunk/tooltip-focus.patch
Modified:
  lightdm-gtk3-greeter/trunk/PKGBUILD
Deleted:
  lightdm-gtk3-greeter/trunk/session-preselection.patch

----------------------------+
 PKGBUILD                   |   12 ++++++++++--
 session-preselection.patch |   19 -------------------
 tooltip-focus.patch        |   24 ++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-24 07:51:45 UTC (rev 110103)
+++ PKGBUILD	2014-04-24 08:33:39 UTC (rev 110104)
@@ -16,9 +16,17 @@
 conflicts=("${pkgname/3/2}")
 backup=('etc/lightdm/lightdm-gtk-greeter.conf')
 install="${pkgname/3/}.install"
-source=("https://launchpad.net/${pkgname/3/}/${pkgver%.?}/${pkgver}/+download/${pkgname/3/}-${pkgver}.tar.gz")
-sha256sums=('cb3e93bfcb8fbaf109e01080dc75ec9a6803afcb68acbf9eef3799be927a2c6c')
+source=("https://launchpad.net/${pkgname/3/}/${pkgver%.?}/${pkgver}/+download/${pkgname/3/}-${pkgver}.tar.gz"
+        'tooltip-focus.patch')
+sha256sums=('cb3e93bfcb8fbaf109e01080dc75ec9a6803afcb68acbf9eef3799be927a2c6c'
+            '2dcf615181fc57cfcc02601d4d9845ef23af60a0a322a5208989849b279deec7')
 
+prepare() {
+  cd ${pkgname/3/}-${pkgver}
+
+  patch -Np1 -i ../tooltip-focus.patch
+}
+
 build() {
   cd ${pkgname/3/}-${pkgver}
 

Deleted: session-preselection.patch
===================================================================
--- session-preselection.patch	2014-04-24 07:51:45 UTC (rev 110103)
+++ session-preselection.patch	2014-04-24 08:33:39 UTC (rev 110104)
@@ -1,19 +0,0 @@
-=== modified file 'src/lightdm-gtk-greeter.c'
---- src/lightdm-gtk-greeter.c	2014-02-16 18:37:06 +0000
-+++ src/lightdm-gtk-greeter.c	2014-02-22 11:31:35 +0000
-@@ -1241,11 +1241,10 @@
-     set_user_image (username);
-     user = lightdm_user_list_get_user_by_name (lightdm_user_list_get_instance (), username);
-     if (user)
--        if (lightdm_user_get_logged_in (user))
--        {
--            set_language (lightdm_user_get_language (user));
--            set_session (lightdm_user_get_session (user));
--        }
-+    {
-+        set_language (lightdm_user_get_language (user));
-+        set_session (lightdm_user_get_session (user));
-+    }
-     gtk_widget_set_tooltip_text (GTK_WIDGET (user_combo), user_tooltip);
-     start_authentication (username);
-     g_free (user_tooltip);

Added: tooltip-focus.patch
===================================================================
--- tooltip-focus.patch	                        (rev 0)
+++ tooltip-focus.patch	2014-04-24 08:33:39 UTC (rev 110104)
@@ -0,0 +1,24 @@
+--- a/src/lightdm-gtk-greeter.c	2014-03-26 10:28:44 +0000
++++ b/src/lightdm-gtk-greeter.c	2014-04-23 11:04:01 +0000
+@@ -2203,6 +2203,7 @@
+         Window keyboard_xid = 0;
+         GdkDisplay* display = gdk_x11_lookup_xdisplay (xevent->xmap.display);
+         GdkWindow* win = gdk_x11_window_foreign_new_for_display (display, xwin);
++        GdkWindowTypeHint win_type = gdk_window_get_type_hint (win);
+ 
+         /* Check to see if this window is our onboard window, since we don't want to focus it. */
+         if (keyboard_win)
+@@ -2211,8 +2212,10 @@
+ #else
+                 keyboard_xid = gdk_x11_drawable_get_xid (keyboard_win);
+ #endif
+-            
+-        if (xwin != keyboard_xid && gdk_window_get_type_hint (win) != GDK_WINDOW_TYPE_HINT_NOTIFICATION)
++
++        if (xwin != keyboard_xid
++            && win_type != GDK_WINDOW_TYPE_HINT_TOOLTIP
++            && win_type != GDK_WINDOW_TYPE_HINT_NOTIFICATION)
+         {
+             gdk_window_focus (win, GDK_CURRENT_TIME);
+             /* Make sure to keep keyboard above */
+