Upstream patch for bugs 170336 and 171667. Thanks to Leonardo Valeri Manera for reporting.

Package-Manager: portage-2.1.2.2

6 files changed, 262 insertions, 61 deletions

diff --git a/xfce-base/xfce4-panel/ChangeLog b/xfce-base/xfce4-panel/ChangeLog
index 07bb6ade6822..f776a6a3e8f0 100644
--- a/xfce-base/xfce4-panel/ChangeLog
+++ b/xfce-base/xfce4-panel/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for xfce-base/xfce4-panel
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.93 2007/03/15 13:25:24 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.94 2007/03/27 16:58:35 drac Exp $
+
+*xfce4-panel-4.4.0-r2 (27 Mar 2007)
+
+  27 Mar 2007; Samuli Suominen <drac@gentoo.org>
+  -files/xfce4-panel-4.4.0-actions.patch,
+  +files/xfce4-panel-4.4.0-actions-and-orientation.patch,
+  -xfce4-panel-4.4.0-r1.ebuild, +xfce4-panel-4.4.0-r2.ebuild:
+  Upstream patch for bugs 170336 and 171667. Thanks to Leonardo Valeri Manera
+  for reporting.
 
   15 Mar 2007; Markus Rothe <corsair@gentoo.org> xfce4-panel-4.4.0.ebuild:
   Stable on ppc64; bug #169987
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index d0501b05b883..d6647fbf34ab 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,28 +1,25 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX xfce4-panel-4.4.0-actions.patch 1514 RMD160 733e198d798d44c204cedb33c080cb97418141a1 SHA1 6cd041fb0ba83101c5c8aaa4af2f41c07460315f SHA256 d62335fc5bd3d7c10dcb8ac7499c46328bb09a04254a5a83b18ac156d24d7c06
-MD5 408e046696d7a3223794993d9c2ba625 files/xfce4-panel-4.4.0-actions.patch 1514
-RMD160 733e198d798d44c204cedb33c080cb97418141a1 files/xfce4-panel-4.4.0-actions.patch 1514
-SHA256 d62335fc5bd3d7c10dcb8ac7499c46328bb09a04254a5a83b18ac156d24d7c06 files/xfce4-panel-4.4.0-actions.patch 1514
+AUX xfce4-panel-4.4.0-actions-and-orientation.patch 8163 RMD160 90a00caf7a59111b9a4d0b6d00074a5cbc7b2621 SHA1 5f094dc2d0eb99c7b8a18f9b6765c6e0d5392376 SHA256 8b153468591002ccaaaaabf99a69b7a1e23edb849cee0c9ad8042dd72496314f
+MD5 bb2719831620a5b73f3126184948b0a6 files/xfce4-panel-4.4.0-actions-and-orientation.patch 8163
+RMD160 90a00caf7a59111b9a4d0b6d00074a5cbc7b2621 files/xfce4-panel-4.4.0-actions-and-orientation.patch 8163
+SHA256 8b153468591002ccaaaaabf99a69b7a1e23edb849cee0c9ad8042dd72496314f files/xfce4-panel-4.4.0-actions-and-orientation.patch 8163
 DIST xfce4-panel-4.2.3.tar.gz 1395852 RMD160 05a7c450d4ef964ac0e39107a8f891ab307649b2 SHA1 d42a9e3c66b49c8fd4dcb15cd0b8776a60dd43c3 SHA256 cac07e51513ea3f1cf298b2be7dd9500bb81aae3806aaff64de8c15e19003262
 DIST xfce4-panel-4.4.0.tar.bz2 818534 RMD160 513f7edf39e0eb12ac029f923be895762fde973c SHA1 eb586f6bb62bfc0b7ed980a2f137474607f4c291 SHA256 28ab25d6933f40ac19a4b6c2b41374360193b8300ad14853fb4ca78d5c152926
 EBUILD xfce4-panel-4.2.3.ebuild 589 RMD160 c41365982da57974fda7fe248cfdd906c397dbc3 SHA1 a99a7cccb2d036de4829ef3970071cd65cafd52c SHA256 3c1ca33296d41ffce3b58763c60ed6aebe9678b47c1b490e741ffbb0aa06013b
 MD5 b3a9bc9a1c3e2c70668d34d58386b6aa xfce4-panel-4.2.3.ebuild 589
 RMD160 c41365982da57974fda7fe248cfdd906c397dbc3 xfce4-panel-4.2.3.ebuild 589
 SHA256 3c1ca33296d41ffce3b58763c60ed6aebe9678b47c1b490e741ffbb0aa06013b xfce4-panel-4.2.3.ebuild 589
-EBUILD xfce4-panel-4.4.0-r1.ebuild 1006 RMD160 3ffde78538d0db716fe2da379f61ce60cdc068bd SHA1 e422d3b6dd9968a48749e69f3178e22d4c32e5fe SHA256 f4f795f9c3589fb7650dadd264d6081c73dfc129335af690925c05750f204fe1
-MD5 7c8828c91332a646caf329fa972ab6e8 xfce4-panel-4.4.0-r1.ebuild 1006
-RMD160 3ffde78538d0db716fe2da379f61ce60cdc068bd xfce4-panel-4.4.0-r1.ebuild 1006
-SHA256 f4f795f9c3589fb7650dadd264d6081c73dfc129335af690925c05750f204fe1 xfce4-panel-4.4.0-r1.ebuild 1006
+EBUILD xfce4-panel-4.4.0-r2.ebuild 1022 RMD160 f45305ea9159ea107dd6216be08b0b366727e473 SHA1 fe806c188844f83c22475adecb38b2b971eb27d5 SHA256 f0dfb09333d7dd79438babaaeb3fccb25cdf2afae3c8746e89ec92d8d0486b81
+MD5 56c83ecef7b515e01bdca99face077a9 xfce4-panel-4.4.0-r2.ebuild 1022
+RMD160 f45305ea9159ea107dd6216be08b0b366727e473 xfce4-panel-4.4.0-r2.ebuild 1022
+SHA256 f0dfb09333d7dd79438babaaeb3fccb25cdf2afae3c8746e89ec92d8d0486b81 xfce4-panel-4.4.0-r2.ebuild 1022
 EBUILD xfce4-panel-4.4.0.ebuild 907 RMD160 d65da948bd50506734d1ddbf8c751ab2c1c120c1 SHA1 462ad8b1ec4ac2aaa97b472c9f6ba1a6173c45d8 SHA256 2356c162af3e7c324ec32a6078a030950ed8e26bd8f48bd6390ab41b8b7cb461
 MD5 5792cfa6a55ecbe3f24c932b335c1edc xfce4-panel-4.4.0.ebuild 907
 RMD160 d65da948bd50506734d1ddbf8c751ab2c1c120c1 xfce4-panel-4.4.0.ebuild 907
 SHA256 2356c162af3e7c324ec32a6078a030950ed8e26bd8f48bd6390ab41b8b7cb461 xfce4-panel-4.4.0.ebuild 907
