gdm r6060 - in trunk: . gui/simple-greeter

[halfline svn gnome org]

Author: halfline
Date: Tue Mar 25 19:00:27 2008
New Revision: 6060
URL: http://svn.gnome.org/viewvc/gdm?rev=6060&view=rev

Log:
2008-03-25  Ray Strode  <rstrode redhat com>

	* gui/simple-greeter/gdm-languages:
	(select_dirs), (collect_locales_from_directory):
	When looking for locales, look in /usr/share/locale
	instead of /usr/lib/locale


Modified:
   trunk/ChangeLog
   trunk/gui/simple-greeter/gdm-languages.c

Modified: trunk/gui/simple-greeter/gdm-languages.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-languages.c	(original)
+++ trunk/gui/simple-greeter/gdm-languages.c	Tue Mar 25 19:00:27 2008
@@ -474,7 +474,7 @@
                                 struct stat st;
                                 char       *path;
 
-                                path = g_build_filename (LIBLOCALEDIR, dirent->d_name, NULL);
+                                path = g_build_filename (GNOMELOCALEDIR, dirent->d_name, NULL);
                                 if (g_stat (path, &st) == 0) {
                                         mode = st.st_mode;
                                 }
@@ -494,7 +494,7 @@
         int             ndirents;
         int             cnt;
 
-        ndirents = scandir (LIBLOCALEDIR, &dirents, select_dirs, alphasort);
+        ndirents = scandir (GNOMELOCALEDIR, &dirents, select_dirs, alphasort);
 
         for (cnt = 0; cnt < ndirents; ++cnt) {
                 char      *path;
@@ -528,7 +528,7 @@
                 }
 
                 /* try to get additional information from LC_IDENTIFICATION */
-                path = g_build_filename (LIBLOCALEDIR, dirents[cnt]->d_name, "LC_IDENTIFICATION", NULL);
+                path = g_build_filename (GNOMELOCALEDIR, dirents[cnt]->d_name, "LC_IDENTIFICATION", NULL);
                 res = g_file_test (path, G_FILE_TEST_IS_REGULAR);
                 if (res) {
                         GMappedFile      *mapped;