diff options
author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-03-01 06:21:39 +0800 |
---|---|---|
committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-03-01 06:21:39 +0800 |
commit | e5053d8037c5e17ca659c72f1da3df8cd2e07923 (patch) | |
tree | 0be42b9407cd7cfffc8bfa5a1e9371064fbce2d6 /x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c | |
parent | 125c400566e403ddac396ea0377802fb8bc5e23c (diff) | |
download | marcuscom-ports-e5053d8037c5e17ca659c72f1da3df8cd2e07923.tar marcuscom-ports-e5053d8037c5e17ca659c72f1da3df8cd2e07923.tar.gz marcuscom-ports-e5053d8037c5e17ca659c72f1da3df8cd2e07923.tar.bz2 marcuscom-ports-e5053d8037c5e17ca659c72f1da3df8cd2e07923.tar.lz marcuscom-ports-e5053d8037c5e17ca659c72f1da3df8cd2e07923.tar.xz marcuscom-ports-e5053d8037c5e17ca659c72f1da3df8cd2e07923.tar.zst marcuscom-ports-e5053d8037c5e17ca659c72f1da3df8cd2e07923.zip |
Remove GDM, this isn't part of GNOME 2.22. The GNOME release team has decided
to downgrade the GDM, see more info:
http://mail.gnome.org/archives/desktop-devel-list/2008-February/msg00124.html
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10587 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c')
-rw-r--r-- | x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c | 91 |
1 files changed, 0 insertions, 91 deletions
diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c deleted file mode 100644 index 0ad57a462..000000000 --- a/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c +++ /dev/null @@ -1,91 +0,0 @@ ---- gui/simple-greeter/gdm-languages.c.orig 2008-02-25 17:21:43.000000000 -0500 -+++ gui/simple-greeter/gdm-languages.c 2008-02-27 01:17:09.000000000 -0500 -@@ -50,6 +50,8 @@ - #define ISO_CODES_DATADIR ISO_CODES_PREFIX "/share/xml/iso-codes" - #define ISO_CODES_LOCALESDIR ISO_CODES_PREFIX "/share/locale" - -+#define GDM_DEFAULT_LOCALE "C" -+ - typedef struct _GdmLocale { - char *id; - char *name; -@@ -479,7 +481,7 @@ select_dirs (const struct dirent *dirent - struct stat st; - char *path; - -- path = g_build_filename (LIBLOCALEDIR, dirent->d_name, NULL); -+ path = g_build_filename ("/usr/share/locale", dirent->d_name, NULL); - if (g_stat (path, &st) == 0) { - mode = st.st_mode; - } -@@ -499,7 +501,7 @@ collect_locales_from_directory (void) - int ndirents; - int cnt; - -- ndirents = scandir (LIBLOCALEDIR, &dirents, select_dirs, alphasort); -+ ndirents = scandir ("/usr/share/locale", &dirents, select_dirs, alphasort); - - for (cnt = 0; cnt < ndirents; ++cnt) { - char *path; -@@ -533,7 +535,7 @@ collect_locales_from_directory (void) - } - - /* try to get additional information from LC_IDENTIFICATION */ -- path = g_build_filename (LIBLOCALEDIR, dirents[cnt]->d_name, "LC_IDENTIFICATION", NULL); -+ path = g_build_filename ("/usr/share/locale", dirents[cnt]->d_name, "LC_IDENTIFICATION", NULL); - res = g_file_test (path, G_FILE_TEST_IS_REGULAR); - if (res) { - GMappedFile *mapped; -@@ -568,6 +570,35 @@ collect_locales_from_aliases (void) - } - - static void -+collect_default_locale (void) -+{ -+ GdmLocale *locale; -+ GdmLocale *old_locale; -+ -+ locale = g_new0 (GdmLocale, 1); -+ gdm_parse_language_name (GDM_DEFAULT_LOCALE, -+ &locale->language_code, -+ &locale->territory_code, -+ &locale->codeset, -+ &locale->modifier); -+ -+ locale->id = construct_language_name (locale->language_code, locale->territory_code, -+ NULL, locale->modifier); -+ locale->name = construct_language_name (locale->language_code, locale->territory_code, -+ locale->codeset, locale->modifier); -+ -+ old_locale = g_hash_table_lookup (gdm_available_locales_map, locale->id); -+ if (old_locale != NULL) { -+ if (strlen (old_locale->name) > strlen (locale->name)) { -+ chooser_locale_free (locale); -+ return; -+ } -+ } -+ -+ g_hash_table_insert (gdm_available_locales_map, g_strdup (locale->id), locale); -+} -+ -+static void - collect_locales (void) - { - -@@ -575,6 +606,7 @@ collect_locales (void) - gdm_available_locales_map = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) chooser_locale_free); - } - -+ collect_default_locale (); - collect_locales_from_archive (); - collect_locales_from_directory (); - collect_locales_from_aliases (); -@@ -957,6 +989,8 @@ gdm_get_language_from_name (const char * - } - - language = get_translated_language (language_code, name); -+ if (language == NULL && ! strcmp (language_code, GDM_DEFAULT_LOCALE)) -+ language = GDM_DEFAULT_LOCALE; - - if (territory_code != NULL) { - territory = get_translated_territory (territory_code, name); |