Changeset 8970

Timestamp:

11/14/07 17:11:56 (13 months ago)

Author:

asterix

Message:

ability to send a file to the resource we want from roster context menu. see #3446

Files:

• trunk/src/roster_window.py (modified) (4 diffs)

trunk/src/roster_window.py

@@ -1965 +1965 @@
                         dialogs.SingleMessageWindow(account, jid, 'send')
 
-        def on_send_file_menuitem_activate(self, widget, account, contact):
+        def on_send_file_menuitem_activate(self, widget, contact, account,
+        resource=None):
                 gajim.interface.instances['file_transfers'].show_file_send_request(
                         account, contact)
@@ -2037 +2038 @@
                         if contact.resource:
                                 send_file_menuitem.connect('activate',
-                                        self.on_send_file_menuitem_activate, account, contact)
+                                        self.on_send_file_menuitem_activate, contact, account)
                         else: # if we do no have resource we cannot do much
                                 send_file_menuitem.set_sensitive(False)
@@ -2234 +2235 @@
                         start_chat_menuitem.set_submenu(resources_submenu(
                                 self.on_open_chat_window))
+                        send_file_menuitem.set_submenu(resources_submenu(
+                                self.on_send_file_menuitem_activate))
                         execute_command_menuitem.set_submenu(resources_submenu(
                                 self.on_execute_command))
@@ -2266 +2269 @@
                                 invite_to_submenu.append(menuitem)
 
-                if contact.resource:
-                        send_file_menuitem.connect('activate',
-                                self.on_send_file_menuitem_activate, account, contact)
-                else: # if we do not have resource we cannot send file
-                        send_file_menuitem.set_sensitive(False)
+                        if contact.resource:
+                                send_file_menuitem.connect('activate',
+                                        self.on_send_file_menuitem_activate, contact, account)
+                        else: # if we do not have resource we cannot send file
+                                send_file_menuitem.set_sensitive(False)
 
                 send_single_message_menuitem.connect('activate',