copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix set parent window for ProfileWindow and ChoseGPGKeyDialog.

Browse source
This commit is contained in:
Denis Fomin 2012-07-06 01:38:18 +04:00
parent f92b8e46d4
commit 9c2573980a
6 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/gui/profile_window.ui
View file

@ -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"/>

2
src/config.py
View file

@ -2458,7 +2458,7 @@ class AccountsWindow:
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,

3
src/dialogs.py
View file

@ -283,8 +283,7 @@ class ChooseGPGKeyDialog:
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)

2
src/gui_interface.py
View file

@ -238,7 +238,7 @@ class Interface:
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):

3
src/profile_window.py
View file

@ -45,8 +45,7 @@ class ProfileWindow:
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')

2
src/roster_window.py
View file

@ -3233,7 +3233,7 @@ class RosterWindow:
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):