[kupfer: 7/38] commatrick: Allow composing multiple objects

[Ulrik Sverdrup <usverdrup src gnome org>]

commit 923407fc94c8f47e884bd27999a7e06facb23009
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Thu Jan 14 23:28:37 2010 +0100

    commatrick: Allow composing multiple objects

 kupfer/core/data.py |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)
---
diff --git a/kupfer/core/data.py b/kupfer/core/data.py
index d3f6e6a..210c678 100644
--- a/kupfer/core/data.py
+++ b/kupfer/core/data.py
@@ -761,16 +761,10 @@ class DataController (gobject.GObject, pretty.OutputMixin):
 			self._insert_object(SourcePane, found)
 
 	def compose_selection(self):
-		leaf = self.source_pane.get_selection()
-		action = self.action_pane.get_selection()
-		if leaf is None or action is None:
+		leaf, action, iobj = self._get_current_command_objects()
+		if leaf is None:
 			return
-		iobj = self.object_pane.get_selection()
-		if self.mode is SourceActionObjectMode:
-			if iobj is None:
-				return
-		else:
-			iobj = None
+		self.object_stack_clear()
 		obj = compose.ComposedLeaf(leaf, action, iobj)
 		self._insert_object(SourcePane, obj)