From d848e71d3b17f50a1e5059b76c82e28e2c130a98 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Fri, 26 May 2006 13:25:31 +0000 Subject: [PATCH] menu are now shown before popup so that they are correctly placed. --- src/filetransfers_window.py | 2 +- src/groupchat_control.py | 2 +- src/roster_window.py | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/filetransfers_window.py b/src/filetransfers_window.py index d4ef4860b..8f672f446 100644 --- a/src/filetransfers_window.py +++ b/src/filetransfers_window.py @@ -832,9 +832,9 @@ _('Connection with peer cannot be established.')) self.set_buttons_sensitive(path, True) event_button = gtkgui_helpers.get_possible_button_event(event) + self.file_transfers_menu.show_all() self.file_transfers_menu.popup(None, self.tree, None, event_button, event.time) - self.file_transfers_menu.show_all() def on_transfers_list_key_press_event(self, widget, event): '''when a key is pressed in the treeviews''' diff --git a/src/groupchat_control.py b/src/groupchat_control.py index bd7a40dc2..587d9973a 100644 --- a/src/groupchat_control.py +++ b/src/groupchat_control.py @@ -1559,8 +1559,8 @@ class GroupchatControl(ChatControlBase): # show the popup now! menu = xml.get_widget('gc_occupants_menu') - menu.popup(None, None, None, event.button, event.time) menu.show_all() + menu.popup(None, None, None, event.button, event.time) def _start_private_message(self, nick): gc_c = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick) diff --git a/src/roster_window.py b/src/roster_window.py index 298658dd9..608a73d73 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -1385,9 +1385,9 @@ class RosterWindow: roster_contact_context_menu.attach_to_widget(self.tree, None) roster_contact_context_menu.connect('selection-done', gtkgui_helpers.destroy_widget) + roster_contact_context_menu.show_all() roster_contact_context_menu.popup(None, None, None, event_button, event.time) - roster_contact_context_menu.show_all() def make_group_menu(self, event, iter): '''Make group's popup menu''' @@ -1418,8 +1418,8 @@ class RosterWindow: menu.attach_to_widget(self.tree, None) menu.connect('selection-done', gtkgui_helpers.destroy_widget) - menu.popup(None, None, None, event_button, event.time) menu.show_all() + menu.popup(None, None, None, event_button, event.time) def make_transport_menu(self, event, iter): '''Make transport's popup menu''' @@ -1484,8 +1484,8 @@ class RosterWindow: menu.attach_to_widget(self.tree, None) menu.connect('selection-done', gtkgui_helpers.destroy_widget) - menu.popup(None, None, None, event_button, event.time) menu.show_all() + menu.popup(None, None, None, event_button, event.time) def on_edit_account(self, widget, account): if gajim.interface.instances[account].has_key('account_modification'): @@ -1602,8 +1602,8 @@ class RosterWindow: menu.attach_to_widget(self.tree, None) menu.connect('selection-done', gtkgui_helpers.destroy_widget) - menu.popup(None, self.tree, None, event_button, event.time) menu.show_all() + menu.popup(None, self.tree, None, event_button, event.time) def on_add_to_roster(self, widget, contact, account): dialogs.AddNewContactWindow(account, contact.jid) @@ -3202,8 +3202,8 @@ _('If "%s" accepts this request you will know his or her status.') % jid) menu.attach_to_widget(self.tree, None) menu.connect('selection-done', gtkgui_helpers.destroy_widget) - menu.popup(None, None, None, 1, etime) menu.show_all() + menu.popup(None, None, None, 1, etime) def show_title(self): change_title_allowed = gajim.config.get('change_roster_title')