Package: quodlibet-plugins
Version: 20070625-1
Followup-For: Bug #436048

tags 436048 + patch

Patch actually attached this time...

- Josh Triplett

-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.22-rc1 (PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages quodlibet-plugins depends on:
ii  exfalso                       1.0-1      audio tag editor for GTK+

quodlibet-plugins recommends no packages.

-- no debconf information
--- /usr/share/quodlibet/plugins/events/trayicon.py	2007-06-25 15:00:20.000000000 -0700
+++ /tmp/trayicon.py	2007-08-04 16:28:01.000000000 -0700
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2004-2006 Joe Wreschnig, Michael Urman, Iñigo Serna
+# Copyright 2004-2007 Joe Wreschnig, Michael Urman, Iñigo Serna, Josh Triplett
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as
@@ -267,8 +267,9 @@
         playpause = gtk.ImageMenuItem(gtk.STOCK_MEDIA_PLAY)
         playpause.connect('activate', self.__play_pause, player)
         safter = StopAfterMenu(player)
-        playpause.connect(
-            'button-press-event', self.__play_button_press, safter)
+        safter_children = safter.get_children()
+        for child in safter_children:
+            safter.remove(child)
 
         previous = gtk.ImageMenuItem(gtk.STOCK_MEDIA_PREVIOUS)
         previous.connect('activate', lambda *args: player.previous())
@@ -327,7 +328,7 @@
         quit.connect('activate', gtk.main_quit)
 
         menu = gtk.Menu()
-        for item in [playpause,
+        for item in [playpause] + safter_children + [
                      gtk.SeparatorMenuItem(), previous, next, orders,
                      gtk.SeparatorMenuItem(), browse,
                      gtk.SeparatorMenuItem(), props, info, ratings,
@@ -339,11 +340,6 @@
         safter.connect_object('selection-done', gtk.Menu.popdown, menu)
         return menu
 
-    def __play_button_press(self, activator, event, safter):
-        if event.button == 3:
-            safter.popup(None, None, None, event.button, event.time)
-            return True
-
     def __popup(self, event, window):
         order = window.order.get_active()
         self.__menu.orders[order].set_active(True)

Reply via email to