diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-04-25 04:04:23 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-04-25 04:04:23 +0000 |
| commit | 2e237e087ac1a2449690b7dfdfed1e406838feaf (patch) | |
| tree | f962d302a15b954fe81d8c6b15a25158ad58efa3 /community/lightdm-gtk3-greeter | |
| parent | 431023a318e680258f02c1fb5fdca176c68e5cb7 (diff) | |
Fri Apr 25 04:00:40 UTC 2014
Diffstat (limited to 'community/lightdm-gtk3-greeter')
| -rwxr-xr-x | community/lightdm-gtk3-greeter/PKGBUILD | 16 | ||||
| -rwxr-xr-x | community/lightdm-gtk3-greeter/session-preselection.patch | 19 | ||||
| -rw-r--r-- | community/lightdm-gtk3-greeter/tooltip-focus.patch | 24 |
3 files changed, 36 insertions, 23 deletions
diff --git a/community/lightdm-gtk3-greeter/PKGBUILD b/community/lightdm-gtk3-greeter/PKGBUILD index 68bb34d6a..8f8a514f3 100755 --- a/community/lightdm-gtk3-greeter/PKGBUILD +++ b/community/lightdm-gtk3-greeter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 109002 2014-04-09 10:28:04Z alucryd $ +# $Id: PKGBUILD 110106 2014-04-24 08:37:24Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Padfoot <padfoot@exemail.com.au> pkgname=lightdm-gtk3-greeter pkgver=1.8.4 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc='GTK+ greeter for LightDM' arch=('i686' 'x86_64') @@ -16,8 +16,16 @@ provides=("${pkgname/3/}") 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} diff --git a/community/lightdm-gtk3-greeter/session-preselection.patch b/community/lightdm-gtk3-greeter/session-preselection.patch deleted file mode 100755 index 6fb41747d..000000000 --- a/community/lightdm-gtk3-greeter/session-preselection.patch +++ /dev/null @@ -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); diff --git a/community/lightdm-gtk3-greeter/tooltip-focus.patch b/community/lightdm-gtk3-greeter/tooltip-focus.patch new file mode 100644 index 000000000..9444222a9 --- /dev/null +++ b/community/lightdm-gtk3-greeter/tooltip-focus.patch @@ -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 */ + |