[kupfer] objects: ComposedLeaf always uses only Object + Action icon

[Ulrik Sverdrup <usverdrup src gnome org>]

commit 609d075eaaf229f860fdd4a49df7ce438c2f2b2a
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Sat Jan 9 04:33:20 2010 +0100

    objects: ComposedLeaf always uses only Object + Action icon

 kupfer/objects.py |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/kupfer/objects.py b/kupfer/objects.py
index 9f7f138..6f46700 100644
--- a/kupfer/objects.py
+++ b/kupfer/objects.py
@@ -1215,10 +1215,7 @@ class ComposedLeaf (RunnableLeaf):
 
 	def get_gicon(self):
 		obj, action, iobj = self.object
-		if iobj is None:
-			return icons.ComposedIcon(obj.get_icon(), action.get_icon())
-		else:
-			return icons.ComposedIcon(obj.get_icon(), iobj.get_icon())
+		return icons.ComposedIcon(obj.get_icon(), action.get_icon())
 
 class _MultipleLeafContentSource (Source):
 	def __init__(self, leaf):