Changeset 7829 for branches/gajim_0.11/src/adhoc_commands.py

Timestamp:

01/13/07 23:35:41 (23 months ago)

Author:

asterix

Message:

merge diff from trunc to 0.11 branch

Files:

• branches/gajim_0.11/src/adhoc_commands.py (modified) (5 diffs)

branches/gajim_0.11/src/adhoc_commands.py

@@ -267 +267 @@
                 if self.data_form_widget.get_data_form() is None:
                         self.data_form_widget.hide()
+                else:
+                        self.data_form_widget.data_form.type='submit'
 
                 self.close_button.set_sensitive(True)
@@ -297 +299 @@
                                 # FIXME: translate
                                 self.stage5(error='Service sent malformed data', senderror=True)
+                                return
                         self.data_form_widget.show()
+                        if self.data_form_widget.title:
+                                self.window.set_title("%s - Ad-hoc Commands - Gajim" % \
+                                        self.data_form_widget.title)
                 else:
                         self.data_form_widget.hide()
@@ -466 +472 @@
 #                       cmdnode.addChild(node=dataforms.DataForm(tofill=self.data_form_widget.data_form))
                         # FIXME: simplified form to send
+                        
                         cmdnode.addChild(node=self.data_form_widget.data_form)
 
@@ -481 +488 @@
                 '''Send the command with action='cancel'. '''
                 assert self.commandnode is not None
-                if self.sessionid is not None:
+                if self.sessionid is not None and self.account.connection:
                         # we already have sessionid, so the service sent at least one reply.
                         stanza = xmpp.Iq(typ='set', to=self.jid)
@@ -490 +497 @@
                                         'action':'cancel'
                                 })
-        
+
                         self.account.connection.send(stanza)
                 else: