[kupfer: 3/11] compose: Use indirect object icon if applicable

[Ulrik Sverdrup <usverdrup src gnome org>]

commit d1cf5cfc4015883f42481f6b0271e9b06aeee6a1
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Sun Dec 13 22:30:57 2009 +0100

    compose: Use indirect object icon if applicable

 kupfer/objects.py |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/kupfer/objects.py b/kupfer/objects.py
index 695287e..27a777d 100644
--- a/kupfer/objects.py
+++ b/kupfer/objects.py
@@ -1177,5 +1177,9 @@ class ComposedLeaf (RunnableLeaf):
 		return action.activate(*args)
 
 	def get_gicon(self):
-		return icons.ComposedIcon(self.object[0].get_icon(),
-				self.object[1].get_icon())
+		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())
+