File lxpanel-0.5.5-fix-#sf2954636.patch of Package lxpanel

Overview Repositories Revisions Requests Users Attributes Meta

File lxpanel-0.5.5-fix-#sf2954636.patch of Package lxpanel (Revision ed11b997b2ad357b73bb4ca0aa5bb63e)

Currently displaying revision ed11b997b2ad357b73bb4ca0aa5bb63e , Show latest

diff --git a/src/misc.c b/src/misc.c
index 378c2cd..39f2c85 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -1558,12 +1558,14 @@ gboolean lxpanel_launch_app(const char* exec, GList* files, gboolean in_terminal
     cmd = translate_app_exec_to_command_line(exec, files);
     if( in_terminal )
     {
+	char * escaped_cmd = g_shell_quote(cmd);
         char* term_cmd;
         const char* term = lxpanel_get_terminal();
         if( strstr(term, "%s") )
-            term_cmd = g_strdup_printf(term, cmd);
+            term_cmd = g_strdup_printf(term, escaped_cmd);
         else
-            term_cmd = g_strconcat( term, " -e ", cmd, NULL );
+            term_cmd = g_strconcat( term, " -e ", escaped_cmd, NULL );
+	g_free(escaped_cmd);
         if( cmd != exec )
             g_free(cmd);
         cmd = term_cmd;
diff --git a/src/plugins/launchbar.c b/src/plugins/launchbar.c
index 7469694..feabe59 100644
--- a/src/plugins/launchbar.c
+++ b/src/plugins/launchbar.c
@@ -355,6 +355,10 @@ static int launchbutton_constructor(Plugin * p, char ** fp)
                     btn->customize_action = TRUE;
                     btn->action = g_strdup(s.t[1]);
                 }
+                else if (g_ascii_strcasecmp(s.t[0], "terminal") == 0)
+                {
+                    btn->use_terminal = str2num(bool_pair, s.t[1], 0);
+                }
                 else
                     ERR( "launchbar: unknown var %s\n", s.t[0]);
             }
@@ -846,6 +850,8 @@ static void launchbar_save_configuration(Plugin * p, FILE * fp)
             lxpanel_put_str(fp, "tooltip", btn->tooltip);
         if (btn->customize_action)
             lxpanel_put_str(fp, "action", btn->action);
+        if (btn->use_terminal)
+            lxpanel_put_bool(fp, "terminal", TRUE);
         lxpanel_put_line(fp, "}");
     }
 }

Places

File lxpanel-0.5.5-fix-#sf2954636.patch of Package lxpanel (Revision ed11b997b2ad357b73bb4ca0aa5bb63e)

Places