1*220dafdbSAndrew GeisslerUpstream-Status: Pending
2*220dafdbSAndrew Geissler
372956edaSAndrew GeisslerIndex: openbox-xdgmenu-0.3/openbox-xdgmenu.c
472956edaSAndrew Geissler===================================================================
572956edaSAndrew Geissler--- openbox-xdgmenu-0.3.orig/openbox-xdgmenu.c
672956edaSAndrew Geissler+++ openbox-xdgmenu-0.3/openbox-xdgmenu.c
772956edaSAndrew Geissler@@ -197,7 +197,7 @@ void process_entry(GMenuTreeEntry *entry
872956edaSAndrew Geissler {
972956edaSAndrew Geissler     GDesktopAppInfo *appinfo = gmenu_tree_entry_get_app_info (entry);
1072956edaSAndrew Geissler     char *name = g_strdup (g_app_info_get_name(G_APP_INFO(appinfo)));
1172956edaSAndrew Geissler-    char *exec = g_strdup (g_app_info_get_executable(G_APP_INFO(appinfo)));
1272956edaSAndrew Geissler+    char *exec = g_strdup (g_app_info_get_commandline(G_APP_INFO(appinfo)));
1372956edaSAndrew Geissler     int i;
1472956edaSAndrew Geissler
1572956edaSAndrew Geissler     for (i = 0; i < strlen(exec) - 1; i++) {
1672956edaSAndrew Geissler@@ -217,8 +217,11 @@ void process_entry(GMenuTreeEntry *entry
1772956edaSAndrew Geissler         }
1872956edaSAndrew Geissler     }
1972956edaSAndrew Geissler
2072956edaSAndrew Geissler-    g_printf("<item label=\"%s\">\n", g_strjoinv("&amp;", g_strsplit(name,"&",0))),
2172956edaSAndrew Geissler-    g_printf("<action name=\"Execute\"><command>%s</command></action>\n", exec),
2272956edaSAndrew Geissler+    g_printf("<item label=\"%s\">\n", g_strjoinv("&amp;", g_strsplit(name,"&",0)));
2372956edaSAndrew Geissler+    g_printf("<action name=\"Execute\"><command>%s%s</command></action>\n",
2472956edaSAndrew Geissler+            g_desktop_app_info_get_boolean(appinfo, G_KEY_FILE_DESKTOP_KEY_TERMINAL) ?
2572956edaSAndrew Geissler+            "x-terminal-emulator -e " : "",
2672956edaSAndrew Geissler+            exec);
2772956edaSAndrew Geissler     g_printf("</item>\n");
2872956edaSAndrew Geissler
2972956edaSAndrew Geissler     g_free(name);
30