[gmixer/f14/master] Add patch to fix #678640

[Christoph Wickert]

commit ac3d5423c3bc033e226f874f82e329fbc2231933
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Mon Mar 28 23:32:23 2011 +0200

    Add patch to fix #678640

 gmixer-1.3-eventbox.patch |   57 +++++++++++++++++++++++++++++++++++++++++++++
 gmixer.spec               |    9 ++++++-
 2 files changed, 65 insertions(+), 1 deletions(-)
---
diff --git a/gmixer-1.3-eventbox.patch b/gmixer-1.3-eventbox.patch
new file mode 100644
index 0000000..89aa591
--- /dev/null
+++ b/gmixer-1.3-eventbox.patch
@@ -0,0 +1,57 @@
+--- gmixer-1.3/src/gmixer.orig	2011-02-17 23:03:38.000000000 +0100
++++ gmixer-1.3/src/gmixer	2011-03-27 04:13:13.537936566 +0200
+@@ -474,27 +474,26 @@
+         self.grab_add()
+         self.show()
+ 
+-    def position_on(self,align_to):
++    def position_on(self, align_to):
++
++        geom = align_to.get_geometry()[1]
+ 
+         width, height = self.get_size()
+         height += 2
+ 
+         screen = self.get_screen()
+-        monitor_num = screen.get_monitor_at_window(align_to.window)
++        monitor_num = screen.get_monitor_at_point(geom.x, geom.y)
+         if monitor_num < 0: monitor_num = 0
+         monitor = screen.get_monitor_geometry (monitor_num)
+ 
+-        x, y = align_to.window.get_origin()
+-
+-        x += align_to.allocation.x
+-        y += align_to.allocation.y
++        x, y = geom.x, geom.y
+ 
+-        if (y + align_to.allocation.height + height) <= monitor.y + monitor.height:
+-                y += align_to.allocation.height
++        if (y + geom.height + height) <= monitor.y + monitor.height:
++                y += geom.height
+         elif (y - height) >= monitor.y:
+                 y -= height
+-        elif monitor.y + monitor.height - (y + align_to.allocation.height) > y:
+-                y += align_to.allocation.height
++        elif monitor.y + monitor.height - (y + geom.height) > y:
++                y += geom.height
+         else:                                                                                                    
+                 y -= height
+ 
+@@ -503,7 +502,7 @@
+         elif x > max(monitor.x, monitor.x + monitor.width - width):
+                 x = max(monitor.x, monitor.x + monitor.width - width)
+         else:
+-                x = (x - width/2 + align_to.allocation.width/2)
++                x = (x - width/2 + geom.width/2)
+         self.move(x,y)
+ 
+ class GMasterProgressPopup(gtk.Window):
+@@ -889,7 +888,7 @@
+                 self._tray_hide()
+             else:
+                 self._popup = GMasterVolumePopup(self._current_mixer,self._get_master_track())
+-                self._popup.position_on(self._eventbox)
++                self._popup.position_on(self._tray)
+ 
+                 pointer = gtk.gdk.pointer_grab(
+                     self._popup.window, True,
diff --git a/gmixer.spec b/gmixer.spec
index 16b96ed..30573e1 100644
--- a/gmixer.spec
+++ b/gmixer.spec
@@ -6,7 +6,7 @@
 
 Name:           gmixer
 Version:        1.3
-Release:        19%{?dist}
+Release:        20%{?dist}
 Summary:        Just a simple audio mixer
 
 Group:          Applications/Multimedia
@@ -26,6 +26,9 @@ Patch5:         trayicon_transparency.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=542255
 # patch thanks to Clemens Buchacher
 Patch6:         gmixer-1.3-tracklist.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=678640
+# thanks to Thomas Moschny
+Patch7:         gmixer-1.3-eventbox.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:  pkgconfig
 BuildRequires:  python-devel, pygtk2-codegen, pygtk2-devel, gtk2-devel
@@ -51,6 +54,7 @@ Features:
 %patch4 -p0 -b .no-title
 %patch5 -p0 -b .trayicon_transparency
 %patch6 -p1 -b .tracklist
+%patch7 -p1 -b .eventbox
 
 
 %build
@@ -107,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Mar 28 2011 Christoph Wickert <cwickert at fedoraproject.org> - 1.3-20
+- Add patch to fix #678640
+
 * Thu Feb 17 2011 Adam Williamson <awilliam at redhat.com> - 1.3-19
 - add tracklist.patch to fix the crasher when hitting a mixer device
   with an empty tracklist (#542255) (thanks Clemens Buchacher)