merge upstream changes

3 files changed, 14 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 07f4aad98ada..118c970b119a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed May 31 17:49:29 UTC 2017
+# Fri Jun 23 17:15:47 UTC 2017
 pkgbase = wingpanel-standalone-git
 	pkgdesc = Stylish top panel that holds indicators and spawns an application launcher (without Gala dependencies)
-	pkgver = r288.0b6d486
-	pkgrel = 2
+	pkgver = r291.74e81f3
+	pkgrel = 1
 	url = https://github.com/elementary/wingpanel
 	arch = i686
 	arch = x86_64
@@ -53,7 +53,7 @@ pkgbase = wingpanel-standalone-git
 	sha256sums = 1f50f34a7d36fc8331c1080c42c38f8208e35f4551eed97705919d304d410c95
 	sha256sums = 910130e7033db8874ed8d5e1734c6eb0ce75eed7ddf2620400c2a129cf05755d
 	sha256sums = df03ebb7fe08da77d51e6b96ab033b5c712530727d9fa2dd61420d2c7923fced
-	sha256sums = c39417c9ce3a40c1a90c62d28bd2bc59c94bc9b87a45b365dcca6b0e3074050c
+	sha256sums = f187b0a8b4022b1d5c2222ac41717ea78b1138e20f27e261345e5dabd20e306c
 
 pkgname = wingpanel-standalone-git
 
diff --git a/PKGBUILD b/PKGBUILD
index a17abc26ac41..8c6328157b4b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Maxime Gauduin <alucryd@archlinux.org>
 
 pkgname=wingpanel-standalone-git
-pkgver=r288.0b6d486
-pkgrel=2
+pkgver=r291.74e81f3
+pkgrel=1
 pkgdesc='Stylish top panel that holds indicators and spawns an application launcher (without Gala dependencies)'
 arch=('i686' 'x86_64')
 url='https://github.com/elementary/wingpanel'
@@ -33,7 +33,7 @@ sha256sums=('SKIP'
             '1f50f34a7d36fc8331c1080c42c38f8208e35f4551eed97705919d304d410c95'
             '910130e7033db8874ed8d5e1734c6eb0ce75eed7ddf2620400c2a129cf05755d'
             'df03ebb7fe08da77d51e6b96ab033b5c712530727d9fa2dd61420d2c7923fced'
-            'c39417c9ce3a40c1a90c62d28bd2bc59c94bc9b87a45b365dcca6b0e3074050c')
+            'f187b0a8b4022b1d5c2222ac41717ea78b1138e20f27e261345e5dabd20e306c')
 
 pkgver() {
   cd wingpanel
diff --git a/autohide-evbox.patch b/autohide-evbox.patch
index 3106ae3aaaff..3df7d53c131b 100644
--- a/autohide-evbox.patch
+++ b/autohide-evbox.patch
@@ -11,15 +11,19 @@
      private int monitor_number;
  
      private int monitor_width;
-@@ -62,20 +66,41 @@
+@@ -61,6 +61,9 @@
+         update_visual ();
  
          popover_manager = new Services.PopoverManager (this);
- 
++ 
 +        box = new Gtk.EventBox();
 +        box.add_events (Gdk.EventMask.ENTER_NOTIFY_MASK | Gdk.EventMask.LEAVE_NOTIFY_MASK);
-+
+ 
          panel = new Widgets.Panel (popover_manager);
          panel.realize.connect (on_realize);
+@@ -77,17 +80,35 @@
+         app.add_action (cycle_back_action);
+         app.add_accelerator ("<Control><Shift>Tab", "app.cycle-back", null);
  
 -        this.add (panel);
 +        box.add(panel);