From c2259ceb0b211c148dab20ac484509d24b791bae Mon Sep 17 00:00:00 2001
From: Necoro <>
Date: Mon, 28 Jan 2008 19:43:34 +0000
Subject: From 0.9.0 branch.

---
 portato/gui/gtk/views.py            | 1 +
 portato/gui/gui_helper.py           | 4 +++-
 portato/gui/templates/portato.glade | 3 +--
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'portato/gui')

diff --git a/portato/gui/gtk/views.py b/portato/gui/gtk/views.py
index db1f054..8a73bab 100644
--- a/portato/gui/gtk/views.py
+++ b/portato/gui/gtk/views.py
@@ -18,6 +18,7 @@ import gtk
 import logging
 
 from gettext import lgettext as _
+from ...helper import warning
 
 class LazyView (object):
 	def __init__ (self):
diff --git a/portato/gui/gui_helper.py b/portato/gui/gui_helper.py
index c6e6247..91a460f 100644
--- a/portato/gui/gui_helper.py
+++ b/portato/gui/gui_helper.py
@@ -506,7 +506,7 @@ class EmergeQueue:
 			self.process = Popen(command+options+packages, shell = False, env = system.get_environment(), preexec_fn = pre)
 
 			# remove packages from queue
-			if self.tree and it:
+			if self.tree and it and not self.tree.is_in_unmerge(top):
 				self.up = Updater(self, it, self.threadClass)
 			else:
 				self.up = None
@@ -528,6 +528,8 @@ class EmergeQueue:
 					self.tree.set_in_progress(top, False)
 				else:
 					self.remove(top)
+			elif self.tree and it:
+				self.remove_with_children(top)
 
 			if self.title_update: self.title_update(None)
 
diff --git a/portato/gui/templates/portato.glade b/portato/gui/templates/portato.glade
index 335eca0..60047c7 100644
--- a/portato/gui/templates/portato.glade
+++ b/portato/gui/templates/portato.glade
@@ -2113,8 +2113,7 @@ Thanks goto:
 	- The Porthole team, which often inspired me and gave me hints :)
 	- franzf, who often tested and gave comments
 	- the Sabayon-Distro for making Portato the default Portage-GUI</property>
-    <property name="translator_credits">Catalan - Roger Calvó
-German - René 'Necoro' Neumann
+    <property name="translator_credits">German - René 'Necoro' Neumann
 Polish - Tomasz Osiński</property>
     <property name="artists">p4r4d0x (inspired by wolfden)</property>
     <signal name="response" handler="close"/>
-- 
cgit v1.2.3-70-g09d2