[Xfce4-commits] r22412 - xfdesktop/trunk/panel-plugin

[Brian Tarricone]

Author: kelnos
Date: 2006-07-11 22:57:09 +0000 (Tue, 11 Jul 2006)
New Revision: 22412

Modified:
   xfdesktop/trunk/panel-plugin/desktop-menu-plugin.c
Log:
if using the default menu file, don't pass the file argument to
xfce4-menueditor, cuz menueditor will just do the right thing (bug 1911)


Modified: xfdesktop/trunk/panel-plugin/desktop-menu-plugin.c
===================================================================
--- xfdesktop/trunk/panel-plugin/desktop-menu-plugin.c  2006-07-11 22:23:36 UTC 
(rev 22411)
+++ xfdesktop/trunk/panel-plugin/desktop-menu-plugin.c  2006-07-11 22:57:09 UTC 
(rev 22412)
@@ -709,20 +709,30 @@
 {
     DMPlugin *dmp = user_data;
     GError *err = NULL;
-    const gchar *menu_file;
+    const gchar *menu_file = NULL;
     gchar cmd[PATH_MAX];
     
     g_return_if_fail(dmp && dmp->desktop_menu);
     
-    menu_file = xfce_desktop_menu_get_menu_file(dmp->desktop_menu);
-    if(!menu_file)
-        return;
     
-    g_snprintf(cmd, PATH_MAX, "%s/xfce4-menueditor \"%s\"", BINDIR, menu_file);
+    if(dmp->use_default_menu)
+        g_snprintf(cmd, PATH_MAX, "%s/xfce4-menueditor", BINDIR);
+    else {
+        menu_file = xfce_desktop_menu_get_menu_file(dmp->desktop_menu);
+        if(!menu_file)
+            return;
+        g_snprintf(cmd, PATH_MAX, "%s/xfce4-menueditor \"%s\"", BINDIR,
+                   menu_file);
+    }
+    
     if(xfce_exec(cmd, FALSE, FALSE, NULL))
         return;
     
-    g_snprintf(cmd, PATH_MAX, "xfce4-menueditor \"%s\"", menu_file);
+    if(dmp->use_default_menu)
+        g_strlcpy(cmd, "xfce4-menueditor", PATH_MAX);
+    else
+        g_snprintf(cmd, PATH_MAX, "xfce4-menueditor \"%s\"", menu_file);
+    
     if(!xfce_exec(cmd, FALSE, FALSE, &err)) {
         xfce_warn(_("Unable to launch xfce4-menueditor: %s"), err->message);
         g_error_free(err);

_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits