[arch-commits] Commit in lxpanel/trunk (2 files)

[Evangelos Foutras]

    Date: Friday, October 3, 2014 @ 22:50:03
  Author: foutrelis
Revision: 120112

upgpkg: lxpanel 0.7.1-3

Fix FS#42226: Move to workspace does not work anymore

Added:
  lxpanel/trunk/lxpanel-0.7.1-SF-680-Fix-left-click-on-Move-to-Workspace-menu.patch
Modified:
  lxpanel/trunk/PKGBUILD

---------------------------------------------------------------------+
 PKGBUILD                                                            |   12 +++-
 lxpanel-0.7.1-SF-680-Fix-left-click-on-Move-to-Workspace-menu.patch |   30 ++++++++++
 2 files changed, 39 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-03 20:09:06 UTC (rev 120111)
+++ PKGBUILD	2014-10-03 20:50:03 UTC (rev 120112)
@@ -5,7 +5,7 @@
 
 pkgname=lxpanel
 pkgver=0.7.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Lightweight X11 desktop panel for LXDE'
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -15,9 +15,11 @@
 makedepends=('intltool' 'docbook-xml' 'docbook-xsl' 'wireless_tools')
 optdepends=('wireless_tools: netstat plugin')
 source=(http://downloads.sourceforge.net/sourceforge/lxde/lxpanel-$pkgver.tar.xz
-        lxpanel-0.7.1-SF-679-X11-library-uses-unsigned-long-as-cardinal-32.patch)
+        lxpanel-0.7.1-SF-679-X11-library-uses-unsigned-long-as-cardinal-32.patch
+		lxpanel-0.7.1-SF-680-Fix-left-click-on-Move-to-Workspace-menu.patch)
 sha256sums=('45a9a511287ceb6177d0688f828b0974ebeae8655e05e2a52dddbe0bae30b026'
-            '01a46dc9dd949ef93f27bfd59514e5a88068f618cc0399176a99ecef4aab6aaf')
+            '01a46dc9dd949ef93f27bfd59514e5a88068f618cc0399176a99ecef4aab6aaf'
+            '2428aaed87e6d4d3930524b6fb1422e7fbdfb86e5ea4e78dd0dba9b18959f11e')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -25,6 +27,10 @@
   # http://sourceforge.net/p/lxde/bugs/679/
   # https://bugs.archlinux.org/task/42178
   patch -Np1 -i ../lxpanel-0.7.1-SF-679-X11-library-uses-unsigned-long-as-cardinal-32.patch
+
+  # https://sourceforge.net/p/lxde/bugs/680/
+  # https://bugs.archlinux.org/task/42226
+  patch -Np1 -i ../lxpanel-0.7.1-SF-680-Fix-left-click-on-Move-to-Workspace-menu.patch
 }
 
 build() {

Added: lxpanel-0.7.1-SF-680-Fix-left-click-on-Move-to-Workspace-menu.patch
===================================================================
--- lxpanel-0.7.1-SF-680-Fix-left-click-on-Move-to-Workspace-menu.patch	                        (rev 0)
+++ lxpanel-0.7.1-SF-680-Fix-left-click-on-Move-to-Workspace-menu.patch	2014-10-03 20:50:03 UTC (rev 120112)
@@ -0,0 +1,30 @@
+From f47c27ab5c5ee6086ff3a17e434ce677344a1a2c Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos at foutrelis.com>
+Date: Fri, 3 Oct 2014 23:27:02 +0300
+Subject: [PATCH] [SF#680]Fix left click on "Move to Workspace" menu
+
+Since the menu popup is initiated by a mouse button release, we need to
+specify 0 for the button parameter in the call to gtk_menu_popup().
+
+This fixes left clicking on the "Move to Workspace" sub-menu, which
+previously would do nothing.
+---
+ plugins/launchtaskbar.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/launchtaskbar.c b/plugins/launchtaskbar.c
+index fc8e464..d043933 100644
+--- a/plugins/launchtaskbar.c
++++ b/plugins/launchtaskbar.c
+@@ -2541,7 +2541,7 @@ static gboolean taskbar_task_control_event(GtkWidget * widget, GdkEventButton *
+                 GTK_MENU(tb->menu),
+                 NULL, NULL,
+                 (GtkMenuPositionFunc) taskbar_popup_set_position, (gpointer) visible_task,
+-                event->button, event->time);
++                0, event->time);
+         }
+     }
+ 
+-- 
+2.1.2
+