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

[halfline svn gnome org]

Author: halfline
Date: Sat Feb 16 06:11:28 2008
New Revision: 5772
URL: http://svn.gnome.org/viewvc/gdm?rev=5772&view=rev

Log:
2008-02-15  Ray Strode  <rstrode redhat com>

	* daemon/gdm/simple-greeter/gdm-sessions.c
	(collect_sessions_from_directory),
	(load_session_file): strip .desktop extension
	from desktop ids (to match what's in ~/.dmrc).


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

Modified: trunk/gui/simple-greeter/gdm-sessions.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-sessions.c	(original)
+++ trunk/gui/simple-greeter/gdm-sessions.c	Sat Feb 16 06:11:28 2008
@@ -102,7 +102,7 @@
 }
 
 static void
-load_session_file (const char              *name,
+load_session_file (const char              *id,
                    const char              *path)
 {
         GKeyFile          *key_file;
@@ -138,14 +138,14 @@
 
         session = g_new0 (GdmSessionFile, 1);
 
-        session->id = g_strdup (name);
+        session->id = g_strdup (id);
         session->path = g_strdup (path);
 
         session->translated_name = g_key_file_get_locale_string (key_file, G_KEY_FILE_DESKTOP_GROUP, "Name", NULL, NULL);
         session->translated_comment = g_key_file_get_locale_string (key_file, G_KEY_FILE_DESKTOP_GROUP, "Comment", NULL, NULL);
 
         g_hash_table_insert (gdm_available_sessions_map,
-                             g_strdup (name),
+                             g_strdup (id),
                              session);
  out:
         g_key_file_free (key_file);
@@ -165,15 +165,17 @@
         }
 
         while ((filename = g_dir_read_name (dir))) {
+                char *id;
                 char *full_path;
 
                 if (! g_str_has_suffix (filename, ".desktop")) {
                         continue;
                 }
+                id = g_strndup (filename, strlen (filename) - strlen (".desktop"));
 
                 full_path = g_build_filename (dirname, filename, NULL);
 
-                load_session_file (filename, full_path);
+                load_session_file (id, full_path);
 
                 g_free (full_path);
         }