--- a/ChangeLog Mon Jun 05 23:36:28 2006 +0000
+++ b/ChangeLog Tue Jun 06 05:39:37 2006 +0000
@@ -1,3 +1,13 @@
+2006-06-06 Brian Cameron <[email protected]>
+
+ * gdm.spec, patches/gdm-01-branding-defaults-solaris.diff,
+ gdm-12-fixflexiserver.diff, ext-sources/gdm.xml:
+ Added patch gdm-12-fixflexiserver.diff to fix a core dumping problem.
+ Modified gdm-01-branding-defaults-solaris.diff to better integrate
+ with ctrun and updated the gdm.xml SVC manifest so that core dumps do
+ not cause GDM to restart.
+ * gdm-05-fix-a11y-crash.diff: Removed and renumbered patches.
+
2006-06-06 Glynn Foster <[email protected]>
* ChangeLog.pre-2-10: Remove conflict markers.
--- a/ext-sources/gdm.xml Mon Jun 05 23:36:28 2006 +0000
+++ b/ext-sources/gdm.xml Tue Jun 06 05:39:37 2006 +0000
@@ -42,12 +42,14 @@
exec='/usr/sbin/gdm-stop'
timeout_seconds='5' />
- <exec_method
- type='method'
- name='restart'
- exec='/usr/sbin/gdm-restart'
- timeout_seconds='5' />
+ <property_group name='startd'
+ type='framework'>
+ <!-- sub-process core dumps shouldn't restart session -->
+ <propval name='ignore_error'
+ type='astring' value='core,signal' />
+ </property_group>
+ <!-- Authorization -->
<property_group name='general' type='framework'>
<!-- to start stop gdm -->
<propval name='action_authorization' type='astring'
--- a/gdm.spec Mon Jun 05 23:36:28 2006 +0000
+++ b/gdm.spec Tue Jun 06 05:39:37 2006 +0000
@@ -37,13 +37,14 @@
Patch2: gdm-02-branding-general.diff
Patch3: gdm-03-pam-security-setup.diff
Patch4: gdm-04-normalise-locale-xiim-broken-filenames.diff
-Patch5: gdm-05-fix-a11y-crash.diff
-Patch6: gdm-06-current-locale.diff
-Patch7: gdm-07-system-locale.diff
-Patch8: gdm-08-startagain.diff
-Patch9: gdm-09-linguas.diff
-Patch10: gdm-10-login-photo-menu.diff
-Patch14: gdm-14-sun-branding-patch.diff
+Patch5: gdm-05-current-locale.diff
+Patch6: gdm-06-system-locale.diff
+Patch7: gdm-07-startagain.diff
+Patch8: gdm-08-linguas.diff
+Patch9: gdm-09-login-photo-menu.diff
+Patch10: gdm-10-sun-branding-patch.diff
+Patch11: gdm-11-fixfacebrowser.diff
+Patch12: gdm-12-fixflexiserver.diff
URL: www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}
@@ -116,7 +117,8 @@
%patch8 -p1
%patch9 -p1
%patch10 -p1
-%patch14 -p1
+%patch11 -p1
+%patch12 -p1
%build
%ifos linux
@@ -242,6 +244,13 @@
%config /etc/security/*
%changelog
+* Tue Jun 06 2006 - [email protected]
+- Added patch gdm-12-fixflexiserver.diff to fix a core dumping problem.
+ Modified gdm-01-branding-defaults-solaris.diff to better integrate with
+ ctrun and updated the gdm.xml SVC manifest so that core dumps do not
+ cause GDM to restart. Removed gdm-05-fix-a11y-crash.diff since it didn't
+ work as a fix.
+
* Mon May 23 2006 - [email protected]
- Bump to 2.14.7.
@@ -524,7 +533,7 @@
* Wed Oct 06 2004 - [email protected]
- Added patch gdm-21-fix-a11y-crash.diff to remove
- /var/tmp/orbit-gdm/bonobo-activation-server-ior.F ixes bug #5103715.
+ /var/tmp/orbit-gdm/bonobo-activation-server-ior. Fixes bug #5103715.
* Tue Oct 05 2004 - [email protected]
- Modified patch gdm-15-default-path.diff to add
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gdm-05-current-locale.diff Tue Jun 06 05:39:37 2006 +0000
@@ -0,0 +1,16 @@
+--- gdm-2.6.0.3/gui/gdmlanguages.c 2004-03-01 08:24:57.000000000 -0800
++++ gdm-2.6.0.3-patch/gui/gdmlanguages.c 2004-11-10 11:31:05.674392432 -0800
+@@ -547,13 +547,6 @@
+ if ( ! got_english)
+ langs = g_list_prepend (langs, g_strdup ("en_US"));
+
+- curlocale = setlocale (LC_MESSAGES, NULL);
+- if (curlocale != NULL &&
+- strcmp (curlocale, "C") != 0 &&
+- find_lang (curlocale, &clean) == NULL) {
+- langs = g_list_prepend (langs, g_strdup (curlocale));
+- }
+-
+ langs = g_list_sort (langs, lang_collate);
+
+ VE_IGNORE_EINTR (fclose (langlist));
--- a/patches/gdm-05-fix-a11y-crash.diff Mon Jun 05 23:36:28 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
---- gdm-2.6.0.3/daemon/gdm.in.post_07 2004-11-01 17:22:25.438471944 -0800
-+++ gdm-2.6.0.3/daemon/gdm.in 2004-11-01 17:23:51.617370760 -0800
-@@ -3,6 +3,12 @@
- # 1) we read the standard system env vars
- # 2) syadmins/integrators can add their own private options etc...
-
-+# Solaris JDS:
-+test -f /var/tmp/orbit-gdm/bonobo-activation-server-ior && rm /var/tmp/orbit-gdm/bonobo-activation-server-ior
-+
-+# Linux JDS:
-+test -f /tmp/orbit-gdm/bonobo-activation-server-ior && rm /tmp/orbit-gdm/bonobo-activation-server-ior
-+
- test -f /etc/profile && . /etc/profile
-
- #Try to set LC_MESSAGES to LANG if neither LC_MESSAGES or LC_ALL is set.
--- a/patches/gdm-06-current-locale.diff Mon Jun 05 23:36:28 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
---- gdm-2.6.0.3/gui/gdmlanguages.c 2004-03-01 08:24:57.000000000 -0800
-+++ gdm-2.6.0.3-patch/gui/gdmlanguages.c 2004-11-10 11:31:05.674392432 -0800
-@@ -547,13 +547,6 @@
- if ( ! got_english)
- langs = g_list_prepend (langs, g_strdup ("en_US"));
-
-- curlocale = setlocale (LC_MESSAGES, NULL);
-- if (curlocale != NULL &&
-- strcmp (curlocale, "C") != 0 &&
-- find_lang (curlocale, &clean) == NULL) {
-- langs = g_list_prepend (langs, g_strdup (curlocale));
-- }
--
- langs = g_list_sort (langs, lang_collate);
-
- VE_IGNORE_EINTR (fclose (langlist));
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gdm-06-system-locale.diff Tue Jun 06 05:39:37 2006 +0000
@@ -0,0 +1,46 @@
+--- gdm-2.6.0.3/daemon/gdm.c 2005-03-10 16:34:02.000000000 -0800
++++ gdm-2.6.0.3-patch/daemon/gdm.c 2005-03-10 16:54:33.579783768 -0800
+@@ -122,6 +122,7 @@
+ unsigned char *gdm_global_bcookie = NULL;
+
+ gchar *gdm_charset = NULL;
++char *gdm_system_locale = NULL; /* CR Id: 5032088 */
+
+ int gdm_normal_runlevel = -1; /* runlevel on linux that gdm was started in */
+
+@@ -2026,6 +2027,11 @@
+ gdm_charset = g_strdup (charset);
+ }
+
++ /* CR Id: 5032088 */
++ if (setlocale (LC_CTYPE, NULL) != NULL) {
++ gdm_system_locale = g_strdup (setlocale (LC_CTYPE, NULL));
++ }
++
+ /* initial TERM/INT handler */
+ sig.sa_handler = initial_term_int;
+ sig.sa_flags = SA_RESTART;
+--- gdm-2.6.0.3/daemon/slave.c 2005-03-10 16:34:02.000000000 -0800
++++ gdm-2.6.0.3-patch/daemon/slave.c 2005-03-10 16:57:58.936564792 -0800
+@@ -137,6 +137,9 @@
+ /* wait for a GO in the SOP protocol */
+ extern gboolean gdm_wait_for_go;
+
++/* CR Id: 5032088 */
++extern char *gdm_system_locale;
++
+ /* Local prototypes */
+ static gint gdm_slave_xerror_handler (Display *disp, XErrorEvent *evt);
+ static gint gdm_slave_xioerror_handler (Display *disp);
+@@ -4160,7 +4163,10 @@
+ home_dir_ok,
+ session,
+ save_session,
+- language,
++ ((gdm_system_locale != (char *) NULL) &&
++ ( (language == NULL) ||
++ ((language != NULL) && (strcmp (language, "") == 0) )) == TRUE ?
++ gdm_system_locale : language),
+ gnome_session,
+ usrcfgok,
+ savesess,
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gdm-07-startagain.diff Tue Jun 06 05:39:37 2006 +0000
@@ -0,0 +1,243 @@
+--- gdm-2.14.6/gui/greeter/greeter_parser.c-orig 2006-05-12 02:00:28.533677000 -0500
++++ gdm-2.14.6/gui/greeter/greeter_parser.c 2006-05-12 02:00:51.056897000 -0500
+@@ -1102,12 +1102,16 @@ parse_stock (xmlNodePtr node,
+ * Support startagain as cancel for forward compatibility without
+ * string breakage.
+ */
+- else if (g_ascii_strcasecmp ((char *) prop, "cancel") == 0 ||
+- g_ascii_strcasecmp ((char *) prop, "startagain") == 0)
++ else if (g_ascii_strcasecmp ((char *) prop, "cancel") == 0)
+ {
+ g_free (*translated_text);
+ *translated_text = g_strdup (_("_Cancel"));
+ }
++ else if (g_ascii_strcasecmp ((char *) prop, "startagain") == 0)
++ {
++ g_free (*translated_text);
++ *translated_text = g_strdup (_("_Start Again"));
++ }
+ else
+ {
+ g_set_error (error,
+--- gdm-2.14.7/gui/greeter/themes/circles/circles.xml-orig 2006-01-30 15:40:21.000000000 -0600
++++ gdm-2.14.7/gui/greeter/themes/circles/circles.xml 2006-05-23 17:09:27.604437000 -0500
+@@ -12,26 +12,10 @@
+ <item type="rect">
+ <normal color="#ffffff"/>
+ <pos x="0" y="4" width="100%" height="100%"/>
+- <box orientation="horizontal" spacing="10" xpadding="10">
+- <item type="rect" id="options_button" button="true">
+- <normal color="#ffffff"/>
+- <pos y="50%" anchor="w" width="box" height="box"/>
+- <box orientation="horizontal" spacing="10" xpadding="10">
+- <item type="pixmap">
+- <normal file="options.png" tint="#dddddd"/>
+- <prelight file="options.png"/>
+- <active file="options.png" tint="#ff0000"/>
+- <pos y="50%" anchor="w"/>
+- </item>
+- <item type="label">
+- <normal color="#000000" font="Sans 12"/>
+- <prelight color="#666666" font="Sans 12"/>
+- <active color="#ff0000" font="Sans 12"/>
+- <pos y="50%" anchor="w"/>
+- <!-- Stock label for: _Options -->
+- <stock type="options"/>
+- </item>
+- </box>
++ <box orientation="horizontal" spacing="10" xpadding="10" ypadding="10">
++ <item type="button" id="options_button" button="true">
++ <pos width="100" height="50"/>
++ <stock type="options"/>
+ </item>
+ </box>
+ </item>
+@@ -100,33 +84,13 @@
+ </item>
+ </fixed>
+ </item>
+- <item type="rect" id="ok_button" button="true">
+- <normal color="#ffffff"/>
+- <pos anchor="n" x="50%" width="50%" height="20"/>
+- <box orientation="vertical" spacing="10" xpadding="10">
+- <item type="label">
+- <normal color="#000000" font="Sans 12"/>
+- <prelight color="#666666" font="Sans 12"/>
+- <active color="#ff0000" font="Sans 12"/>
+- <pos anchor="n" x="50%" height="24" width="50%"/>
+- <!-- Stock label for: _OK -->
+- <stock type="ok"/>
+- </item>
+- </box>
+- </item>
+- <item type="rect" id="cancel_button" button="true">
+- <normal color="#ffffff"/>
+- <pos anchor="n" x="50%" width="50%" height="20"/>
+- <box orientation="vertical" spacing="10" xpadding="10">
+- <item type="label">
+- <normal color="#000000" font="Sans 12"/>
+- <prelight color="#666666" font="Sans 12"/>
+- <active color="#ff0000" font="Sans 12"/>
+- <pos anchor="n" x="50%" height="24" width="50%"/>
+- <!-- Stock label for: _Cancel -->
+- <stock type="cancel"/>
+- </item>
+- </box>
++ <item type="button" id="ok_button">
++ <pos anchor="n" x="50%" height="32" width="50%"/>
++ <stock type="ok"/>
++ </item>
++ <item type="button" id="cancel_button">
++ <pos anchor="n" x="50%" height="32" width="50%"/>
++ <stock type="startagain"/>
+ </item>
+ <item type="label" id="pam-message">
+ <pos anchor="n" x="50%"/>
+--- gdm-2.14.7/gui/greeter/themes/happygnome/happygnome.xml-orig 2006-03-20 18:48:59.000000000 -0600
++++ gdm-2.14.7/gui/greeter/themes/happygnome/happygnome.xml 2006-05-23 17:09:56.498438000 -0500
+@@ -12,26 +12,10 @@
+ <item type="rect">
+ <normal color="#ffffff"/>
+ <pos x="0" y="4" width="100%" height="100%"/>
+- <box orientation="horizontal" spacing="10" xpadding="10">
+- <item type="rect" id="options_button" button="true">
+- <normal color="#ffffff"/>
+- <pos y="50%" anchor="w" width="box" height="box"/>
+- <box orientation="horizontal" spacing="10" xpadding="10">
+- <item type="pixmap">
+- <normal file="options.png" tint="#dddddd"/>
+- <prelight file="options.png"/>
+- <active file="options.png" tint="#ff0000"/>
+- <pos y="50%" anchor="w"/>
+- </item>
+- <item type="label">
+- <normal color="#000000" font="Sans 12"/>
+- <prelight color="#666666" font="Sans 12"/>
+- <active color="#ff0000" font="Sans 12"/>
+- <pos y="50%" anchor="w"/>
+- <!-- Stock label for: _Options -->
+- <stock type="options"/>
+- </item>
+- </box>
++ <box orientation="horizontal" spacing="10" xpadding="10" ypadding="10">
++ <item type="button" id="options_button">
++ <pos width="100" height="50" />
++ <stock type="options"/>
+ </item>
+ </box>
+ </item>
+@@ -100,33 +84,13 @@
+ </item>
+ </fixed>
+ </item>
+- <item type="rect" id="ok_button" button="true">
+- <normal color="#ffffff"/>
+- <pos anchor="n" x="50%" width="50%" height="20"/>
+- <box orientation="vertical" spacing="10" xpadding="10">
+- <item type="label">
+- <normal color="#000000" font="Sans 12"/>
+- <prelight color="#666666" font="Sans 12"/>
+- <active color="#ff0000" font="Sans 12"/>
+- <pos anchor="n" x="50%" height="24" width="50%"/>
+- <!-- Stock label for: _OK -->
+- <stock type="ok"/>
+- </item>
+- </box>
+- </item>
+- <item type="rect" id="cancel_button" button="true">
+- <normal color="#ffffff"/>
+- <pos anchor="n" x="50%" width="50%" height="20"/>
+- <box orientation="vertical" spacing="10" xpadding="10">
+- <item type="label">
+- <normal color="#000000" font="Sans 12"/>
+- <prelight color="#666666" font="Sans 12"/>
+- <active color="#ff0000" font="Sans 12"/>
+- <pos anchor="n" x="50%" height="24" width="50%"/>
+- <!-- Stock label for: _Cancel -->
+- <stock type="cancel"/>
+- </item>
+- </box>
++ <item type="button" id="ok_button">
++ <pos anchor="n" x="50%" height="32" width="50%"/>
++ <stock type="ok"/>
++ </item>
++ <item type="button" id="cancel_button">
++ <pos anchor="n" x="50%" height="32" width="50%"/>
++ <stock type="startagain"/>
+ </item>
+ <item type="label" id="pam-message">
+ <pos anchor="n" x="50%"/>
+--- gdm-2.14.7/gui/greeter/themes/happygnome-list/happygnome.xml-orig 2006-03-20 18:49:00.000000000 -0600
++++ gdm-2.14.7/gui/greeter/themes/happygnome-list/happygnome.xml 2006-05-23 17:10:11.300831000 -0500
+@@ -12,26 +12,10 @@
+ <item type="rect">
+ <normal color="#ffffff"/>
+ <pos x="0" y="4" width="100%" height="100%"/>
+- <box orientation="horizontal" spacing="10" xpadding="10">
+- <item type="rect" id="options_button" button="true">
+- <normal color="#ffffff"/>
+- <pos y="50%" anchor="w" width="box" height="box"/>
+- <box orientation="horizontal" spacing="10" xpadding="10">
+- <item type="pixmap">
+- <normal file="options.png" tint="#dddddd"/>
+- <prelight file="options.png"/>
+- <active file="options.png" tint="#ff0000"/>
+- <pos y="50%" anchor="w"/>
+- </item>
+- <item type="label">
+- <normal color="#000000" font="Sans 12"/>
+- <prelight color="#666666" font="Sans 12"/>
+- <active color="#ff0000" font="Sans 12"/>
+- <pos y="50%" anchor="w"/>
+- <!-- Stock label for: _Options -->
+- <stock type="options"/>
+- </item>
+- </box>
++ <box orientation="horizontal" spacing="10" xpadding="10" ypadding="10">
++ <item type="button" id="options_button">
++ <pos width="100" height="50" />
++ <stock type="options"/>
+ </item>
+ </box>
+ </item>
+@@ -111,33 +95,13 @@
+ </item>
+ </fixed>
+ </item>
+- <item type="rect" id="ok_button" button="true">
+- <normal color="#ffffff"/>
+- <pos anchor="n" x="50%" width="50%" height="20"/>
+- <box orientation="vertical" spacing="10" xpadding="10">
+- <item type="label">
+- <normal color="#000000" font="Sans 12"/>
+- <prelight color="#666666" font="Sans 12"/>
+- <active color="#ff0000" font="Sans 12"/>
+- <pos anchor="n" x="50%" height="24" width="50%"/>
+- <!-- Stock label for: _OK -->
+- <stock type="ok"/>
+- </item>
+- </box>
+- </item>
+- <item type="rect" id="cancel_button" button="true">
+- <normal color="#ffffff"/>
+- <pos anchor="n" x="50%" width="50%" height="20"/>
+- <box orientation="vertical" spacing="10" xpadding="10">
+- <item type="label">
+- <normal color="#000000" font="Sans 12"/>
+- <prelight color="#666666" font="Sans 12"/>
+- <active color="#ff0000" font="Sans 12"/>
+- <pos anchor="n" x="50%" height="24" width="50%"/>
+- <!-- Stock label for: _Cancel -->
+- <stock type="cancel"/>
+- </item>
+- </box>
++ <item type="button" id="ok_button">
++ <pos anchor="n" x="50%" height="32" width="50%"/>
++ <stock type="ok"/>
++ </item>
++ <item type="button" id="cancel_button">
++ <pos anchor="n" x="50%" height="32" width="50%"/>
++ <stock type="startagain"/>
+ </item>
+ <item type="label" id="pam-message">
+ <pos anchor="n" x="50%"/>
--- a/patches/gdm-07-system-locale.diff Mon Jun 05 23:36:28 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
---- gdm-2.6.0.3/daemon/gdm.c 2005-03-10 16:34:02.000000000 -0800
-+++ gdm-2.6.0.3-patch/daemon/gdm.c 2005-03-10 16:54:33.579783768 -0800
-@@ -122,6 +122,7 @@
- unsigned char *gdm_global_bcookie = NULL;
-
- gchar *gdm_charset = NULL;
-+char *gdm_system_locale = NULL; /* CR Id: 5032088 */
-
- int gdm_normal_runlevel = -1; /* runlevel on linux that gdm was started in */
-
-@@ -2026,6 +2027,11 @@
- gdm_charset = g_strdup (charset);
- }
-
-+ /* CR Id: 5032088 */
-+ if (setlocale (LC_CTYPE, NULL) != NULL) {
-+ gdm_system_locale = g_strdup (setlocale (LC_CTYPE, NULL));
-+ }
-+
- /* initial TERM/INT handler */
- sig.sa_handler = initial_term_int;
- sig.sa_flags = SA_RESTART;
---- gdm-2.6.0.3/daemon/slave.c 2005-03-10 16:34:02.000000000 -0800
-+++ gdm-2.6.0.3-patch/daemon/slave.c 2005-03-10 16:57:58.936564792 -0800
-@@ -137,6 +137,9 @@
- /* wait for a GO in the SOP protocol */
- extern gboolean gdm_wait_for_go;
-
-+/* CR Id: 5032088 */
-+extern char *gdm_system_locale;
-+
- /* Local prototypes */
- static gint gdm_slave_xerror_handler (Display *disp, XErrorEvent *evt);
- static gint gdm_slave_xioerror_handler (Display *disp);
-@@ -4160,7 +4163,10 @@
- home_dir_ok,
- session,
- save_session,
-- language,
-+ ((gdm_system_locale != (char *) NULL) &&
-+ ( (language == NULL) ||
-+ ((language != NULL) && (strcmp (language, "") == 0) )) == TRUE ?
-+ gdm_system_locale : language),
- gnome_session,
- usrcfgok,
- savesess,
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gdm-08-linguas.diff Tue Jun 06 05:39:37 2006 +0000
@@ -0,0 +1,115 @@
+Index: gdm/config/locale.alias
+===================================================================
+RCS file: /cvs/gnome/gdm2/config/locale.alias,v
+retrieving revision 1.45
+diff -r1.45 locale.alias
+16a17
+> C(POSIX) C,POSIX
+21a23
+> Arabic(SaudiArabia) ar_SA.UTF-8,ar_SA
+33a36
+> Chinese(GB18030) zh_CN.GB18030
+41c44
+< English(USA) en_US.UTF-8,en_US
+---
+> Dutch(Belgium) nl_BE.UTF-8,nl_BE
+43d45
+< English(UK) en_GB.UTF-8,en_GB
+45a48,49
+> English(Malta) en_MT.UTF-8,en_MT
+> English(NewZealand) en_NZ.UTF-8,en_NZ
+46a51,52
+> English(UK) en_GB.UTF-8,en_GB
+> English(USA) en_US.UTF-8,en_US
+51a58,59
+> French(Canada) fr_CA.UTF-8,fr_CA
+> French(Luxembourg) fr_LU.UTF-8,fr_LU
+56a65
+> German(Luxembourg) de_LU.UTF-8,de_LU
+57a67
+> Greek(Cyprus) el_CY.UTF-8,el_CY
+78a89
+> Maltese mt_MT.UTF-8,mt_MT
+94a106
+> Serbian(Bosnia) sh_BA.UTF-8,sh_BA
+99a112,118
+> Spanish(Argentina) es_AR.UTF-8,es_AR
+> Spanish(Bolivia) es_BO.UTF-8,es_BO
+> Spanish(Chile) es_CL.UTF-8,es_CL
+> Spanish(Colombia) es_CO.UTF-8,es_CO
+> Spanish(CostaRica) es_CR.UTF-8,es_CR
+> Spanish(Ecuador) es_EC.UTF-8,es_EC
+> Spanish(Guatemala) es_GT.UTF-8,es_GT
+100a120,126
+> Spanish(Nicaragua) es_NI.UTF-8,es_NI
+> Spanish(Panama) es_PA.UTF-8,es_PA
+> Spanish(Peru) es_PE.UTF-8,es_PE
+> Spanish(Paraguay) es_PY.UTF-8,es_PY
+> Spanish(ElSalvador) es_SV.UTF-8,es_SV
+> Spanish(Uruguay) es_UY.UTF-8,es_UY
+> Spanish(Venezuela) es_VE.UTF-8,es_VE
+Index: gdm/gui/gdmlanguages.c
+===================================================================
+RCS file: /cvs/gnome/gdm2/gui/gdmlanguages.c,v
+retrieving revision 1.58
+diff -r1.58 gdmlanguages.c
+62a63,64
+> { N_("A-M|Arabic (Saudi Arabia)"), "ar_SA", NULL, 0 },
+> /*Note translate the A-M to the A-M you used in the group label */
+96a99,100
+> { N_("A-M|Dutch (Belgium)"), "nl_BE", "Nederlands (België)", 0 },
+> /*Note translate the A-M to the A-M you used in the group label */
+110a115,118
+> { N_("A-M|English (Malta)"), "en_MT", "Maltese English", 0 },
+> /*Note translate the A-M to the A-M you used in the group label */
+> { N_("A-M|English (New Zealand)"), "en_NZ", "New Zealand English", 0 },
+> /*Note translate the A-M to the A-M you used in the group label */
+118a127,130
+> { N_("A-M|French (Canada)"), "fr_CA", "Français (Canada)", 0 },
+> /*Note translate the A-M to the A-M you used in the group label */
+> { N_("A-M|French (Luxembourg)"), "fr_LU", "Français (Luxembourg)", 0 },
+> /*Note translate the A-M to the A-M you used in the group label */
+126a139,140
+> { N_("A-M|German (Luxembourg)"), "de_LU", "Deutsch (Luxemburg)", 0 },
+> /*Note translate the A-M to the A-M you used in the group label */
+130a145,146
+> { N_("A-M|Greek (Cyprus)"), "el_CY", "Ελληνικά (Κύπρος)", 0 },
+> /*Note translate the A-M to the A-M you used in the group label */
+168a185,186
+> { N_("A-M|Maltese"), "mt_MT", NULL, 0 },
+> /*Note translate the A-M to the A-M you used in the group label */
+202a221,222
+> { N_("N-Z|Serbian (Bosnia)"), "sh_BA", "srpski (Bosna i Hercegovina)", 0 },
+> /*Note translate the N-Z to the N-Z you used in the group label */
+209c229,257
+< { N_("N-Z|Spanish (Mexico)"), "es_MX", "Español (Mexico)", 0 },
+---
+> { N_("N-Z|Spanish (Argentina)"), "es_AR", "Español (Argentina)", 0 },
+> /*Note translate the N-Z to the N-Z you used in the group label */
+> { N_("N-Z|Spanish (Bolivia)"), "es_BO", "Español (Bolivia)", 0 },
+> /*Note translate the N-Z to the N-Z you used in the group label */
+> { N_("N-Z|Spanish (Chile)"), "es_CL", "Español (Chile)", 0 },
+> /*Note translate the N-Z to the N-Z you used in the group label */
+> { N_("N-Z|Spanish (Colombia)"), "es_CO", "Español (Colombia)", 0 },
+> /*Note translate the N-Z to the N-Z you used in the group label */
+> { N_("N-Z|Spanish (Costa Rica)"), "es_CR", "Español (Costa Rica)", 0 },
+> /*Note translate the N-Z to the N-Z you used in the group label */
+> { N_("N-Z|Spanish (Ecuador)"), "es_EC", "Español (Ecuador)", 0 },
+> /*Note translate the N-Z to the N-Z you used in the group label */
+> { N_("N-Z|Spanish (Guatemala)"), "es_GT", "Español (Guatemala)", 0 },
+> /*Note translate the N-Z to the N-Z you used in the group label */
+> { N_("N-Z|Spanish (Mexico)"), "es_MX", "Español (México)", 0 },
+> /*Note translate the N-Z to the N-Z you used in the group label */
+> { N_("N-Z|Spanish (Nicaragua)"), "es_NI", "Español (Nicaragua)", 0 },
+> /*Note translate the N-Z to the N-Z you used in the group label */
+> { N_("N-Z|Spanish (Panama)"), "es_PA", "Español (Panamá)", 0 },
+> /*Note translate the N-Z to the N-Z you used in the group label */
+> { N_("N-Z|Spanish (Peru)"), "es_PE", "Español (Perú)", 0 },
+> /*Note translate the N-Z to the N-Z you used in the group label */
+> { N_("N-Z|Spanish (Paraguay)"), "es_PY", "Español (Paraguay)", 0 },
+> /*Note translate the N-Z to the N-Z you used in the group label */
+> { N_("N-Z|Spanish (El Salvador)"), "es_SV", "Español (El Salvador)", 0 },
+> /*Note translate the N-Z to the N-Z you used in the group label */
+> { N_("N-Z|Spanish (Uruguay)"), "es_UY", "Español (Uruguay)", 0 },
+> /*Note translate the N-Z to the N-Z you used in the group label */
+> { N_("N-Z|Spanish (Venezuela)"), "es_VE", "Español (Venezuela)", 0 },
--- a/patches/gdm-08-startagain.diff Mon Jun 05 23:36:28 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,243 +0,0 @@
---- gdm-2.14.6/gui/greeter/greeter_parser.c-orig 2006-05-12 02:00:28.533677000 -0500
-+++ gdm-2.14.6/gui/greeter/greeter_parser.c 2006-05-12 02:00:51.056897000 -0500
-@@ -1102,12 +1102,16 @@ parse_stock (xmlNodePtr node,
- * Support startagain as cancel for forward compatibility without
- * string breakage.
- */
-- else if (g_ascii_strcasecmp ((char *) prop, "cancel") == 0 ||
-- g_ascii_strcasecmp ((char *) prop, "startagain") == 0)
-+ else if (g_ascii_strcasecmp ((char *) prop, "cancel") == 0)
- {
- g_free (*translated_text);
- *translated_text = g_strdup (_("_Cancel"));
- }
-+ else if (g_ascii_strcasecmp ((char *) prop, "startagain") == 0)
-+ {
-+ g_free (*translated_text);
-+ *translated_text = g_strdup (_("_Start Again"));
-+ }
- else
- {
- g_set_error (error,
---- gdm-2.14.7/gui/greeter/themes/circles/circles.xml-orig 2006-01-30 15:40:21.000000000 -0600
-+++ gdm-2.14.7/gui/greeter/themes/circles/circles.xml 2006-05-23 17:09:27.604437000 -0500
-@@ -12,26 +12,10 @@
- <item type="rect">
- <normal color="#ffffff"/>
- <pos x="0" y="4" width="100%" height="100%"/>
-- <box orientation="horizontal" spacing="10" xpadding="10">
-- <item type="rect" id="options_button" button="true">
-- <normal color="#ffffff"/>
-- <pos y="50%" anchor="w" width="box" height="box"/>
-- <box orientation="horizontal" spacing="10" xpadding="10">
-- <item type="pixmap">
-- <normal file="options.png" tint="#dddddd"/>
-- <prelight file="options.png"/>
-- <active file="options.png" tint="#ff0000"/>
-- <pos y="50%" anchor="w"/>
-- </item>
-- <item type="label">
-- <normal color="#000000" font="Sans 12"/>
-- <prelight color="#666666" font="Sans 12"/>
-- <active color="#ff0000" font="Sans 12"/>
-- <pos y="50%" anchor="w"/>
-- <!-- Stock label for: _Options -->
-- <stock type="options"/>
-- </item>
-- </box>
-+ <box orientation="horizontal" spacing="10" xpadding="10" ypadding="10">
-+ <item type="button" id="options_button" button="true">
-+ <pos width="100" height="50"/>
-+ <stock type="options"/>
- </item>
- </box>
- </item>
-@@ -100,33 +84,13 @@
- </item>
- </fixed>
- </item>
-- <item type="rect" id="ok_button" button="true">
-- <normal color="#ffffff"/>
-- <pos anchor="n" x="50%" width="50%" height="20"/>
-- <box orientation="vertical" spacing="10" xpadding="10">
-- <item type="label">
-- <normal color="#000000" font="Sans 12"/>
-- <prelight color="#666666" font="Sans 12"/>
-- <active color="#ff0000" font="Sans 12"/>
-- <pos anchor="n" x="50%" height="24" width="50%"/>
-- <!-- Stock label for: _OK -->
-- <stock type="ok"/>
-- </item>
-- </box>
-- </item>
-- <item type="rect" id="cancel_button" button="true">
-- <normal color="#ffffff"/>
-- <pos anchor="n" x="50%" width="50%" height="20"/>
-- <box orientation="vertical" spacing="10" xpadding="10">
-- <item type="label">
-- <normal color="#000000" font="Sans 12"/>
-- <prelight color="#666666" font="Sans 12"/>
-- <active color="#ff0000" font="Sans 12"/>
-- <pos anchor="n" x="50%" height="24" width="50%"/>
-- <!-- Stock label for: _Cancel -->
-- <stock type="cancel"/>
-- </item>
-- </box>
-+ <item type="button" id="ok_button">
-+ <pos anchor="n" x="50%" height="32" width="50%"/>
-+ <stock type="ok"/>
-+ </item>
-+ <item type="button" id="cancel_button">
-+ <pos anchor="n" x="50%" height="32" width="50%"/>
-+ <stock type="startagain"/>
- </item>
- <item type="label" id="pam-message">
- <pos anchor="n" x="50%"/>
---- gdm-2.14.7/gui/greeter/themes/happygnome/happygnome.xml-orig 2006-03-20 18:48:59.000000000 -0600
-+++ gdm-2.14.7/gui/greeter/themes/happygnome/happygnome.xml 2006-05-23 17:09:56.498438000 -0500
-@@ -12,26 +12,10 @@
- <item type="rect">
- <normal color="#ffffff"/>
- <pos x="0" y="4" width="100%" height="100%"/>
-- <box orientation="horizontal" spacing="10" xpadding="10">
-- <item type="rect" id="options_button" button="true">
-- <normal color="#ffffff"/>
-- <pos y="50%" anchor="w" width="box" height="box"/>
-- <box orientation="horizontal" spacing="10" xpadding="10">
-- <item type="pixmap">
-- <normal file="options.png" tint="#dddddd"/>
-- <prelight file="options.png"/>
-- <active file="options.png" tint="#ff0000"/>
-- <pos y="50%" anchor="w"/>
-- </item>
-- <item type="label">
-- <normal color="#000000" font="Sans 12"/>
-- <prelight color="#666666" font="Sans 12"/>
-- <active color="#ff0000" font="Sans 12"/>
-- <pos y="50%" anchor="w"/>
-- <!-- Stock label for: _Options -->
-- <stock type="options"/>
-- </item>
-- </box>
-+ <box orientation="horizontal" spacing="10" xpadding="10" ypadding="10">
-+ <item type="button" id="options_button">
-+ <pos width="100" height="50" />
-+ <stock type="options"/>
- </item>
- </box>
- </item>
-@@ -100,33 +84,13 @@
- </item>
- </fixed>
- </item>
-- <item type="rect" id="ok_button" button="true">
-- <normal color="#ffffff"/>
-- <pos anchor="n" x="50%" width="50%" height="20"/>
-- <box orientation="vertical" spacing="10" xpadding="10">
-- <item type="label">
-- <normal color="#000000" font="Sans 12"/>
-- <prelight color="#666666" font="Sans 12"/>
-- <active color="#ff0000" font="Sans 12"/>
-- <pos anchor="n" x="50%" height="24" width="50%"/>
-- <!-- Stock label for: _OK -->
-- <stock type="ok"/>
-- </item>
-- </box>
-- </item>
-- <item type="rect" id="cancel_button" button="true">
-- <normal color="#ffffff"/>
-- <pos anchor="n" x="50%" width="50%" height="20"/>
-- <box orientation="vertical" spacing="10" xpadding="10">
-- <item type="label">
-- <normal color="#000000" font="Sans 12"/>
-- <prelight color="#666666" font="Sans 12"/>
-- <active color="#ff0000" font="Sans 12"/>
-- <pos anchor="n" x="50%" height="24" width="50%"/>
-- <!-- Stock label for: _Cancel -->
-- <stock type="cancel"/>
-- </item>
-- </box>
-+ <item type="button" id="ok_button">
-+ <pos anchor="n" x="50%" height="32" width="50%"/>
-+ <stock type="ok"/>
-+ </item>
-+ <item type="button" id="cancel_button">
-+ <pos anchor="n" x="50%" height="32" width="50%"/>
-+ <stock type="startagain"/>
- </item>
- <item type="label" id="pam-message">
- <pos anchor="n" x="50%"/>
---- gdm-2.14.7/gui/greeter/themes/happygnome-list/happygnome.xml-orig 2006-03-20 18:49:00.000000000 -0600
-+++ gdm-2.14.7/gui/greeter/themes/happygnome-list/happygnome.xml 2006-05-23 17:10:11.300831000 -0500
-@@ -12,26 +12,10 @@
- <item type="rect">
- <normal color="#ffffff"/>
- <pos x="0" y="4" width="100%" height="100%"/>
-- <box orientation="horizontal" spacing="10" xpadding="10">
-- <item type="rect" id="options_button" button="true">
-- <normal color="#ffffff"/>
-- <pos y="50%" anchor="w" width="box" height="box"/>
-- <box orientation="horizontal" spacing="10" xpadding="10">
-- <item type="pixmap">
-- <normal file="options.png" tint="#dddddd"/>
-- <prelight file="options.png"/>
-- <active file="options.png" tint="#ff0000"/>
-- <pos y="50%" anchor="w"/>
-- </item>
-- <item type="label">
-- <normal color="#000000" font="Sans 12"/>
-- <prelight color="#666666" font="Sans 12"/>
-- <active color="#ff0000" font="Sans 12"/>
-- <pos y="50%" anchor="w"/>
-- <!-- Stock label for: _Options -->
-- <stock type="options"/>
-- </item>
-- </box>
-+ <box orientation="horizontal" spacing="10" xpadding="10" ypadding="10">
-+ <item type="button" id="options_button">
-+ <pos width="100" height="50" />
-+ <stock type="options"/>
- </item>
- </box>
- </item>
-@@ -111,33 +95,13 @@
- </item>
- </fixed>
- </item>
-- <item type="rect" id="ok_button" button="true">
-- <normal color="#ffffff"/>
-- <pos anchor="n" x="50%" width="50%" height="20"/>
-- <box orientation="vertical" spacing="10" xpadding="10">
-- <item type="label">
-- <normal color="#000000" font="Sans 12"/>
-- <prelight color="#666666" font="Sans 12"/>
-- <active color="#ff0000" font="Sans 12"/>
-- <pos anchor="n" x="50%" height="24" width="50%"/>
-- <!-- Stock label for: _OK -->
-- <stock type="ok"/>
-- </item>
-- </box>
-- </item>
-- <item type="rect" id="cancel_button" button="true">
-- <normal color="#ffffff"/>
-- <pos anchor="n" x="50%" width="50%" height="20"/>
-- <box orientation="vertical" spacing="10" xpadding="10">
-- <item type="label">
-- <normal color="#000000" font="Sans 12"/>
-- <prelight color="#666666" font="Sans 12"/>
-- <active color="#ff0000" font="Sans 12"/>
-- <pos anchor="n" x="50%" height="24" width="50%"/>
-- <!-- Stock label for: _Cancel -->
-- <stock type="cancel"/>
-- </item>
-- </box>
-+ <item type="button" id="ok_button">
-+ <pos anchor="n" x="50%" height="32" width="50%"/>
-+ <stock type="ok"/>
-+ </item>
-+ <item type="button" id="cancel_button">
-+ <pos anchor="n" x="50%" height="32" width="50%"/>
-+ <stock type="startagain"/>
- </item>
- <item type="label" id="pam-message">
- <pos anchor="n" x="50%"/>
--- a/patches/gdm-09-linguas.diff Mon Jun 05 23:36:28 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,115 +0,0 @@
-Index: gdm/config/locale.alias
-===================================================================
-RCS file: /cvs/gnome/gdm2/config/locale.alias,v
-retrieving revision 1.45
-diff -r1.45 locale.alias
-16a17
-> C(POSIX) C,POSIX
-21a23
-> Arabic(SaudiArabia) ar_SA.UTF-8,ar_SA
-33a36
-> Chinese(GB18030) zh_CN.GB18030
-41c44
-< English(USA) en_US.UTF-8,en_US
----
-> Dutch(Belgium) nl_BE.UTF-8,nl_BE
-43d45
-< English(UK) en_GB.UTF-8,en_GB
-45a48,49
-> English(Malta) en_MT.UTF-8,en_MT
-> English(NewZealand) en_NZ.UTF-8,en_NZ
-46a51,52
-> English(UK) en_GB.UTF-8,en_GB
-> English(USA) en_US.UTF-8,en_US
-51a58,59
-> French(Canada) fr_CA.UTF-8,fr_CA
-> French(Luxembourg) fr_LU.UTF-8,fr_LU
-56a65
-> German(Luxembourg) de_LU.UTF-8,de_LU
-57a67
-> Greek(Cyprus) el_CY.UTF-8,el_CY
-78a89
-> Maltese mt_MT.UTF-8,mt_MT
-94a106
-> Serbian(Bosnia) sh_BA.UTF-8,sh_BA
-99a112,118
-> Spanish(Argentina) es_AR.UTF-8,es_AR
-> Spanish(Bolivia) es_BO.UTF-8,es_BO
-> Spanish(Chile) es_CL.UTF-8,es_CL
-> Spanish(Colombia) es_CO.UTF-8,es_CO
-> Spanish(CostaRica) es_CR.UTF-8,es_CR
-> Spanish(Ecuador) es_EC.UTF-8,es_EC
-> Spanish(Guatemala) es_GT.UTF-8,es_GT
-100a120,126
-> Spanish(Nicaragua) es_NI.UTF-8,es_NI
-> Spanish(Panama) es_PA.UTF-8,es_PA
-> Spanish(Peru) es_PE.UTF-8,es_PE
-> Spanish(Paraguay) es_PY.UTF-8,es_PY
-> Spanish(ElSalvador) es_SV.UTF-8,es_SV
-> Spanish(Uruguay) es_UY.UTF-8,es_UY
-> Spanish(Venezuela) es_VE.UTF-8,es_VE
-Index: gdm/gui/gdmlanguages.c
-===================================================================
-RCS file: /cvs/gnome/gdm2/gui/gdmlanguages.c,v
-retrieving revision 1.58
-diff -r1.58 gdmlanguages.c
-62a63,64
-> { N_("A-M|Arabic (Saudi Arabia)"), "ar_SA", NULL, 0 },
-> /*Note translate the A-M to the A-M you used in the group label */
-96a99,100
-> { N_("A-M|Dutch (Belgium)"), "nl_BE", "Nederlands (België)", 0 },
-> /*Note translate the A-M to the A-M you used in the group label */
-110a115,118
-> { N_("A-M|English (Malta)"), "en_MT", "Maltese English", 0 },
-> /*Note translate the A-M to the A-M you used in the group label */
-> { N_("A-M|English (New Zealand)"), "en_NZ", "New Zealand English", 0 },
-> /*Note translate the A-M to the A-M you used in the group label */
-118a127,130
-> { N_("A-M|French (Canada)"), "fr_CA", "Français (Canada)", 0 },
-> /*Note translate the A-M to the A-M you used in the group label */
-> { N_("A-M|French (Luxembourg)"), "fr_LU", "Français (Luxembourg)", 0 },
-> /*Note translate the A-M to the A-M you used in the group label */
-126a139,140
-> { N_("A-M|German (Luxembourg)"), "de_LU", "Deutsch (Luxemburg)", 0 },
-> /*Note translate the A-M to the A-M you used in the group label */
-130a145,146
-> { N_("A-M|Greek (Cyprus)"), "el_CY", "Ελληνικά (Κύπρος)", 0 },
-> /*Note translate the A-M to the A-M you used in the group label */
-168a185,186
-> { N_("A-M|Maltese"), "mt_MT", NULL, 0 },
-> /*Note translate the A-M to the A-M you used in the group label */
-202a221,222
-> { N_("N-Z|Serbian (Bosnia)"), "sh_BA", "srpski (Bosna i Hercegovina)", 0 },
-> /*Note translate the N-Z to the N-Z you used in the group label */
-209c229,257
-< { N_("N-Z|Spanish (Mexico)"), "es_MX", "Español (Mexico)", 0 },
----
-> { N_("N-Z|Spanish (Argentina)"), "es_AR", "Español (Argentina)", 0 },
-> /*Note translate the N-Z to the N-Z you used in the group label */
-> { N_("N-Z|Spanish (Bolivia)"), "es_BO", "Español (Bolivia)", 0 },
-> /*Note translate the N-Z to the N-Z you used in the group label */
-> { N_("N-Z|Spanish (Chile)"), "es_CL", "Español (Chile)", 0 },
-> /*Note translate the N-Z to the N-Z you used in the group label */
-> { N_("N-Z|Spanish (Colombia)"), "es_CO", "Español (Colombia)", 0 },
-> /*Note translate the N-Z to the N-Z you used in the group label */
-> { N_("N-Z|Spanish (Costa Rica)"), "es_CR", "Español (Costa Rica)", 0 },
-> /*Note translate the N-Z to the N-Z you used in the group label */
-> { N_("N-Z|Spanish (Ecuador)"), "es_EC", "Español (Ecuador)", 0 },
-> /*Note translate the N-Z to the N-Z you used in the group label */
-> { N_("N-Z|Spanish (Guatemala)"), "es_GT", "Español (Guatemala)", 0 },
-> /*Note translate the N-Z to the N-Z you used in the group label */
-> { N_("N-Z|Spanish (Mexico)"), "es_MX", "Español (México)", 0 },
-> /*Note translate the N-Z to the N-Z you used in the group label */
-> { N_("N-Z|Spanish (Nicaragua)"), "es_NI", "Español (Nicaragua)", 0 },
-> /*Note translate the N-Z to the N-Z you used in the group label */
-> { N_("N-Z|Spanish (Panama)"), "es_PA", "Español (Panamá)", 0 },
-> /*Note translate the N-Z to the N-Z you used in the group label */
-> { N_("N-Z|Spanish (Peru)"), "es_PE", "Español (Perú)", 0 },
-> /*Note translate the N-Z to the N-Z you used in the group label */
-> { N_("N-Z|Spanish (Paraguay)"), "es_PY", "Español (Paraguay)", 0 },
-> /*Note translate the N-Z to the N-Z you used in the group label */
-> { N_("N-Z|Spanish (El Salvador)"), "es_SV", "Español (El Salvador)", 0 },
-> /*Note translate the N-Z to the N-Z you used in the group label */
-> { N_("N-Z|Spanish (Uruguay)"), "es_UY", "Español (Uruguay)", 0 },
-> /*Note translate the N-Z to the N-Z you used in the group label */
-> { N_("N-Z|Spanish (Venezuela)"), "es_VE", "Español (Venezuela)", 0 },
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gdm-09-login-photo-menu.diff Tue Jun 06 05:39:37 2006 +0000
@@ -0,0 +1,11 @@
+diff -urN gdm-2.14.6/gui/gdmphotosetup.desktop.in gdm-2.14.6-hacked/gui/gdmphotosetup.desktop.in
+--- gdm-2.14.6/gui/gdmphotosetup.desktop.in 2003-07-27 06:57:15.000000000 +1200
++++ gdm-2.14.6-hacked/gui/gdmphotosetup.desktop.in 2006-05-19 15:06:31.405523000 +1200
+@@ -9,6 +9,7 @@
+ StartupNotify=true
+ Terminal=false
+ Type=Application
++NoDisplay=true
+ Categories=Application;Settings;AdvancedSettings;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gdm
--- a/patches/gdm-10-login-photo-menu.diff Mon Jun 05 23:36:28 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-diff -urN gdm-2.14.6/gui/gdmphotosetup.desktop.in gdm-2.14.6-hacked/gui/gdmphotosetup.desktop.in
---- gdm-2.14.6/gui/gdmphotosetup.desktop.in 2003-07-27 06:57:15.000000000 +1200
-+++ gdm-2.14.6-hacked/gui/gdmphotosetup.desktop.in 2006-05-19 15:06:31.405523000 +1200
-@@ -9,6 +9,7 @@
- StartupNotify=true
- Terminal=false
- Type=Application
-+NoDisplay=true
- Categories=Application;Settings;AdvancedSettings;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gdm
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gdm-10-sun-branding-patch.diff Tue Jun 06 05:39:37 2006 +0000
@@ -0,0 +1,29 @@
+--- gdm-2.14.6/gui/greeter/greeter_parser.c Wed May 17 18:00:19 2006
++++ ../gdm-2.14.6/gui/greeter/greeter_parser.c Wed May 17 17:59:56 2006
+@@ -613,7 +613,25 @@
+
+ xmlFree (prop);
+ }
+-
++
++ /* if a branded file exist use it instead of the "regular" one */
++ prop = xmlGetProp (node,(const xmlChar *) "branded-file");
++ if (prop)
++ {
++ char *filename = NULL;
++ if (g_path_is_absolute ((char *) prop))
++ filename = g_strdup ((char *) prop);
++ else
++ filename = g_build_filename (file_search_path,
++ (char *) prop,
++ NULL);
++ if (g_file_test (filename, G_FILE_TEST_EXISTS))
++ {
++ if (info->data.pixmap.files[state])
++ g_free (info->data.pixmap.files[state]);
++ info->data.pixmap.files[state] = filename;
++ }
++ }
+ prop = xmlGetProp (node,(const xmlChar *) "tint");
+ if (prop)
+ {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gdm-11-fixfacebrowser.diff Tue Jun 06 05:39:37 2006 +0000
@@ -0,0 +1,127 @@
+Index: gdm-2.14.7/gui/gdmlogin.c
+===================================================================
+RCS file: /cvs/gnome/gdm2/gui/gdmlogin.c,v
+retrieving revision 1.273.2.1
+retrieving revision 1.273.2.2
+diff -u -r1.273.2.1 -r1.273.2.2
+--- gdm-2.14.7/gui/gdmlogin.c-orig 12 May 2006 05:58:23 -0000 1.273.2.1
++++ gdm-2.14.7/gui/gdmlogin.c 31 May 2006 10:11:52 -0000 1.273.2.2
+@@ -640,6 +640,8 @@
+ static void
+ gdm_run_gdmconfig (GtkWidget *w, gpointer data)
+ {
++ gtk_widget_set_sensitive (browser, FALSE);
++
+ /* we should be now fine for focusing new windows */
+ gdm_wm_focus_new_windows (TRUE);
+
+Index: gdm-2.14.7/gui/greeter/greeter.c
+===================================================================
+RCS file: /cvs/gnome/gdm2/gui/greeter/greeter.c,v
+retrieving revision 1.121
+retrieving revision 1.121.2.1
+diff -u -r1.121 -r1.121.2.1
+--- gdm-2.14.7/gui/greeter/greeter.c.orig 17 Apr 2006 22:00:42 -0000 1.121
++++ gdm-2.14.7/gui/greeter/greeter.c 31 May 2006 10:11:53 -0000 1.121.2.1
+@@ -160,7 +160,6 @@
+ buf[len-1] = '\0';
+
+ greeter_item_pam_set_user (buf);
+- greeter_item_ulist_enable ();
+ printf ("%c\n", STX);
+ fflush (stdout);
+ break;
+@@ -179,7 +178,6 @@
+ greeter_probably_login_prompt = FALSE;
+ }
+ greeter_ignore_buttons (FALSE);
+- greeter_item_ulist_enable ();
+ greeter_item_pam_prompt (tmp, PW_ENTRY_SIZE, TRUE);
+ g_free (tmp);
+ break;
+@@ -320,6 +318,8 @@
+ printf ("%c\n", STX);
+ fflush (stdout);
+ greeter_ignore_buttons (FALSE);
++ greeter_item_ulist_enable ();
++
+ break;
+
+ case GDM_QUIT:
+@@ -1341,6 +1341,9 @@
+ gtk_widget_show_all (window);
+ gtk_window_move (GTK_WINDOW (window), gdm_wm_screen.x, gdm_wm_screen.y);
+ gtk_widget_show_now (window);
++
++ greeter_item_ulist_unset_selected_user ();
++ greeter_item_ulist_enable ();
+
+ /* can it ever happen that it'd be NULL here ??? */
+ if G_UNLIKELY (window->window != NULL)
+Index: gdm-2.14.7/gui/greeter/greeter_item_ulist.c
+===================================================================
+RCS file: /cvs/gnome/gdm2/gui/greeter/greeter_item_ulist.c,v
+retrieving revision 1.27
+retrieving revision 1.27.2.1
+diff -u -r1.27 -r1.27.2.1
+--- gdm-2.14.7/gui/greeter/greeter_item_ulist.c-orig 28 Mar 2006 01:44:21 -0000 1.27
++++ gdm-2.14.7/gui/greeter/greeter_item_ulist.c 31 May 2006 10:11:53 -0000 1.27.2.1
+@@ -61,6 +61,14 @@
+ GREETER_ULIST_ACTIVE_COLUMN
+ };
+
++void
++greeter_item_ulist_unset_selected_user (void)
++{
++ GtkTreeSelection *selection;
++ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (user_list));
++ gtk_tree_selection_unselect_all (selection);
++}
++
+ static void
+ check_for_displays (void)
+ {
+@@ -325,8 +333,6 @@
+ force_no_tree_separators (user_list);
+
+ greeter_generate_userlist (user_list);
+- if ( ! DOING_GDM_DEVELOPMENT)
+- greeter_item_ulist_disable ();
+
+ /* Reset size of the widget canvas item so it
+ * is the same size as the userlist. This
+Index: gdm-2.14.7/gui/greeter/greeter_item_ulist.h
+===================================================================
+RCS file: /cvs/gnome/gdm2/gui/greeter/greeter_item_ulist.h,v
+retrieving revision 1.2
+retrieving revision 1.2.4.1
+diff -u -r1.2 -r1.2.4.1
+--- gdm-2.14.7/gui/greeter/greeter_item_ulist.h-orig 6 Apr 2005 19:37:29 -0000 1.2
++++ gdm-2.14.7/gui/greeter/greeter_item_ulist.h 31 May 2006 10:11:53 -0000 1.2.4.1
+@@ -25,5 +25,6 @@
+ void greeter_item_ulist_enable (void);
+ void greeter_item_ulist_disable (void);
+ void greeter_item_ulist_set_user (const char *user);
++void greeter_item_ulist_unset_selected_user (void);
+
+ #endif
+Index: gdm-2.14.7/gui/greeter/greeter_system.c
+===================================================================
+RCS file: /cvs/gnome/gdm2/gui/greeter/greeter_system.c,v
+retrieving revision 1.45
+retrieving revision 1.45.2.1
+diff -u -r1.45 -r1.45.2.1
+--- gdm-2.14.7/gui/greeter/greeter_system.c-orig 11 Feb 2006 01:33:59 -0000 1.45
++++ gdm-2.14.7/gui/greeter/greeter_system.c 31 May 2006 10:11:53 -0000 1.45.2.1
+@@ -124,6 +124,11 @@
+ static void
+ greeter_config_handler (void)
+ {
++ greeter_item_ulist_disable ();
++
++ /* Make sure to unselect the user */
++ greeter_item_ulist_unset_selected_user ();
++
+ /* we should be now fine for focusing new windows */
+ gdm_wm_focus_new_windows (TRUE);
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gdm-12-fixflexiserver.diff Tue Jun 06 05:39:37 2006 +0000
@@ -0,0 +1,11 @@
+--- gdm-2.14.7/gui/gdmflexiserver.c-orig 2006-06-05 17:20:05.203679000 -0500
++++ gdm-2.14.7/gui/gdmflexiserver.c 2006-06-05 17:20:14.430629000 -0500
+@@ -729,7 +729,7 @@ main (int argc, char *argv[])
+ if (args != NULL && args[0] != NULL)
+ server = args[0];
+
+- if ( ! gdmcomm_check (TRUE)) {
++ if ( ! gdmcomm_check (FALSE)) {
+ return 1;
+ }
+
--- a/patches/gdm-14-sun-branding-patch.diff Mon Jun 05 23:36:28 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
---- gdm-2.14.6/gui/greeter/greeter_parser.c Wed May 17 18:00:19 2006
-+++ ../gdm-2.14.6/gui/greeter/greeter_parser.c Wed May 17 17:59:56 2006
-@@ -613,7 +613,25 @@
-
- xmlFree (prop);
- }
--
-+
-+ /* if a branded file exist use it instead of the "regular" one */
-+ prop = xmlGetProp (node,(const xmlChar *) "branded-file");
-+ if (prop)
-+ {
-+ char *filename = NULL;
-+ if (g_path_is_absolute ((char *) prop))
-+ filename = g_strdup ((char *) prop);
-+ else
-+ filename = g_build_filename (file_search_path,
-+ (char *) prop,
-+ NULL);
-+ if (g_file_test (filename, G_FILE_TEST_EXISTS))
-+ {
-+ if (info->data.pixmap.files[state])
-+ g_free (info->data.pixmap.files[state]);
-+ info->data.pixmap.files[state] = filename;
-+ }
-+ }
- prop = xmlGetProp (node,(const xmlChar *) "tint");
- if (prop)
- {