diff --git a/gdm-domain-logon.patch b/gdm-domain-logon.patch
index bb2d582..3eb7355 100644
--- a/gdm-domain-logon.patch
+++ b/gdm-domain-logon.patch
@@ -1,6 +1,6 @@
-diff -Nurp gdm-2.24.0-pre/gui/simple-greeter/gdm-chooser-widget.c gdm-2.24.0-post/gui/simple-greeter/gdm-chooser-widget.c
+diff -uprN gdm-2.24.0-pre/gui/simple-greeter/gdm-chooser-widget.c gdm-2.24.0-post/gui/simple-greeter/gdm-chooser-widget.c
--- gdm-2.24.0-pre/gui/simple-greeter/gdm-chooser-widget.c 2008-09-22 12:01:21.000000000 -0500
-+++ gdm-2.24.0-post/gui/simple-greeter/gdm-chooser-widget.c 2008-10-16 14:29:40.000000000 -0500
++++ gdm-2.24.0-post/gui/simple-greeter/gdm-chooser-widget.c 2008-11-01 21:45:12.000000000 -0600
@@ -2105,6 +2105,20 @@ gdm_chooser_widget_remove_item (GdmChoos
move_cursor_to_top (widget);
}
@@ -22,9 +22,9 @@ diff -Nurp gdm-2.24.0-pre/gui/simple-greeter/gdm-chooser-widget.c gdm-2.24.0-pos
gboolean
gdm_chooser_widget_lookup_item (GdmChooserWidget *widget,
const char *id,
-diff -Nurp gdm-2.24.0-pre/gui/simple-greeter/gdm-chooser-widget.h gdm-2.24.0-post/gui/simple-greeter/gdm-chooser-widget.h
+diff -uprN gdm-2.24.0-pre/gui/simple-greeter/gdm-chooser-widget.h gdm-2.24.0-post/gui/simple-greeter/gdm-chooser-widget.h
--- gdm-2.24.0-pre/gui/simple-greeter/gdm-chooser-widget.h 2008-09-22 12:01:21.000000000 -0500
-+++ gdm-2.24.0-post/gui/simple-greeter/gdm-chooser-widget.h 2008-10-16 14:29:40.000000000 -0500
++++ gdm-2.24.0-post/gui/simple-greeter/gdm-chooser-widget.h 2008-11-01 21:45:12.000000000 -0600
@@ -96,6 +96,8 @@ void gdm_chooser_widget_update_i
void gdm_chooser_widget_remove_item (GdmChooserWidget *widget,
const char *id);
@@ -34,9 +34,9 @@ diff -Nurp gdm-2.24.0-pre/gui/simple-greeter/gdm-chooser-widget.h gdm-2.24.0-pos
gboolean gdm_chooser_widget_lookup_item (GdmChooserWidget *widget,
const char *id,
GdkPixbuf **image,
-diff -Nurp gdm-2.24.0-pre/gui/simple-greeter/gdm-domain-chooser-dialog.c gdm-2.24.0-post/gui/simple-greeter/gdm-domain-chooser-dialog.c
+diff -uprN gdm-2.24.0-pre/gui/simple-greeter/gdm-domain-chooser-dialog.c gdm-2.24.0-post/gui/simple-greeter/gdm-domain-chooser-dialog.c
--- gdm-2.24.0-pre/gui/simple-greeter/gdm-domain-chooser-dialog.c 1969-12-31 18:00:00.000000000 -0600
-+++ gdm-2.24.0-post/gui/simple-greeter/gdm-domain-chooser-dialog.c 2008-10-16 14:29:40.000000000 -0500
++++ gdm-2.24.0-post/gui/simple-greeter/gdm-domain-chooser-dialog.c 2008-11-01 21:45:12.000000000 -0600
@@ -0,0 +1,207 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -245,9 +245,9 @@ diff -Nurp gdm-2.24.0-pre/gui/simple-greeter/gdm-domain-chooser-dialog.c gdm-2.2
+
+ return GTK_WIDGET (object);
+}
-diff -Nurp gdm-2.24.0-pre/gui/simple-greeter/gdm-domain-chooser-dialog.h gdm-2.24.0-post/gui/simple-greeter/gdm-domain-chooser-dialog.h
+diff -uprN gdm-2.24.0-pre/gui/simple-greeter/gdm-domain-chooser-dialog.h gdm-2.24.0-post/gui/simple-greeter/gdm-domain-chooser-dialog.h
--- gdm-2.24.0-pre/gui/simple-greeter/gdm-domain-chooser-dialog.h 1969-12-31 18:00:00.000000000 -0600
-+++ gdm-2.24.0-post/gui/simple-greeter/gdm-domain-chooser-dialog.h 2008-10-16 14:29:40.000000000 -0500
++++ gdm-2.24.0-post/gui/simple-greeter/gdm-domain-chooser-dialog.h 2008-11-01 21:45:12.000000000 -0600
@@ -0,0 +1,60 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -309,9 +309,9 @@ diff -Nurp gdm-2.24.0-pre/gui/simple-greeter/gdm-domain-chooser-dialog.h gdm-2.2
+G_END_DECLS
+
+#endif /* __GDM_DOMAIN_CHOOSER_DIALOG_H */
-diff -Nurp gdm-2.24.0-pre/gui/simple-greeter/gdm-domain-chooser-widget.c gdm-2.24.0-post/gui/simple-greeter/gdm-domain-chooser-widget.c
+diff -uprN gdm-2.24.0-pre/gui/simple-greeter/gdm-domain-chooser-widget.c gdm-2.24.0-post/gui/simple-greeter/gdm-domain-chooser-widget.c
--- gdm-2.24.0-pre/gui/simple-greeter/gdm-domain-chooser-widget.c 1969-12-31 18:00:00.000000000 -0600
-+++ gdm-2.24.0-post/gui/simple-greeter/gdm-domain-chooser-widget.c 2008-10-16 14:29:40.000000000 -0500
++++ gdm-2.24.0-post/gui/simple-greeter/gdm-domain-chooser-widget.c 2008-11-01 21:45:12.000000000 -0600
@@ -0,0 +1,237 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -550,9 +550,9 @@ diff -Nurp gdm-2.24.0-pre/gui/simple-greeter/gdm-domain-chooser-widget.c gdm-2.2
+
+ return GTK_WIDGET (object);
+}
-diff -Nurp gdm-2.24.0-pre/gui/simple-greeter/gdm-domain-chooser-widget.h gdm-2.24.0-post/gui/simple-greeter/gdm-domain-chooser-widget.h
+diff -uprN gdm-2.24.0-pre/gui/simple-greeter/gdm-domain-chooser-widget.h gdm-2.24.0-post/gui/simple-greeter/gdm-domain-chooser-widget.h
--- gdm-2.24.0-pre/gui/simple-greeter/gdm-domain-chooser-widget.h 1969-12-31 18:00:00.000000000 -0600
-+++ gdm-2.24.0-post/gui/simple-greeter/gdm-domain-chooser-widget.h 2008-10-16 14:29:40.000000000 -0500
++++ gdm-2.24.0-post/gui/simple-greeter/gdm-domain-chooser-widget.h 2008-11-01 21:45:12.000000000 -0600
@@ -0,0 +1,59 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -613,9 +613,9 @@ diff -Nurp gdm-2.24.0-pre/gui/simple-greeter/gdm-domain-chooser-widget.h gdm-2.2
+G_END_DECLS
+
+#endif /* __GDM_DOMAIN_CHOOSER_WIDGET_H */
-diff -Nurp gdm-2.24.0-pre/gui/simple-greeter/gdm-domain-option-widget.c gdm-2.24.0-post/gui/simple-greeter/gdm-domain-option-widget.c
+diff -uprN gdm-2.24.0-pre/gui/simple-greeter/gdm-domain-option-widget.c gdm-2.24.0-post/gui/simple-greeter/gdm-domain-option-widget.c
--- gdm-2.24.0-pre/gui/simple-greeter/gdm-domain-option-widget.c 1969-12-31 18:00:00.000000000 -0600
-+++ gdm-2.24.0-post/gui/simple-greeter/gdm-domain-option-widget.c 2008-10-16 14:29:40.000000000 -0500
++++ gdm-2.24.0-post/gui/simple-greeter/gdm-domain-option-widget.c 2008-11-01 21:45:12.000000000 -0600
@@ -0,0 +1,379 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -996,9 +996,9 @@ diff -Nurp gdm-2.24.0-pre/gui/simple-greeter/gdm-domain-option-widget.c gdm-2.24
+
+ gdm_option_widget_set_active_item (GDM_OPTION_WIDGET (widget), domain_name);
+}
-diff -Nurp gdm-2.24.0-pre/gui/simple-greeter/gdm-domain-option-widget.h gdm-2.24.0-post/gui/simple-greeter/gdm-domain-option-widget.h
+diff -uprN gdm-2.24.0-pre/gui/simple-greeter/gdm-domain-option-widget.h gdm-2.24.0-post/gui/simple-greeter/gdm-domain-option-widget.h
--- gdm-2.24.0-pre/gui/simple-greeter/gdm-domain-option-widget.h 1969-12-31 18:00:00.000000000 -0600
-+++ gdm-2.24.0-post/gui/simple-greeter/gdm-domain-option-widget.h 2008-10-16 14:29:40.000000000 -0500
++++ gdm-2.24.0-post/gui/simple-greeter/gdm-domain-option-widget.h 2008-11-01 21:45:12.000000000 -0600
@@ -0,0 +1,59 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -1059,9 +1059,9 @@ diff -Nurp gdm-2.24.0-pre/gui/simple-greeter/gdm-domain-option-widget.h gdm-2.24
+ const char *domain_name);
+
+#endif /* __GDM_DOMAIN_OPTION_WIDGET_H */
-diff -Nurp gdm-2.24.0-pre/gui/simple-greeter/gdm-domain-provider.c gdm-2.24.0-post/gui/simple-greeter/gdm-domain-provider.c
+diff -uprN gdm-2.24.0-pre/gui/simple-greeter/gdm-domain-provider.c gdm-2.24.0-post/gui/simple-greeter/gdm-domain-provider.c
--- gdm-2.24.0-pre/gui/simple-greeter/gdm-domain-provider.c 1969-12-31 18:00:00.000000000 -0600
-+++ gdm-2.24.0-post/gui/simple-greeter/gdm-domain-provider.c 2008-10-16 14:29:40.000000000 -0500
++++ gdm-2.24.0-post/gui/simple-greeter/gdm-domain-provider.c 2008-11-01 22:10:58.000000000 -0600
@@ -0,0 +1,478 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -1334,7 +1334,7 @@ diff -Nurp gdm-2.24.0-pre/gui/simple-greeter/gdm-domain-provider.c gdm-2.24.0-po
+ priv->something_changed = FALSE;
+ }
+
-+ g_timeout_add_seconds (QUERY_TIMEOUT_S, (GSourceFunc) idle_end, domain_provider);
++ priv->callback_id = g_timeout_add_seconds (QUERY_TIMEOUT_S, (GSourceFunc) idle_end, domain_provider);
+ priv->state = STATE_IDLE;
+}
+
@@ -1541,9 +1541,9 @@ diff -Nurp gdm-2.24.0-pre/gui/simple-greeter/gdm-domain-provider.c gdm-2.24.0-po
+
+ return priv->domains;
+}
-diff -Nurp gdm-2.24.0-pre/gui/simple-greeter/gdm-domain-provider.h gdm-2.24.0-post/gui/simple-greeter/gdm-domain-provider.h
+diff -uprN gdm-2.24.0-pre/gui/simple-greeter/gdm-domain-provider.h gdm-2.24.0-post/gui/simple-greeter/gdm-domain-provider.h
--- gdm-2.24.0-pre/gui/simple-greeter/gdm-domain-provider.h 1969-12-31 18:00:00.000000000 -0600
-+++ gdm-2.24.0-post/gui/simple-greeter/gdm-domain-provider.h 2008-10-16 14:29:40.000000000 -0500
++++ gdm-2.24.0-post/gui/simple-greeter/gdm-domain-provider.h 2008-11-01 21:45:12.000000000 -0600
@@ -0,0 +1,61 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -1606,9 +1606,9 @@ diff -Nurp gdm-2.24.0-pre/gui/simple-greeter/gdm-domain-provider.h gdm-2.24.0-po
+G_END_DECLS
+
+#endif /* __GDM_DOMAIN_PROVIDER_H */
-diff -Nurp gdm-2.24.0-pre/gui/simple-greeter/gdm-greeter-panel.c gdm-2.24.0-post/gui/simple-greeter/gdm-greeter-panel.c
+diff -uprN gdm-2.24.0-pre/gui/simple-greeter/gdm-greeter-panel.c gdm-2.24.0-post/gui/simple-greeter/gdm-greeter-panel.c
--- gdm-2.24.0-pre/gui/simple-greeter/gdm-greeter-panel.c 2008-08-20 23:31:47.000000000 -0500
-+++ gdm-2.24.0-post/gui/simple-greeter/gdm-greeter-panel.c 2008-10-16 14:29:40.000000000 -0500
++++ gdm-2.24.0-post/gui/simple-greeter/gdm-greeter-panel.c 2008-11-01 21:45:12.000000000 -0600
@@ -40,6 +40,7 @@
#include "gdm-language-option-widget.h"
#include "gdm-layout-option-widget.h"
@@ -1726,9 +1726,9 @@ diff -Nurp gdm-2.24.0-pre/gui/simple-greeter/gdm-greeter-panel.c gdm-2.24.0-post
+ gdm_option_widget_set_default_item (GDM_OPTION_WIDGET (panel->priv->domain_option_widget),
+ domain_name);
+}
-diff -Nurp gdm-2.24.0-pre/gui/simple-greeter/gdm-greeter-panel.h gdm-2.24.0-post/gui/simple-greeter/gdm-greeter-panel.h
+diff -uprN gdm-2.24.0-pre/gui/simple-greeter/gdm-greeter-panel.h gdm-2.24.0-post/gui/simple-greeter/gdm-greeter-panel.h
--- gdm-2.24.0-pre/gui/simple-greeter/gdm-greeter-panel.h 2008-08-20 23:31:47.000000000 -0500
-+++ gdm-2.24.0-post/gui/simple-greeter/gdm-greeter-panel.h 2008-10-16 14:29:40.000000000 -0500
++++ gdm-2.24.0-post/gui/simple-greeter/gdm-greeter-panel.h 2008-11-01 21:45:12.000000000 -0600
@@ -53,6 +53,9 @@ typedef struct
void (* session_selected) (GdmGreeterPanel *panel,
@@ -1748,9 +1748,9 @@ diff -Nurp gdm-2.24.0-pre/gui/simple-greeter/gdm-greeter-panel.h gdm-2.24.0-post
G_END_DECLS
#endif /* __GDM_GREETER_PANEL_H */
-diff -Nurp gdm-2.24.0-pre/gui/simple-greeter/gdm-greeter-session.c gdm-2.24.0-post/gui/simple-greeter/gdm-greeter-session.c
+diff -uprN gdm-2.24.0-pre/gui/simple-greeter/gdm-greeter-session.c gdm-2.24.0-post/gui/simple-greeter/gdm-greeter-session.c
--- gdm-2.24.0-pre/gui/simple-greeter/gdm-greeter-session.c 2008-08-20 23:31:47.000000000 -0500
-+++ gdm-2.24.0-post/gui/simple-greeter/gdm-greeter-session.c 2008-10-16 14:35:57.000000000 -0500
++++ gdm-2.24.0-post/gui/simple-greeter/gdm-greeter-session.c 2008-11-01 21:45:12.000000000 -0600
@@ -38,6 +38,8 @@
#include "gdm-greeter-panel.h"
#include "gdm-greeter-login-window.h"
@@ -1890,9 +1890,9 @@ diff -Nurp gdm-2.24.0-pre/gui/simple-greeter/gdm-greeter-session.c gdm-2.24.0-po
G_OBJECT_CLASS (gdm_greeter_session_parent_class)->finalize (object);
}
-diff -Nurp gdm-2.24.0-pre/gui/simple-greeter/gdm-simple-greeter.schemas.in gdm-2.24.0-post/gui/simple-greeter/gdm-simple-greeter.schemas.in
+diff -uprN gdm-2.24.0-pre/gui/simple-greeter/gdm-simple-greeter.schemas.in gdm-2.24.0-post/gui/simple-greeter/gdm-simple-greeter.schemas.in
--- gdm-2.24.0-pre/gui/simple-greeter/gdm-simple-greeter.schemas.in 2008-08-20 23:31:47.000000000 -0500
-+++ gdm-2.24.0-post/gui/simple-greeter/gdm-simple-greeter.schemas.in 2008-10-16 14:29:40.000000000 -0500
++++ gdm-2.24.0-post/gui/simple-greeter/gdm-simple-greeter.schemas.in 2008-11-01 21:45:12.000000000 -0600
@@ -92,6 +92,18 @@
@@ -1912,9 +1912,9 @@ diff -Nurp gdm-2.24.0-pre/gui/simple-greeter/gdm-simple-greeter.schemas.in gdm-2
/schemas/apps/gdm/simple-greeter/wm_use_compiz
/apps/gdm/simple-greeter/wm_use_compiz
gdm-simple-greeter
-diff -Nurp gdm-2.24.0-pre/gui/simple-greeter/Makefile.am gdm-2.24.0-post/gui/simple-greeter/Makefile.am
+diff -uprN gdm-2.24.0-pre/gui/simple-greeter/Makefile.am gdm-2.24.0-post/gui/simple-greeter/Makefile.am
--- gdm-2.24.0-pre/gui/simple-greeter/Makefile.am 2008-09-22 12:01:21.000000000 -0500
-+++ gdm-2.24.0-post/gui/simple-greeter/Makefile.am 2008-10-16 14:29:40.000000000 -0500
++++ gdm-2.24.0-post/gui/simple-greeter/Makefile.am 2008-11-01 21:45:12.000000000 -0600
@@ -136,6 +136,14 @@ test_greeter_panel_SOURCES = \
gdm-sessions.c \
gdm-session-option-widget.h \
diff --git a/gdm.changes b/gdm.changes
index 91f34df..de5b881 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Nov 2 00:28:51 CST 2008 - hpj@novell.com
+
+- Update gdm-domain-logon.patch again, fixing bnc#439892.
+
-------------------------------------------------------------------
Thu Oct 16 14:44:40 CDT 2008 - hpj@novell.com
diff --git a/gdm.spec b/gdm.spec
index f882845..62dc388 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -56,7 +56,7 @@ PreReq: %insserv_prereq
License: GPL v2 or later
Group: System/GUI/GNOME
Version: 2.24.0
-Release: 2
+Release: 3
Summary: The GNOME 2.x Display Manager
Source: %{name}-%{version}.tar.bz2
Source1: gdm.pamd
@@ -246,6 +246,8 @@ fi
%files lang -f %{name}.lang
%changelog
+* Sun Nov 02 2008 hpj@novell.com
+- Update gdm-domain-logon.patch again, fixing bnc#439892.
* Thu Oct 16 2008 hpj@novell.com
- Update gdm-domain-logon.patch, removing some dead code and a
signal callback that is no longer being used.
@@ -256,7 +258,7 @@ fi
family to FamilyWild.
* Mon Oct 06 2008 sbrabec@suse.cz
- Conflict with other branding providers (FATE#304881).
-* Fri Oct 03 2008 mboman@suse.de
+* Thu Oct 02 2008 mboman@suse.de
- Update to version 2.24.0:
+ Allow the build to succeed without a gdm user
+ Use Bourne shell syntax in Xsession.solaris
@@ -1024,7 +1026,7 @@ fi
for timed login user.
* Fri Jul 30 2004 ro@suse.de
- fix spec file, list gdm-session-startkde.diff as patch
-* Fri Jul 30 2004 shprasad@suse.de
+* Thu Jul 29 2004 shprasad@suse.de
- Fixes bug #60867.
Shows the 'KDE' option when the user clicks on 'Session' at the
time of login.