Hello community, here is the log from the commit of package lxpanel for openSUSE:Factory checked in at Fri Mar 5 11:57:36 CET 2010. -------- --- lxpanel/lxpanel.changes 2010-02-17 17:09:45.000000000 +0100 +++ /mounts/work_src_done/STABLE/lxpanel/lxpanel.changes 2010-03-02 22:43:13.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 2 21:44:16 UTC 2010 - andrea@opensuse.org + +- Fix failure to honor Terminal=true in menu + and launchbar #sf2954636 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- lxpanel-0.5.5-fix-#sf2954636.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxpanel.spec ++++++ --- /var/tmp/diff_new_pack.hQrK8N/_old 2010-03-05 11:57:00.000000000 +0100 +++ /var/tmp/diff_new_pack.hQrK8N/_new 2010-03-05 11:57:00.000000000 +0100 @@ -20,12 +20,13 @@ Name: lxpanel Version: 0.5.5 -Release: 1 +Release: 2 Summary: Lightweight X11 desktop panel based on fbpanel Group: System/GUI/Other License: GPL Url: http://www.lxde.org/ Source0: %name-%version.tar.bz2 +Patch0: %name-0.5.5-fix-#sf2954636.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: alsa-devel intltool pkg-config update-desktop-files BuildRequires: docbook-utils gtk2-devel menu-cache-devel python-xml @@ -62,6 +63,7 @@ %lang_package %prep %setup -q +%patch0 -p1 %build export CFLAGS="$RPM_OPT_FLAGS" ++++++ lxpanel-0.5.5-fix-#sf2954636.patch ++++++ 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, "}"); } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org