changeset 631ed591e5a7 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=631ed591e5a7 description: fix set parent window for ProfileWindow and ChoseGPGKeyDialog.

diffstat:

data/gui/profile_window.ui | 1 - src/config.py | 2 +- src/dialogs.py | 3 +-- src/gui_interface.py | 2 +- src/profile_window.py | 3 +-- src/roster_window.py | 2 +- 6 files changed, 5 insertions(+), 8 deletions(-)

diffs (73 lines):

diff -r 0c82b12d2983 -r 631ed591e5a7 data/gui/profile_window.ui --- a/data/gui/profile_window.ui Thu Jul 05 23:53:51 2012 +0400 +++ b/data/gui/profile_window.ui Fri Jul 06 01:38:18 2012 +0400 @@ -4,7 +4,6 @@ <!-- interface-naming-policy toplevel-contextual --> <object class="GtkWindow" id="profile_window"> <property name="title" translatable="yes">Personal Information</property> - <property name="window_position">center-on-parent</property> <property name="type_hint">dialog</property> <signal name="destroy" handler="on_profile_window_destroy"/> <signal name="key_press_event" handler="on_profile_window_key_press_event"/> diff -r 0c82b12d2983 -r 631ed591e5a7 src/config.py --- a/src/config.py Thu Jul 05 23:53:51 2012 +0400 +++ b/src/config.py Fri Jul 06 01:38:18 2012 +0400 @@ -2458,7 +2458,7 @@ jid = gajim.get_jid_from_account(self.current_account) if 'profile' not in gajim.interface.instances[self.current_account]: gajim.interface.instances[self.current_account]['profile'] = \ - profile_window.ProfileWindow(self.current_account, self.window) + profile_window.ProfileWindow(self.current_account, transient_for=self.window) gajim.connections[self.current_account].request_vcard(jid)

def on_checkbutton_toggled(self, widget, config_name, diff -r 0c82b12d2983 -r 631ed591e5a7 src/dialogs.py --- a/src/dialogs.py Thu Jul 05 23:53:51 2012 +0400 +++ b/src/dialogs.py Fri Jul 06 01:38:18 2012 +0400 @@ -283,8 +283,7 @@ xml = gtkgui_helpers.get_gtk_builder('choose_gpg_key_dialog.ui') self.window = xml.get_object('choose_gpg_key_dialog') self.window.set_title(title_text) - if not transient_for: - self.window.set_transient_for(gajim.interface.roster.window) + self.window.set_transient_for(transient_for) self.keys_treeview = xml.get_object('keys_treeview') prompt_label = xml.get_object('prompt_label') prompt_label.set_text(prompt_text) diff -r 0c82b12d2983 -r 631ed591e5a7 src/gui_interface.py --- a/src/gui_interface.py Thu Jul 05 23:53:51 2012 +0400 +++ b/src/gui_interface.py Fri Jul 06 01:38:18 2012 +0400 @@ -238,7 +238,7 @@ jid = gajim.get_jid_from_account(account) if 'profile' not in self.instances[account]: self.instances[account]['profile'] = \ - profile_window.ProfileWindow(account) + profile_window.ProfileWindow(account, gajim.interface.roster.window) gajim.connections[account].request_vcard(jid)

def handle_gc_error(self, gc_control, pritext, sectext): diff -r 0c82b12d2983 -r 631ed591e5a7 src/profile_window.py --- a/src/profile_window.py Thu Jul 05 23:53:51 2012 +0400 +++ b/src/profile_window.py Fri Jul 06 01:38:18 2012 +0400 @@ -45,8 +45,7 @@ def __init__(self, account, transient_for=None): self.xml = gtkgui_helpers.get_gtk_builder('profile_window.ui') self.window = self.xml.get_object('profile_window') - if not transient_for: - self.window.set_transient_for(gajim.interface.roster.window) + self.window.set_transient_for(transient_for) self.progressbar = self.xml.get_object('progressbar') self.statusbar = self.xml.get_object('statusbar') self.context_id = self.statusbar.get_context_id('profile') diff -r 0c82b12d2983 -r 631ed591e5a7 src/roster_window.py --- a/src/roster_window.py Thu Jul 05 23:53:51 2012 +0400 +++ b/src/roster_window.py Fri Jul 06 01:38:18 2012 +0400 @@ -3233,7 +3233,7 @@

dialogs.ChooseGPGKeyDialog(_('Assign OpenPGP Key'), _('Select a key to apply to the contact'), public_keys, - on_key_selected, selected=keyID) + on_key_selected, selected=keyID, transient_for=self.window)

def on_set_custom_avatar_activate(self, widget, contact, account): def on_ok(widget, path_to_file):