Author: dkirov Date: 2006-05-31 21:02:40 +0200 (Wed, 31 May 2006) New Revision: 6404

Modified: branches/gajim_0.10/src/filetransfers_window.py branches/gajim_0.10/src/groupchat_control.py branches/gajim_0.10/src/roster_window.py Log: merge r6362

Modified: branches/gajim_0.10/src/filetransfers_window.py =================================================================== --- branches/gajim_0.10/src/filetransfers_window.py 2006-05-31 19:00:59 UTC (rev 6403) +++ branches/gajim_0.10/src/filetransfers_window.py 2006-05-31 19:02:40 UTC (rev 6404) @@ -837,9 +837,9 @@ 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'''

Modified: branches/gajim_0.10/src/groupchat_control.py =================================================================== --- branches/gajim_0.10/src/groupchat_control.py 2006-05-31 19:00:59 UTC (rev 6403) +++ branches/gajim_0.10/src/groupchat_control.py 2006-05-31 19:02:40 UTC (rev 6404) @@ -1494,8 +1494,8 @@

# show the popup now! menu = xml.get_widget('gc_occupants_menu') + menu.show_all() menu.popup(None, None, None, event.button, event.time) - menu.show_all()

def _start_private_message(self, nick): gc_c = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick)

Modified: branches/gajim_0.10/src/roster_window.py =================================================================== --- branches/gajim_0.10/src/roster_window.py 2006-05-31 19:00:59 UTC (rev 6403) +++ branches/gajim_0.10/src/roster_window.py 2006-05-31 19:02:40 UTC (rev 6404) @@ -1386,9 +1386,9 @@ 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''' @@ -1419,8 +1419,8 @@

menu.attach_to_widget(self.tree, None) menu.connect('selection-done', gtkgui_helpers.destroy_widget) + menu.show_all() menu.popup(None, None, None, event_button, event.time) - menu.show_all()

def make_transport_menu(self, event, iter): '''Make transport's popup menu''' @@ -1485,8 +1485,8 @@

menu.attach_to_widget(self.tree, None) menu.connect('selection-done', gtkgui_helpers.destroy_widget) + menu.show_all() menu.popup(None, None, None, event_button, event.time) - menu.show_all()

def on_edit_account(self, widget, account): if gajim.interface.instances[account].has_key('account_modification'): @@ -1599,8 +1599,8 @@

menu.attach_to_widget(self.tree, None) menu.connect('selection-done', gtkgui_helpers.destroy_widget) + menu.show_all() menu.popup(None, self.tree, None, event_button, event.time) - menu.show_all()

def on_add_to_roster(self, widget, contact, account): dialogs.AddNewContactWindow(account, contact.jid) @@ -3208,8 +3208,8 @@

menu.attach_to_widget(self.tree, None) menu.connect('selection-done', gtkgui_helpers.destroy_widget) + menu.show_all() menu.popup(None, None, None, 1, etime) - menu.show_all()

def show_title(self): change_title_allowed = gajim.config.get('change_roster_title')