-MISC ChangeLog 11670 RMD160 8167d9d65ec2877d477cec9b5fc04964d11d823a SHA1 694b14837d8553b3eefda52d46a9921b3ff0e379 SHA256 c6801eee32235d45be828b7b584c1bd6fc0298680bdb2a060b08942ec62f09f1
-MD5 83bc88dd38ac8bdaf24f72243584ea72 ChangeLog 11670
-RMD160 8167d9d65ec2877d477cec9b5fc04964d11d823a ChangeLog 11670
-SHA256 c6801eee32235d45be828b7b584c1bd6fc0298680bdb2a060b08942ec62f09f1 ChangeLog 11670
+MISC ChangeLog 12011 RMD160 6a833e3c75a95f3a566b54f9171343194d1fc7f8 SHA1 fee6d23733202c57fcccf3241113ef67f87148b8 SHA256 648149dcec2b46ed76aacea6eddb66ef8dae67c09c8a7bf44af7ca687ced51e8
+MD5 dee90c116e7d379724598d3190de77c5 ChangeLog 12011
+RMD160 6a833e3c75a95f3a566b54f9171343194d1fc7f8 ChangeLog 12011
+SHA256 648149dcec2b46ed76aacea6eddb66ef8dae67c09c8a7bf44af7ca687ced51e8 ChangeLog 12011
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
@@ -33,13 +30,6 @@ SHA256 04139926a0ab7180337cfaa7b59b9905836a4bd427f6d17b6201ad26dfa599fc files/di
 MD5 b21e170922c761238f8deac129bca418 files/digest-xfce4-panel-4.4.0 256
 RMD160 96d8449f01e9db8a64ae6bca668beffe3fb31d6c files/digest-xfce4-panel-4.4.0 256
 SHA256 bc998f436cea91facd5fba11a4b21de2d257c9d1684e945b3a004aafe33e042a files/digest-xfce4-panel-4.4.0 256
