From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jun 16 01:20:01 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DE57D1065670 for ; Tue, 16 Jun 2009 01:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id BAEC78FC1E for ; Tue, 16 Jun 2009 01:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n5G1K13F042023 for ; Tue, 16 Jun 2009 01:20:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n5G1K1xT042016; Tue, 16 Jun 2009 01:20:01 GMT (envelope-from gnats) Resent-Date: Tue, 16 Jun 2009 01:20:01 GMT Resent-Message-Id: <200906160120.n5G1K1xT042016@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Joseph S. Atkinson" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0E5F41065670; Tue, 16 Jun 2009 01:10:29 +0000 (UTC) (envelope-from jsa@wickedmachine.net) Received: from shaitan.wickedmachine.net (tn-67-232-80-18.dhcp.embarqhsd.net [67.232.80.18]) by mx1.freebsd.org (Postfix) with ESMTP id A5FFB8FC0C; Tue, 16 Jun 2009 01:10:26 +0000 (UTC) (envelope-from jsa@wickedmachine.net) Received: from shaitan.wickedmachine.net (localhost [127.0.0.1]) by shaitan.wickedmachine.net (8.14.3/8.14.3) with ESMTP id n5G1AQnL024872; Mon, 15 Jun 2009 21:10:26 -0400 (EDT) (envelope-from jsa@wickedmachine.net) Message-Id: <1245114626.24789@shaitan.wickedmachine.net> Date: Mon, 15 Jun 2009 21:10:26 -0400 From: "Joseph S. Atkinson" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.9 Cc: itetcu@FreeBSD.org Subject: ports/135612: Fix annouying collection replication bug in audio/exaile-devel X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Jun 2009 01:20:02 -0000 >Number: 135612 >Category: ports >Synopsis: Fix annouying collection replication bug in audio/exaile-devel >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Jun 16 01:20:00 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Joseph S. Atkinson >Release: FreeBSD 8.0-CURRENT amd64 >Organization: >Environment: System: FreeBSD 8.0-CURRENT #0 r194047: Fri Jun 12 04:13:43 EDT 2009 jsa@shaitan.wickedmachine.net:/usr/obj/usr/src/sys/SHAITAN >Description: This fixes the collection manager from duplicating album entries when adding to the playlist or collapsing the menu entry. Obtained from exaile bzr. >How-To-Repeat: >Fix: This bumps PORTREVISION --- exaile_collection_fix.diff begins here --- --- audio/exaile-devel/Makefile 2009-06-12 04:26:42.000000000 -0400 +++ audio/exaile-devel/Makefile 2009-06-15 21:04:46.205743466 -0400 @@ -7,6 +7,7 @@ PORTNAME= exaile DISTVERSION= 0.2.99.2 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://www.exaile.org/files/ \ http://wickedmachine.net/~jsa/FreeBSD/distfiles/ --- exaile_collection_fix.diff ends here --- --- patch-xlgui:panel:collection.py begins here --- === modified file 'xlgui/panel/collection.py' --- xlgui/panel/collection.py 2009-06-08 03:19:00 +0000 This goes in audio/exaile-devel/files/ +++ xlgui/panel/collection.py 2009-06-16 00:49:34 +0000 @@ -224,11 +224,7 @@ self.menu.popup(event) def on_expanded(self, tree, iter, path): - if self.model.iter_n_children(iter) == 1 and \ - self.model.get_value(self.model.iter_children(iter), 1) == None: - iter_sep = self.model.iter_children(iter) - self.load_subtree(iter) - self.model.remove(iter_sep) + self.load_subtree(iter) def get_node_keywords(self, parent): if not parent: @@ -291,10 +287,16 @@ self.controller.main.update_track_counts() def load_subtree(self, parent): + iter_sep = None if parent == None: depth = 0 else: - depth = self.model.iter_depth(parent) +1 + if self.model.iter_n_children(parent) != 1 or \ + self.model.get_value(self.model.iter_children(parent), 1) != None: + return + iter_sep = self.model.iter_children(parent) + depth = self.model.iter_depth(parent) + 1 + terms = self.get_node_search_terms(parent) if terms: search = " ".join(terms) @@ -378,3 +380,6 @@ iter = self.model.append(parent, [image, v, None]) if not bottom: self.model.append(iter, [None, None, None]) + + if iter_sep is not None: + self.model.remove(iter_sep) --- patch-xlgui:panel:collection.py ends here --- >Release-Note: >Audit-Trail: >Unformatted: