From 338eed59ef2c75070b7a0924c1f33fc6ad88b52a Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Wed, 14 Nov 2007 16:11:56 +0000 Subject: [PATCH] ability to send a file to the resource we want from roster context menu. see #3446 --- src/roster_window.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/roster_window.py b/src/roster_window.py index 2a8ca43d7..d52b149e1 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -1964,7 +1964,8 @@ class RosterWindow: jid += '/' + contact.resource 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) @@ -2036,7 +2037,7 @@ class RosterWindow: 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) @@ -2233,6 +2234,8 @@ class RosterWindow: 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)) invite_to_new_room_menuitem.set_submenu(resources_submenu( @@ -2265,11 +2268,11 @@ class RosterWindow: our_jid_other_resource) 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', self.on_send_single_message_menuitem_activate, account, contact)