-MD5 b21e170922c761238f8deac129bca418 files/digest-xfce4-panel-4.4.0-r1 256
-RMD160 96d8449f01e9db8a64ae6bca668beffe3fb31d6c files/digest-xfce4-panel-4.4.0-r1 256
-SHA256 bc998f436cea91facd5fba11a4b21de2d257c9d1684e945b3a004aafe33e042a files/digest-xfce4-panel-4.4.0-r1 256
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFF/F488bi6rjpTunYRAlfOAKCqa5MgOA4ObvV5wvj1a12C4Bl22gCgi5xz
-6wfSA78YlyZF2HZlvsD0cio=
-=SmNq
------END PGP SIGNATURE-----
+MD5 b21e170922c761238f8deac129bca418 files/digest-xfce4-panel-4.4.0-r2 256
+RMD160 96d8449f01e9db8a64ae6bca668beffe3fb31d6c files/digest-xfce4-panel-4.4.0-r2 256
+SHA256 bc998f436cea91facd5fba11a4b21de2d257c9d1684e945b3a004aafe33e042a files/digest-xfce4-panel-4.4.0-r2 256
diff --git a/xfce-base/xfce4-panel/files/digest-xfce4-panel-4.4.0-r1 b/xfce-base/xfce4-panel/files/digest-xfce4-panel-4.4.0-r2
index b6a88e44d63f..b6a88e44d63f 100644
--- a/xfce-base/xfce4-panel/files/digest-xfce4-panel-4.4.0-r1
+++ b/xfce-base/xfce4-panel/files/digest-xfce4-panel-4.4.0-r2
diff --git a/xfce-base/xfce4-panel/files/xfce4-panel-4.4.0-actions-and-orientation.patch b/xfce-base/xfce4-panel/files/xfce4-panel-4.4.0-actions-and-orientation.patch
new file mode 100644
index 000000000000..66b08c8c1bce
--- /dev/null
+++ b/xfce-base/xfce4-panel/files/xfce4-panel-4.4.0-actions-and-orientation.patch
@@ -0,0 +1,235 @@
+diff -ur xfce4-panel-4.4.0.orig/panel/panel-properties.c xfce4-panel-4.4.0/panel/panel-properties.c
+--- xfce4-panel-4.4.0.orig/panel/panel-properties.c	2007-01-20 18:33:00.000000000 +0200
++++ xfce4-panel-4.4.0/panel/panel-properties.c	2007-03-27 19:36:28.000000000 +0300
+@@ -928,7 +928,7 @@
+     x = xmon->geometry.x;
+     y = xmon->geometry.y;
+ 
+-    if (priv->xoffset > 0 && priv->yoffset > 0)
++    if (priv->xoffset > -1 && priv->yoffset > -1)
+     {
+         x += priv->xoffset;
+         y += priv->yoffset;
+Only in xfce4-panel-4.4.0/panel: panel-properties.c.orig
+diff -ur xfce4-panel-4.4.0.orig/plugins/actions/actions.c xfce4-panel-4.4.0/plugins/actions/actions.c
+--- xfce4-panel-4.4.0.orig/plugins/actions/actions.c	2007-01-20 18:32:58.000000000 +0200
++++ xfce4-panel-4.4.0/plugins/actions/actions.c	2007-03-27 19:39:53.000000000 +0300
+@@ -51,9 +51,13 @@
+     GtkWidget *image1;
+     GtkWidget *button2;
+     GtkWidget *image2;
++    
++    GtkWidget *box;
+ 
+     int screen_id;
+     int style_id;
++    
++    GtkOrientation orientation;
+ }
+ Action;
+ 
+@@ -110,40 +114,44 @@
+ static gboolean 
+ actions_set_size (XfcePanelPlugin *plugin, int size, Action *action)
+ {
+-    int width;
++    gint       width;
+     GdkPixbuf *pb = NULL;
+-    int border;
+     
+-    if (xfce_panel_plugin_get_orientation (plugin) ==
+-            GTK_ORIENTATION_HORIZONTAL)
+-    {
+-        border = 2 + 2 * GTK_WIDGET(plugin)->style->ythickness;
+-    }
+-    else
+-    {
+-        border = 2 + 2 * GTK_WIDGET(plugin)->style->xthickness;
+-    }
++    width = size - 2 - 2 * MAX (action->button1->style->xthickness,
++                                action->button1->style->ythickness);
+     
+     switch (action->type)
+     {
+         case ACTION_QUIT_LOCK:
+-            width = size / 2 - 2 * border;
++            if (xfce_panel_plugin_get_orientation (plugin) != action->orientation)
++            {
++                width = (size / 2) - 4 - 4 * MAX (action->button1->style->xthickness,
++                                                  action->button1->style->ythickness);
++                width = MAX (width, 5);
++            }
++            else
++            {
++                gtk_widget_set_size_request (GTK_WIDGET (action->button1), size, size);
++                gtk_widget_set_size_request (GTK_WIDGET (action->button2), size, size);
++            }
++             
++            gtk_widget_set_size_request (GTK_WIDGET (plugin), -1, -1);  
++                
+             pb = actions_load_icon (ACTION_LOCK, width);
+             gtk_image_set_from_pixbuf (GTK_IMAGE (action->image1), pb);
+             g_object_unref (G_OBJECT (pb));
+             
+             pb = actions_load_icon (ACTION_QUIT, width);
+             gtk_image_set_from_pixbuf (GTK_IMAGE (action->image2), pb);
+-            g_object_unref (G_OBJECT (pb));
+-            
++            g_object_unref (G_OBJECT (pb));           
+             break;
++            
+         case ACTION_QUIT:
+         case ACTION_LOCK:
+-            width = MIN(size - border, MAX(16, size/2 - border));
+             pb = actions_load_icon (action->type, width);
+             gtk_image_set_from_pixbuf (GTK_IMAGE (action->image1), pb);
+             g_object_unref (G_OBJECT (pb));
+-            
++            gtk_widget_set_size_request (GTK_WIDGET (plugin), size, size);
+             break;
+     }
+             
+@@ -155,6 +163,7 @@
+ {
+     char *file;
+     XfceRc *rc;
++    GtkOrientation orientation = GTK_ORIENTATION_VERTICAL;
+     int type = ACTION_QUIT;
+     
+     if ((file = xfce_panel_plugin_lookup_rc_file (plugin)) != NULL)
+@@ -165,12 +174,14 @@
+         if (rc != NULL)
+         {
+             type = xfce_rc_read_int_entry (rc, "type", ACTION_QUIT);
++            orientation = (xfce_rc_read_int_entry (rc, "orientation", 1) == 0 ? GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL);
+             
+             xfce_rc_close (rc);
+         }
+     }
+ 
+     action->type = type;
++    action->orientation = orientation;
+ }
+ 
+ static void
+@@ -189,6 +200,7 @@
+         return;
+     
+     xfce_rc_write_int_entry (rc, "type", action->type);
++    xfce_rc_write_int_entry (rc, "orientation", action->orientation == GTK_ORIENTATION_HORIZONTAL ? 0 : 1);
+ 
+     xfce_rc_close (rc);
+ }
+@@ -233,19 +245,13 @@
+ actions_create_widgets (XfcePanelPlugin *plugin, Action *action)
+ {
+     GtkWidget *widget, *box, *button, *img;
+-    GtkOrientation orientation;
+     
+     widget = GTK_WIDGET (plugin);
+ 
+     switch (action->type)
+     {
+         case ACTION_QUIT_LOCK:
+-            orientation = (xfce_panel_plugin_get_orientation (plugin) == 
+-                           GTK_ORIENTATION_HORIZONTAL) ?
+-                                GTK_ORIENTATION_VERTICAL : 
+-                                GTK_ORIENTATION_HORIZONTAL;
+-
+-            box = xfce_hvbox_new (orientation, TRUE, 0);
++            box = xfce_hvbox_new (action->orientation, TRUE, 0);
+             gtk_widget_show (box);
+             gtk_container_add (GTK_CONTAINER (plugin), box);
+ 
+@@ -368,6 +374,9 @@
+ action_type_changed (GtkComboBox *box, Action *action)
+ {
+     action->type = gtk_combo_box_get_active (box);
++    
++    /* orientation only sensitive when 2 buttons are shown */
++    gtk_widget_set_sensitive (action->box, action->type == 2 ? TRUE : FALSE);
+ 
+     gtk_widget_destroy (GTK_BIN (action->plugin)->child);
+     actions_create_widgets (action->plugin, action);
+@@ -377,6 +386,19 @@
+ }
+ 
+ static void
++orientation_changed (GtkComboBox *box, Action *action)
++{
++    action->orientation = (gtk_combo_box_get_active (box) == 0 ? 
++                             GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL);
++                             
++    gtk_widget_destroy (GTK_BIN (action->plugin)->child);
++    actions_create_widgets (action->plugin, action);
++
++    actions_set_size (action->plugin, 
++                      xfce_panel_plugin_get_size (action->plugin), action);
++}
++
++static void
+ actions_dialog_response (GtkWidget *dlg, int reponse, Action *action)
+ {
+     g_object_set_data (G_OBJECT (action->plugin), "dialog", NULL);
+@@ -389,7 +411,8 @@
+ static void
+ actions_properties_dialog (XfcePanelPlugin *plugin, Action *action)
+ {
+-    GtkWidget *dlg, *vbox, *hbox, *label, *box;
++    GtkWidget *dlg, *vbox, *hbox, *label, *box, *box2;
++    GtkSizeGroup *sg;
+ 
+     xfce_panel_plugin_block_menu (plugin);
+     
+@@ -411,6 +434,8 @@
+ 
+     gtk_container_set_border_width (GTK_CONTAINER (dlg), 2);
+     
++    sg = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
++    
+     vbox = gtk_vbox_new (FALSE, 8);
+     gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
+     gtk_widget_show (vbox);
+@@ -423,6 +448,7 @@
+ 
+     label = gtk_label_new (_("Select action type:"));
+     gtk_widget_show (label);
++    gtk_size_group_add_widget (sg, label);
+     gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+ 
+     box = gtk_combo_box_new_text ();
+@@ -437,6 +463,34 @@
+     
+     g_signal_connect (box, "changed", G_CALLBACK (action_type_changed), 
+                       action);
++                      
++    hbox = gtk_hbox_new (FALSE, 8);
++    gtk_widget_show (hbox);
++    gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
++    
++    label = gtk_label_new (_("Orientation:"));
++    gtk_widget_show (label);
++    gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
++    gtk_size_group_add_widget (sg, label);
++    gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
++    
++    box2 = action->box = gtk_combo_box_new_text ();
++    gtk_widget_show (box2);
++    gtk_box_pack_start (GTK_BOX (hbox), box2, TRUE, TRUE, 0);
++    
++    /* only sensitive when 2 buttons are shown */
++    gtk_widget_set_sensitive (action->box, action->type == 2 ? TRUE : FALSE);
++    
++    gtk_combo_box_append_text (GTK_COMBO_BOX (box2), _("Horizontal"));
++    gtk_combo_box_append_text (GTK_COMBO_BOX (box2), _("Vertical"));
++    
++    gtk_combo_box_set_active (GTK_COMBO_BOX (box2), 
++        action->orientation == GTK_ORIENTATION_HORIZONTAL ? 0 : 1);
++    
++    g_signal_connect (box2, "changed", G_CALLBACK (orientation_changed), 
++                      action);
++    
++    g_object_unref (G_OBJECT (sg));
+     
+     gtk_widget_show (dlg);
+ }
diff --git a/xfce-base/xfce4-panel/files/xfce4-panel-4.4.0-actions.patch b/xfce-base/xfce4-panel/files/xfce4-panel-4.4.0-actions.patch
deleted file mode 100644
index ee83c4da6bc6..000000000000
--- a/xfce-base/xfce4-panel/files/xfce4-panel-4.4.0-actions.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur xfce4-panel-4.4.0.orig/plugins/actions/actions.c xfce4-panel-4.4.0/plugins/actions/actions.c
---- xfce4-panel-4.4.0.orig/plugins/actions/actions.c	2007-01-20 18:32:58.000000000 +0200
-+++ xfce4-panel-4.4.0/plugins/actions/actions.c	2007-03-11 01:28:23.000000000 +0200
-@@ -81,7 +81,7 @@
-     {
-         xfce_hvbox_set_orientation (XFCE_HVBOX (GTK_BIN (plugin)->child), 
-                 (orientation == GTK_ORIENTATION_HORIZONTAL) ?
--                        GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL);
-+                        GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL);
-     }
- }
- 
-@@ -127,7 +127,7 @@
-     switch (action->type)
-     {
-         case ACTION_QUIT_LOCK:
--            width = size / 2 - 2 * border;
-+            width = MIN(size - border, MAX(16, size/2 - border));
-             pb = actions_load_icon (ACTION_LOCK, width);
-             gtk_image_set_from_pixbuf (GTK_IMAGE (action->image1), pb);
-             g_object_unref (G_OBJECT (pb));
-@@ -241,9 +241,8 @@
-     {
-         case ACTION_QUIT_LOCK:
-             orientation = (xfce_panel_plugin_get_orientation (plugin) == 
--                           GTK_ORIENTATION_HORIZONTAL) ?
--                                GTK_ORIENTATION_VERTICAL : 
--                                GTK_ORIENTATION_HORIZONTAL;
-+                           GTK_ORIENTATION_VERTICAL) ?
-+			   GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL;
- 
-             box = xfce_hvbox_new (orientation, TRUE, 0);
-             gtk_widget_show (box);
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.4.0-r1.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.4.0-r2.ebuild
index 8543a2ced94f..5c27a3594937 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.4.0-r1.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.4.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/xfce4-panel-4.4.0-r1.ebuild,v 1.1 2007/03/10 23:50:25 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/xfce4-panel-4.4.0-r2.ebuild,v 1.1 2007/03/27 16:58:35 drac Exp $
 
 inherit eutils xfce44
 
@@ -32,5 +32,5 @@ xfce44_core_package
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-actions.patch
+	epatch "${FILESDIR}"/${P}-actions-and-orientation.patch
 }