[Xfce4-commits] r29945 - in xfce4-panel/branches/xfce_4_6: . plugins/launcher plugins/tasklist

[Nick Schermer]

Author: nick
Date: 2009-05-11 20:30:15 +0000 (Mon, 11 May 2009)
New Revision: 29945

Modified:
   xfce4-panel/branches/xfce_4_6/NEWS
   xfce4-panel/branches/xfce_4_6/plugins/launcher/launcher-exec.c
   xfce4-panel/branches/xfce_4_6/plugins/tasklist/tasklist.c
Log:
Merge changes from trunk back in the 4.6 branch.


Modified: xfce4-panel/branches/xfce_4_6/NEWS
===================================================================
--- xfce4-panel/branches/xfce_4_6/NEWS	2009-05-11 19:49:51 UTC (rev 29944)
+++ xfce4-panel/branches/xfce_4_6/NEWS	2009-05-11 20:30:15 UTC (rev 29945)
@@ -1,3 +1,10 @@
+4.6.2
+=====
+- Properly set orientation of tasklist handler (bug #5222).
+- Fix launcher with 'Run in Terminal' (part of bug #5301).
+- Fix typo preventing build on older gtk versions.
+
+
 4.6.1
 =====
 - Migrate launcher category icons from 4.4 panels (bug #5067).

Modified: xfce4-panel/branches/xfce_4_6/plugins/launcher/launcher-exec.c
===================================================================
--- xfce4-panel/branches/xfce_4_6/plugins/launcher/launcher-exec.c	2009-05-11 19:49:51 UTC (rev 29944)
+++ xfce4-panel/branches/xfce_4_6/plugins/launcher/launcher-exec.c	2009-05-11 20:30:15 UTC (rev 29945)
@@ -264,6 +264,9 @@
     GSList       *li;
     gchar       **argv = NULL;
 
+    if (entry->terminal)
+        g_string_append (command_line, "exo-open --launch TerminalEmulator ");
+
     /* build the full command */
     for (p = entry->exec; *p != '\0'; ++p)
     {
@@ -377,25 +380,9 @@
 
     DBG ("Execute: %s", command_line->str);
 
-    /* create the argv */
+    /* use glib to parge the argv */
     if (G_LIKELY (command_line->str != NULL))
-    {
-        if (entry->terminal == FALSE)
-        {
-            /* use glib to parge the argv */
-            g_shell_parse_argv (command_line->str, NULL, &argv, error);
-        }
-        else
-        {
-            /* we parse our own argv here so exo-open will handle all attributes without problems */
-            argv = g_new (gchar *, 5);
-            argv[0] = g_strdup ("exo-open");
-            argv[1] = g_strdup ("--launch");
-            argv[2] = g_strdup ("TerminalEmulator");
-            argv[3] = g_strdup (command_line->str);
-            argv[4] = NULL;
-        }
-    }
+        g_shell_parse_argv (command_line->str, NULL, &argv, error);
 
     /* cleanup */
     g_string_free (command_line, TRUE);
@@ -404,6 +391,7 @@
 }
 
 
+
 static gboolean
 launcher_exec_on_screen (GdkScreen     *screen,
                          LauncherEntry *entry,

Modified: xfce4-panel/branches/xfce_4_6/plugins/tasklist/tasklist.c
===================================================================
--- xfce4-panel/branches/xfce_4_6/plugins/tasklist/tasklist.c	2009-05-11 19:49:51 UTC (rev 29944)
+++ xfce4-panel/branches/xfce_4_6/plugins/tasklist/tasklist.c	2009-05-11 20:30:15 UTC (rev 29945)
@@ -105,7 +105,10 @@
         gtk_paint_handle (widget->style, widget->window,
                           GTK_WIDGET_STATE (widget), GTK_SHADOW_NONE,
                           &(event->area), widget, "handlebox",
-                          x, y, w, h, orientation);
+                          x, y, w, h,
+                          orientation == GTK_ORIENTATION_HORIZONTAL ?
+                              GTK_ORIENTATION_VERTICAL :
+                              GTK_ORIENTATION_HORIZONTAL);
 
         return TRUE;
     }