Commit 500745e9 authored by Yann Leboulanger's avatar Yann Leboulanger

really execute ad hoc command when clicking on Execute command in disco window

parent c3a723a8
......@@ -44,7 +44,7 @@ class CommandWindow:
TODO: gtk 2.10 has a special wizard-widget, consider using it...'''
def __init__(self, account, jid):
def __init__(self, account, jid, commandnode=None):
'''Create new window.'''
# an account object
......@@ -55,7 +55,7 @@ def __init__(self, account, jid):
self.commandlist=None # a list of (commandname, commanddescription)
# command's data
self.commandnode = None
self.commandnode = commandnode
self.sessionid = None
self.dataform = None
self.allow_stage3_close = False
......@@ -78,8 +78,12 @@ def __init__(self, account, jid):
self.data_form_widget.show()
self.sending_form_stage_vbox.pack_start(self.data_form_widget)
# setting initial stage
self.stage1()
if self.commandnode:
# Execute command
self.stage3()
else:
# setting initial stage
self.stage1()
# displaying the window
self.xml.signal_autoconnect(self)
......
......@@ -1259,14 +1259,15 @@ def update_theme(self):
self._renderer.set_property('cell-background', bgcolor)
self.window.services_treeview.queue_draw()
def on_execute_button_clicked(self, widget = None):
def on_execute_button_clicked(self, widget=None):
'''When we want to execute a command:
open adhoc command window'''
model, iter = self.window.services_treeview.get_selection().get_selected()
if not iter:
return
service = model[iter][0].decode('utf-8')
adhoc_commands.CommandWindow(self.account, service)
node = model[iter][1].decode('utf-8')
adhoc_commands.CommandWindow(self.account, service, commandnode=node)
def on_register_button_clicked(self, widget = None):
'''When we want to register an agent:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment