From aa241a338ad203ac2fc3347b322a70d73879296a Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Tue, 20 Mar 2007 12:32:01 +0000 Subject: [PATCH] destroy send file confirmation dialog when we press ok. fixes #3048 --- src/roster_window.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/roster_window.py b/src/roster_window.py index b2d581480..e995e858d 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -4088,15 +4088,6 @@ class RosterWindow: contact.groups.remove(group) self.remove_contact(contact, account) - def _on_send_files(self, widget, account, jid, uri): - c = gajim.contacts.get_contact_with_highest_priority(account, jid) - uri_splitted = uri.split() # we may have more than one file dropped - for uri in uri_splitted: - path = helpers.get_file_path_from_dnd_dropped_uri(uri) - if os.path.isfile(path): # is it file? - gajim.interface.instances['file_transfers'].send_file( - account, c, path) - def drag_data_received_data(self, treeview, context, x, y, selection, info, etime): model = treeview.get_model() @@ -4145,8 +4136,18 @@ class RosterWindow: for uri in uri_splitted: path = helpers.get_file_path_from_dnd_dropped_uri(uri) sec_text += '\n' + os.path.basename(path) + def _on_send_files(widget, account, jid, uri): + dialog.destroy() + c = gajim.contacts.get_contact_with_highest_priority(account, jid) + uri_splitted = uri.split() # we may have more than one file dropped + for uri in uri_splitted: + path = helpers.get_file_path_from_dnd_dropped_uri(uri) + if os.path.isfile(path): # is it file? + gajim.interface.instances['file_transfers'].send_file( + account, c, path) + dialog = dialogs.NonModalConfirmationDialog(prim_text, sec_text, - on_response_ok = (self._on_send_files, account_dest, jid_dest, uri)) + on_response_ok = (_on_send_files, account_dest, jid_dest, uri)) dialog.popup() return