[Xfce4-commits] r27084 - xfce4-settings/trunk/xfce4-settings-manager

[Brian Tarricone]

Author: kelnos
Date: 2008-06-19 08:17:41 +0000 (Thu, 19 Jun 2008)
New Revision: 27084

Modified:
   xfce4-settings/trunk/xfce4-settings-manager/xfce-settings-manager-dialog.c
Log:
first try the X-XfceSettingsName key in the .desktop file for compactness


Modified: xfce4-settings/trunk/xfce4-settings-manager/xfce-settings-manager-dialog.c
===================================================================
--- xfce4-settings/trunk/xfce4-settings-manager/xfce-settings-manager-dialog.c	2008-06-19 07:31:03 UTC (rev 27083)
+++ xfce4-settings/trunk/xfce4-settings-manager/xfce-settings-manager-dialog.c	2008-06-19 08:17:41 UTC (rev 27084)
@@ -64,9 +64,10 @@
                                                         gpointer user_data);
 
 static const char *categories[] = {
-    "Name", "GenericName", "Icon", "Comment", "Exec", "TryExec", "StartupNotify", "Hidden",
+    "Name", "GenericName", "X-XfceSettingsName", "Icon", "Comment", "Exec",
+    "TryExec", "StartupNotify", "Hidden",
 };
-static const gint n_categories = 8;
+static const gint n_categories = 9;
 
 
 G_DEFINE_TYPE(XfceSettingsManagerDialog, xfce_settings_manager_dialog, XFCE_TYPE_TITLED_DIALOG)
@@ -183,8 +184,9 @@
                 g_free(tryexec);
             }
 
-            if(!xfce_desktop_entry_get_string(dentry, "GenericName", TRUE, &name))
-                xfce_desktop_entry_get_string(dentry, "Name", TRUE, &name);
+            if(!xfce_desktop_entry_get_string(dentry, "X-XfceSettingsName", TRUE, &name))
+                if(!xfce_desktop_entry_get_string(dentry, "GenericName", TRUE, &name))
+                    xfce_desktop_entry_get_string(dentry, "Name", TRUE, &name);
             xfce_desktop_entry_get_string(dentry, "Icon", FALSE, &icon);
             xfce_desktop_entry_get_string(dentry, "Comment", TRUE, &comment);
             xfce_desktop_entry_get_string(dentry, "Exec", FALSE, &exec);