gnome-session r4845 - in branches/dbus_based: . capplet

[mccann svn gnome org]

Author: mccann
Date: Fri Jul 25 03:12:54 2008
New Revision: 4845
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4845&view=rev

Log:
2008-07-24  William Jon McCann  <jmccann redhat com>

	* capplet/commands.c (append_autostart_apps),
	(spc_command_get_store): Merge from trunk.
	Correctly sort apps model by name.



Modified:
   branches/dbus_based/ChangeLog
   branches/dbus_based/capplet/commands.c

Modified: branches/dbus_based/capplet/commands.c
==============================================================================
--- branches/dbus_based/capplet/commands.c	(original)
+++ branches/dbus_based/capplet/commands.c	Fri Jul 25 03:12:54 2008
@@ -503,8 +503,6 @@
 
       if (!error)
 	{
-	  g_debug ("read %s", desktop_file_path);
-
 	  if (!append_app (store, desktop_file))
             {
               if (removed_apps)
@@ -558,6 +556,10 @@
   g_list_foreach (removed_apps, (GFunc) g_free, NULL);
   g_list_free (removed_apps);
 
+  gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store),
+                                        STORE_COL_NAME,
+                                        GTK_SORT_ASCENDING);
+
   return GTK_TREE_MODEL (store);
 }