diff --git a/.cvsignore b/.cvsignore index cf5dc88..f849c56 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gdm-2.21.9.tar.gz +gdm-2.21.10.tar.gz diff --git a/gdm-2.21.9-remove-duplicate-signal-verification.patch b/gdm-2.21.9-remove-duplicate-signal-verification.patch deleted file mode 100644 index e69de29..0000000 --- a/gdm-2.21.9-remove-duplicate-signal-verification.patch +++ /dev/null diff --git a/gdm-language-tooltip.patch b/gdm-language-tooltip.patch deleted file mode 100644 index 62d539d..0000000 --- a/gdm-language-tooltip.patch +++ /dev/null @@ -1,142 +0,0 @@ -diff -up gdm-2.21.9/gui/simple-greeter/gdm-languages.c.lang-tip gdm-2.21.9/gui/simple-greeter/gdm-languages.c ---- gdm-2.21.9/gui/simple-greeter/gdm-languages.c.lang-tip 2008-02-25 17:21:43.000000000 -0500 -+++ gdm-2.21.9/gui/simple-greeter/gdm-languages.c 2008-03-17 17:57:09.000000000 -0400 -@@ -630,15 +630,18 @@ get_translated_language (const char *cod - const char *translated_name; - char *old_locale; - -- old_locale = g_strdup (setlocale (LC_MESSAGES, NULL)); -- setlocale (LC_MESSAGES, locale); -- translated_name = dgettext ("iso_639", language); -+ if (locale != NULL) { -+ old_locale = g_strdup (setlocale (LC_MESSAGES, NULL)); -+ setlocale (LC_MESSAGES, locale); -+ } - -+ translated_name = dgettext ("iso_639", language); - name = get_first_item_in_semicolon_list (translated_name); - -- setlocale (LC_MESSAGES, old_locale); -- g_free (old_locale); -- -+ if (locale != NULL) { -+ setlocale (LC_MESSAGES, old_locale); -+ g_free (old_locale); -+ } - } - - return name; -@@ -676,13 +679,18 @@ get_translated_territory (const char *co - const char *translated_territory; - char *old_locale; - -- old_locale = g_strdup (setlocale (LC_MESSAGES, NULL)); -- setlocale (LC_MESSAGES, locale); -- translated_territory = dgettext ("iso_3166", territory); -- setlocale (LC_MESSAGES, old_locale); -- g_free (old_locale); -+ if (locale != NULL) { -+ old_locale = g_strdup (setlocale (LC_MESSAGES, NULL)); -+ setlocale (LC_MESSAGES, locale); -+ } - -+ translated_territory = dgettext ("iso_3166", territory); - name = get_first_item_in_semicolon_list (translated_territory); -+ -+ if (locale != NULL) { -+ setlocale (LC_MESSAGES, old_locale); -+ g_free (old_locale); -+ } - } - - return name; -@@ -929,7 +937,8 @@ territories_init (void) - } - - char * --gdm_get_language_from_name (const char *name) -+gdm_get_language_from_name (const char *name, -+ const char *locale) - { - char *full_language; - char *language_code; -@@ -956,10 +965,10 @@ gdm_get_language_from_name (const char * - goto out; - } - -- language = get_translated_language (language_code, name); -+ language = get_translated_language (language_code, locale); - - if (territory_code != NULL) { -- territory = get_translated_territory (territory_code, name); -+ territory = get_translated_territory (territory_code, locale); - } else { - territory = NULL; - } -diff -up gdm-2.21.9/gui/simple-greeter/gdm-language-option-widget.c.lang-tip gdm-2.21.9/gui/simple-greeter/gdm-language-option-widget.c ---- gdm-2.21.9/gui/simple-greeter/gdm-language-option-widget.c.lang-tip 2008-02-25 17:21:43.000000000 -0500 -+++ gdm-2.21.9/gui/simple-greeter/gdm-language-option-widget.c 2008-03-17 17:56:41.000000000 -0400 -@@ -144,15 +144,18 @@ gdm_language_option_widget_lookup_item ( - char **comment) - { - char *language; -+ char *readable_language; - -- language = gdm_get_language_from_name (locale); -+ language = gdm_get_language_from_name (locale, locale); - - if (language == NULL) { - return FALSE; - } - -+ readable_language = gdm_get_language_from_name (locale, NULL); -+ - *name = language; -- *comment = g_strdup (""); -+ *comment = readable_language; - - return TRUE; - } -diff -up gdm-2.21.9/gui/simple-greeter/gdm-languages.h.lang-tip gdm-2.21.9/gui/simple-greeter/gdm-languages.h ---- gdm-2.21.9/gui/simple-greeter/gdm-languages.h.lang-tip 2008-02-20 10:56:46.000000000 -0500 -+++ gdm-2.21.9/gui/simple-greeter/gdm-languages.h 2008-03-17 15:38:16.000000000 -0400 -@@ -26,7 +26,8 @@ - - G_BEGIN_DECLS - --char * gdm_get_language_from_name (const char *name); -+char * gdm_get_language_from_name (const char *name, -+ const char *locale); - char ** gdm_get_all_language_names (void); - void gdm_parse_language_name (const char *name, - char **language_codep, -diff -up gdm-2.21.9/gui/simple-greeter/gdm-language-chooser-widget.c.lang-tip gdm-2.21.9/gui/simple-greeter/gdm-language-chooser-widget.c ---- gdm-2.21.9/gui/simple-greeter/gdm-language-chooser-widget.c.lang-tip 2008-02-25 17:21:43.000000000 -0500 -+++ gdm-2.21.9/gui/simple-greeter/gdm-language-chooser-widget.c 2008-03-17 17:56:08.000000000 -0400 -@@ -117,21 +117,24 @@ gdm_language_chooser_widget_add_language - { - char *language; - char *normalized_name; -+ char *readable_language; - - normalized_name = gdm_normalize_language_name (name); -- language = gdm_get_language_from_name (normalized_name); -+ language = gdm_get_language_from_name (normalized_name, normalized_name); -+ readable_language = gdm_get_language_from_name (normalized_name, NULL); - - if (language != NULL) { - gdm_chooser_widget_add_item (GDM_CHOOSER_WIDGET (widget), - normalized_name, - NULL, - language, -- "", -+ readable_language, - 0, - FALSE, - FALSE); - g_free (language); - } -+ g_free (readable_language); - - g_free (normalized_name); - } diff --git a/gdm-no-fuse.patch b/gdm-no-fuse.patch deleted file mode 100644 index b673aa0..0000000 --- a/gdm-no-fuse.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up gdm-2.21.9/daemon/gdm-welcome-session.c.no-fuse gdm-2.21.9/daemon/gdm-welcome-session.c ---- gdm-2.21.9/daemon/gdm-welcome-session.c.no-fuse 2008-03-17 12:08:22.000000000 -0400 -+++ gdm-2.21.9/daemon/gdm-welcome-session.c 2008-03-17 12:09:31.000000000 -0400 -@@ -316,6 +316,7 @@ get_welcome_environment (GdmWelcomeSessi - g_hash_table_insert (hash, g_strdup ("PATH"), g_strdup (g_getenv ("PATH"))); - - g_hash_table_insert (hash, g_strdup ("RUNNING_UNDER_GDM"), g_strdup ("true")); -+ g_hash_table_insert (hash, g_strdup ("GVFS_DISABLE_FUSE"), g_strdup ("1")); - - g_hash_table_foreach (hash, (GHFunc)listify_hash, env); - g_hash_table_destroy (hash); diff --git a/gdm-null-user.patch b/gdm-null-user.patch deleted file mode 100644 index 370fdbe..0000000 --- a/gdm-null-user.patch +++ /dev/null @@ -1,67 +0,0 @@ -Index: gui/user-switch-applet/applet.c -=================================================================== ---- gui/user-switch-applet/applet.c (revision 5994) -+++ gui/user-switch-applet/applet.c (revision 5995) -@@ -1082,14 +1082,23 @@ fill_applet (PanelApplet *applet) - gtk_widget_show (hbox); - - { -- GdmUser *user; -+ GdmUser *user; -+ const char *name; - - user = gdm_user_manager_get_user_by_uid (adata->manager, getuid ()); -- adata->imglabel = gtk_label_new (gdm_user_get_real_name (user)); -- adata->user_notify_id = g_signal_connect (user, -- "notify::display-name", -- G_CALLBACK (user_notify_display_name_cb), -- adata->imglabel); -+ if (user != NULL) { -+ name = gdm_user_get_real_name (user); -+ } else { -+ name = _("Unknown"); -+ } -+ -+ adata->imglabel = gtk_label_new (name); -+ if (user != NULL) { -+ adata->user_notify_id = g_signal_connect (user, -+ "notify::display-name", -+ G_CALLBACK (user_notify_display_name_cb), -+ adata->imglabel); -+ } - gtk_box_pack_start (GTK_BOX (hbox), adata->imglabel, TRUE, TRUE, 0); - gtk_widget_show (adata->imglabel); - } -Index: gui/simple-greeter/gdm-user-manager.c -=================================================================== ---- gui/simple-greeter/gdm-user-manager.c (revision 5994) -+++ gui/simple-greeter/gdm-user-manager.c (revision 5995) -@@ -1115,6 +1115,11 @@ process_ck_history_line (GdmUserManager - } - - user = gdm_user_manager_get_user (manager, username); -+ if (user == NULL) { -+ g_debug ("GdmUserManager: unable to lookup user '%s'", username); -+ return; -+ } -+ - g_object_set (user, "login-frequency", frequency, NULL); - g_signal_emit (manager, signals [USER_LOGIN_FREQUENCY_CHANGED], 0, user); - } -Index: ChangeLog -=================================================================== ---- ChangeLog (revision 5994) -+++ ChangeLog (revision 5995) -@@ -1,5 +1,12 @@ - 2008-03-10 William Jon McCann - -+ * gui/simple-greeter/gdm-user-manager.c: (process_ck_history_line): -+ * gui/user-switch-applet/applet.c: (fill_applet): -+ Handle case where we can't lookup a GdmUser (for whatever reason). -+ Could be gone, excluded, etc... -+ -+2008-03-10 William Jon McCann -+ - * configure.ac: Post release version bump - - ==== 2.21.9 ==== diff --git a/gdm.spec b/gdm.spec index 2fe6a9d..8eed64f 100644 --- a/gdm.spec +++ b/gdm.spec @@ -15,8 +15,8 @@ Summary: The GNOME Display Manager Name: gdm -Version: 2.21.9 -Release: 5%{?dist} +Version: 2.21.10 +Release: 0.2008.03.18.1%{?dist} Epoch: 1 License: GPLv2+ Group: User Interface/X @@ -77,11 +77,6 @@ BuildRequires: gnome-panel-devel Requires: audit-libs >= %{libauditver} -Patch1: gdm-null-user.patch -Patch2: gdm-2.21.9-remove-duplicate-signal-verification.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=522033 -Patch3: gdm-no-fuse.patch -Patch4: gdm-language-tooltip.patch Patch99: gdm-2.21.8-fedora-logo.patch %package user-switch-applet @@ -102,10 +97,6 @@ multiple simulanteous logged in users. %prep %setup -q -%patch1 -p0 -b .null-user -%patch2 -p1 -b .remove-duplicate-signal-verification -%patch3 -p1 -b .no-fuse -%patch4 -p1 -b .language-tooltip %patch99 -p1 -b .fedora-logo %build @@ -299,6 +290,9 @@ fi %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml %changelog +* Tue Mar 18 2008 Jon McCann - 1:2.21.10-0.2008.03.18.1 +- Update to snapshot + * Mon Mar 17 2008 Matthias Clasen - 1:2.21.9-5 - Implement tooltips in the language selection dialog diff --git a/sources b/sources index 06b6e00..11e44d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -457a18dfae730f9e3436080d25d26c68 gdm-2.21.9.tar.gz +b9f161e3c4e1a99845a25c774e6fe751 gdm-2.21.10.tar.gz