diff --git a/gdm-greeter-greater-ui.patch b/gdm-greeter-greater-ui.patch
index d21d008..a2d3cfd 100644
--- a/gdm-greeter-greater-ui.patch
+++ b/gdm-greeter-greater-ui.patch
@@ -1,8 +1,8 @@
-Index: gdm-2.29.5/gui/simple-greeter/gdm-greeter-login-window.c
+Index: gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.c
===================================================================
---- gdm-2.29.5.orig/gui/simple-greeter/gdm-greeter-login-window.c
-+++ gdm-2.29.5/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -884,35 +884,6 @@ on_user_unchosen (GdmUserChooserWidget
+--- gdm-2.30.2.orig/gui/simple-greeter/gdm-greeter-login-window.c
++++ gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.c
+@@ -950,35 +950,6 @@ on_user_unchosen (GdmUserChooserWidget
do_cancel (login_window);
}
@@ -38,7 +38,7 @@ Index: gdm-2.29.5/gui/simple-greeter/gdm-greeter-login-window.c
static char *
file_read_one_line (const char *filename)
{
-@@ -1011,16 +982,19 @@ create_computer_info (GdmGreeterLoginWin
+@@ -1077,16 +1048,19 @@ create_computer_info (GdmGreeterLoginWin
if (strcmp (localhost, "localhost") == 0 ||
strcmp (localhost, "localhost.localdomain") == 0) {
@@ -60,20 +60,20 @@ Index: gdm-2.29.5/gui/simple-greeter/gdm-greeter-login-window.c
}
gdm_profile_end (NULL);
-@@ -1122,9 +1096,6 @@ load_theme (GdmGreeterLoginWindow *login
+@@ -1190,9 +1164,6 @@ load_theme (GdmGreeterLoginWindow *login
create_computer_info (login_window);
- box = GTK_WIDGET (gtk_builder_get_object (login_window->priv->builder, "computer-info-event-box"));
- g_signal_connect (box, "button-press-event", G_CALLBACK (on_computer_info_label_button_press), login_window);
-
- switch_mode (login_window, MODE_SELECTION);
-
- gdm_profile_end (NULL);
-Index: gdm-2.29.5/gui/simple-greeter/gdm-greeter-login-window.ui
+ if (login_window->priv->user_list_disabled) {
+ switch_mode (login_window, MODE_AUTHENTICATION);
+ } else {
+Index: gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.ui
===================================================================
---- gdm-2.29.5.orig/gui/simple-greeter/gdm-greeter-login-window.ui
-+++ gdm-2.29.5/gui/simple-greeter/gdm-greeter-login-window.ui
+--- gdm-2.30.2.orig/gui/simple-greeter/gdm-greeter-login-window.ui
++++ gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.ui
@@ -2,28 +2,29 @@
@@ -119,7 +119,7 @@ Index: gdm-2.29.5/gui/simple-greeter/gdm-greeter-login-window.ui
False
-@@ -32,264 +33,197 @@
+@@ -32,271 +33,203 @@
@@ -242,6 +242,9 @@ Index: gdm-2.29.5/gui/simple-greeter/gdm-greeter-login-window.ui
-
- 4
@@ -371,6 +377,10 @@ Index: gdm-2.29.5/gui/simple-greeter/gdm-greeter-login-window.ui
-
-
-
- False
@@ -384,6 +394,9 @@ Index: gdm-2.29.5/gui/simple-greeter/gdm-greeter-login-window.ui
- True
- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- True
+-
+-
+-
-
-
- 1
@@ -510,11 +523,11 @@ Index: gdm-2.29.5/gui/simple-greeter/gdm-greeter-login-window.ui
+
+
-Index: gdm-2.29.5/gui/simple-greeter/gdm-greeter-login-window.ui.new
+Index: gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.ui.new
===================================================================
--- /dev/null
-+++ gdm-2.29.5/gui/simple-greeter/gdm-greeter-login-window.ui.new
-@@ -0,0 +1,229 @@
++++ gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.ui.new
+@@ -0,0 +1,235 @@
+
+
+
@@ -619,6 +632,9 @@ Index: gdm-2.29.5/gui/simple-greeter/gdm-greeter-login-window.ui.new
+
+
+
+ False
@@ -633,6 +649,9 @@ Index: gdm-2.29.5/gui/simple-greeter/gdm-greeter-login-window.ui.new
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ ●
+ True
++
++
++
+
+
+ 1
diff --git a/gdm.changes b/gdm.changes
index 8c0d8e8..325c09f 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jun 17 14:41:01 CEST 2010 - vuntz@opensuse.org
+
+- Update gdm-greeter-greater-ui.patch: we didn't rebase it earlier,
+ and lost our improved UI.
+
-------------------------------------------------------------------
Mon May 24 15:55:31 UTC 2010 - guido+opensuse.org@berhoerster.name
diff --git a/gdm.spec b/gdm.spec
index a7f5ede..717ce8b 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -63,7 +63,7 @@ Patch7: gdm-suse-xsession.patch
Patch8: gdm-sysconfig-settings.patch
# PATCH-FEATURE-SLED gdm-domain-logon.patch hpj@novell.com -- Add UI to log in a specific domain
Patch9: gdm-domain-logon.patch
-# PATCH-NEEDS-REBASE (was PATCH-FIX-UPSTREAM) gdm-greeter-greater-ui.patch bnc436431 bgo560508 vuntz@novell.com -- Improve the layout of the greeter. Note: the patch contains a patched glade file *and* the result glade file (for reference only, in case we need to rebase the patch)
+# PATCH-FIX-UPSTREAM gdm-greeter-greater-ui.patch bnc436431 bgo560508 vuntz@novell.com -- Improve the layout of the greeter. Note: the patch contains a patched glade file *and* the result glade file (for reference only, in case we need to rebase the patch)
Patch15: gdm-greeter-greater-ui.patch
# PATCH-FIX-UPSTREAM gdm-always-reflect-keyboard-layout.patch bnc438159 bgo561771 hpj@novell.com -- Make keyboard selector not neglect to apply the selected keyboard in some situations.
Patch18: gdm-always-reflect-keyboard-layout.patch
@@ -152,8 +152,7 @@ gnome-patch-translation-prepare
%patch7 -p1
%patch8 -p1
%patch9 -p1
-#FIXME - Needs rebase
-#%patch15 -p1
+%patch15 -p1
%patch18 -p1
%patch19 -p1
%patch20 -p1