Commits August 2013

commits@gajim.org

3 participants
325 discussions

gajim: typo
by Denis Fomin 24 Aug '13

24 Aug '13

changeset e31a719aa0b0 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=e31a719aa0b0 description: typo diffstat: src/common/config.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 0b166353b326 -r e31a719aa0b0 src/common/config.py --- a/src/common/config.py Thu Aug 15 23:21:24 2013 +0200 +++ b/src/common/config.py Fri Aug 16 10:09:41 2013 +0400 @@ -412,7 +412,7 @@ 'oauth2_refresh_token': [ opt_str, '', _('Latest token for Oauth2 authentication.')], 'oauth2_client_id': [ opt_str, '0000000044077801', _('client_id for Oauth2 authentication.')], 'oauth2_redirect_url': [ opt_str, 'https%3A%2F%2Fgajim.org%2Fmsnauth%2Findex.cgi', _('redirect_url for Oauth2 authentication.')], - 'opened_chat_controls': [opt_str, '', _('Space separated list of JIDsfor which we want to re-open a chat window on next startup.')], + 'opened_chat_controls': [opt_str, '', _('Space separated list of JIDs for which we want to re-open a chat window on next startup.')], }, {}), 'statusmsg': ({ 'message': [ opt_str, '' ],

1 0

gajim: [x11term] prevent traceback
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset 393692d13295 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=393692d13295 description: [x11term] prevent traceback diffstat: src/conversation_textview.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r e31a719aa0b0 -r 393692d13295 src/conversation_textview.py --- a/src/conversation_textview.py Fri Aug 16 10:09:41 2013 +0400 +++ b/src/conversation_textview.py Fri Aug 16 09:21:32 2013 +0200 @@ -358,6 +358,7 @@ # use it for hr too self.tv.focus_out_line_pixbuf = ConversationTextview.FOCUS_OUT_LINE_PIXBUF self.smooth_id = None + self.just_cleared = False def del_handlers(self): for i in self.handlers.keys():

1 0

gajim: prevent bug when forming a jid
by Denis Fomin 24 Aug '13

24 Aug '13

changeset 4f1cfc338f55 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=4f1cfc338f55 description: prevent bug when forming a jid diffstat: src/common/stanza_session.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 47a6c9bfb912 -r 4f1cfc338f55 src/common/stanza_session.py --- a/src/common/stanza_session.py Thu Aug 15 14:32:14 2013 +0400 +++ b/src/common/stanza_session.py Thu Aug 15 14:38:59 2013 +0400 @@ -83,7 +83,7 @@ def get_to(self): to = str(self.jid) - return gajim.get_jid_without_resource(to) + self.resource + return gajim.get_jid_without_resource(to) + '/' + self.resource def remove_events(self, types): """

1 0

gajim: Tv transport icon fix
by Denis Fomin 24 Aug '13

24 Aug '13

changeset 517b0a34c3b8 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=517b0a34c3b8 description: Tv transport icon fix diffstat: src/disco.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 4f1cfc338f55 -r 517b0a34c3b8 src/disco.py --- a/src/disco.py Thu Aug 15 14:38:59 2013 +0400 +++ b/src/disco.py Thu Aug 15 19:28:44 2013 +0400 @@ -114,6 +114,7 @@ ('_jid', 'mrim'): (False, 'mrim'), ('gateway', 'facebook'): (False, 'facebook'), ('_jid', 'facebook'): (False, 'facebook'), + ('gateway', 'tv'): (False, 'tv'), } # Category type to "human-readable" description string, and sort priority

1 0

gajim: split long lines
by Denis Fomin 24 Aug '13

24 Aug '13

changeset b3b5373c662a in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=b3b5373c662a description: split long lines diffstat: src/disco.py | 35 +++++++++++++++++++---------------- 1 files changed, 19 insertions(+), 16 deletions(-) diffs (105 lines): diff -r 517b0a34c3b8 -r b3b5373c662a src/disco.py --- a/src/disco.py Thu Aug 15 19:28:44 2013 +0400 +++ b/src/disco.py Thu Aug 15 19:40:59 2013 +0400 @@ -634,7 +634,7 @@ if text_after: font.set_weight(Pango.Weight.NORMAL) markup = '%s\n<span font_desc="%s" size="small">%s</span>' % \ - (markup, font.to_string(), text_after) + (markup, font.to_string(), text_after) self.banner.set_markup(markup) def paint_banner(self): @@ -765,7 +765,8 @@ # We can't travel anywhere else. self.destroy() dialogs.ErrorDialog(_('The service could not be found'), -_('There is no service at the address you entered, or it is not responding. Check the address and try again.')) +_('There is no service at the address you entered, or it is not responding. ' + 'Check the address and try again.')) return klass = self.cache.get_browser(identities, features) if not klass: @@ -1315,7 +1316,7 @@ state = self.model[iter_][4] # Not a category, and we have something to say about state if jid and state > 0 and \ - (self.tooltip.timeout == 0 or self.tooltip.id != props[0]): + (self.tooltip.timeout == 0 or self.tooltip.id != props[0]): self.tooltip.id = row self.tooltip.timeout = GLib.timeout_add(500, self._show_tooltip, state) @@ -1356,15 +1357,15 @@ # Connect signals scrollwin = self.window.services_scrollwin self._view_signals.append(view.connect('leave-notify-event', - self.on_treeview_leave_notify_event)) + self.on_treeview_leave_notify_event)) self._view_signals.append(view.connect('motion-notify-event', - self.on_treeview_motion_notify_event)) + self.on_treeview_motion_notify_event)) self._view_signals.append(view.connect('key-press-event', - self.on_treeview_event_hide_tooltip)) + self.on_treeview_event_hide_tooltip)) self._view_signals.append(view.connect('button-press-event', - self.on_treeview_event_hide_tooltip)) + self.on_treeview_event_hide_tooltip)) self._scroll_signal = scrollwin.connect('scroll-event', - self.on_treeview_event_hide_tooltip) + self.on_treeview_event_hide_tooltip) def _clean_treemodel(self): # Disconnect signals @@ -1881,9 +1882,8 @@ for bookmark in gajim.connections[self.account].bookmarks: if bookmark['jid'] == bm['jid']: - dialogs.ErrorDialog( - _('Bookmark already set'), - _('Group Chat "%s" is already in your bookmarks.') % bm['jid']) + dialogs.ErrorDialog( _('Bookmark already set'), + _('Group Chat "%s" is already in your bookmarks.') % bm['jid']) return gajim.connections[self.account].bookmarks.append(bm) @@ -1892,8 +1892,8 @@ gajim.interface.roster.set_actions_menu_needs_rebuild() dialogs.InformationDialog( - _('Bookmark has been added successfully'), - _('You can manage your bookmarks via Actions menu in your roster.')) + _('Bookmark has been added successfully'), + _('You can manage your bookmarks via Actions menu in your roster.')) def on_join_button_clicked(self, *args): """ @@ -2061,7 +2061,8 @@ self.subscribe_button = None self.unsubscribe_button = None - gajim.connections[account].send_pb_subscription_query(jid, self._on_pep_subscriptions) + gajim.connections[account].send_pb_subscription_query(jid, + self._on_pep_subscriptions) def _create_treemodel(self): """ @@ -2233,7 +2234,8 @@ groupnode = model.get_value(iter_, 1) # 1 = groupnode - gajim.connections[self.account].send_pb_subscribe(self.jid, groupnode, self._on_pep_subscribe, groupnode) + gajim.connections[self.account].send_pb_subscribe(self.jid, groupnode, + self._on_pep_subscribe, groupnode) def on_unsubscribe_button_clicked(self, widget): """ @@ -2244,7 +2246,8 @@ groupnode = model.get_value(iter_, 1) # 1 = groupnode - gajim.connections[self.account].send_pb_unsubscribe(self.jid, groupnode, self._on_pep_unsubscribe, groupnode) + gajim.connections[self.account].send_pb_unsubscribe(self.jid, groupnode, + self._on_pep_unsubscribe, groupnode) def _on_pep_subscriptions(self, conn, request): """

1 0

gajim: Set XML console input box height
by Denis Fomin 24 Aug '13

24 Aug '13

changeset ed8091f87a64 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=ed8091f87a64 description: Set XML console input box height diffstat: data/gui/xml_console_window.ui | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diffs (16 lines): diff -r b3b5373c662a -r ed8091f87a64 data/gui/xml_console_window.ui --- a/data/gui/xml_console_window.ui Thu Aug 15 19:40:59 2013 +0400 +++ b/data/gui/xml_console_window.ui Fri Aug 16 00:44:59 2013 +0400 @@ -254,11 +254,10 @@ <object class="GtkScrolledWindow" id="scrolledwindow42"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">never</property> <property name="shadow_type">in</property> <child> <object class="GtkTextView" id="input_textview"> + <property name="height_request">120</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="wrap_mode">char</property>

1 0

gajim: Remove hscrollbar in XML console
by Denis Fomin 24 Aug '13

24 Aug '13

changeset a4a064255eed in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=a4a064255eed description: Remove hscrollbar in XML console diffstat: data/gui/xml_console_window.ui | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r ed8091f87a64 -r a4a064255eed data/gui/xml_console_window.ui --- a/data/gui/xml_console_window.ui Fri Aug 16 00:44:59 2013 +0400 +++ b/data/gui/xml_console_window.ui Fri Aug 16 00:55:01 2013 +0400 @@ -255,6 +255,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="shadow_type">in</property> + <property name="hscrollbar_policy">never</property> <child> <object class="GtkTextView" id="input_textview"> <property name="height_request">120</property>

1 0

gajim: coding standards
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset ac9c8fffc491 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=ac9c8fffc491 description: coding standards diffstat: src/config.py | 266 +++++++++++++++++++++++++++++++-------------------------- 1 files changed, 143 insertions(+), 123 deletions(-) diffs (truncated from 750 to 300 lines): diff -r a4a064255eed -r ac9c8fffc491 src/config.py --- a/src/config.py Fri Aug 16 00:55:01 2013 +0400 +++ b/src/config.py Thu Aug 15 14:57:39 2013 +0200 @@ -1639,7 +1639,8 @@ gajim.connections[account].change_status(show, status) def check_resend_relog(self): - if self.need_relogin and self.current_account == gajim.ZEROCONF_ACC_NAME: + if self.need_relogin and self.current_account == \ + gajim.ZEROCONF_ACC_NAME: if gajim.ZEROCONF_ACC_NAME in gajim.connections: gajim.connections[gajim.ZEROCONF_ACC_NAME].update_details() return @@ -1658,11 +1659,13 @@ def relog(account): self.dialog.destroy() - show_before = gajim.SHOW_LIST[gajim.connections[account].connected] + show_before = gajim.SHOW_LIST[gajim.connections[account].\ + connected] status_before = gajim.connections[account].status gajim.interface.roster.send_status(account, 'offline', - _('Be right back.')) - GLib.timeout_add(500, login, account, show_before, status_before) + _('Be right back.')) + GLib.timeout_add(500, login, account, show_before, + status_before) def on_yes(checked, account): relog(account) @@ -1671,10 +1674,10 @@ self.resend(account) if self.current_account in gajim.connections: self.dialog = dialogs.YesNoDialog(_('Relogin now?'), - _('If you want all the changes to apply instantly, ' - 'you must relogin.'), on_response_yes=(on_yes, - self.current_account), on_response_no=(on_no, - self.current_account)) + _('If you want all the changes to apply instantly, ' + 'you must relogin.'), on_response_yes=(on_yes, + self.current_account), on_response_no=(on_no, + self.current_account)) elif self.resend_presence: self.resend(self.current_account) @@ -1695,7 +1698,8 @@ else: iter_ = account = None if self.current_account and self.current_account == account: - # We're comming back to our current account, no need to update widgets + # We're comming back to our current account, no need to update + # widgets return # Save config for previous account if needed cause focus_out event is # called after the changed event @@ -1713,8 +1717,8 @@ elif focused_widget_name == 'cert_entry1': func = self.on_cert_entry1_focus_out_event if func(focused_widget, None): - # Error detected in entry, don't change account, re-put cursor on - # previous row + # Error detected in entry, don't change account, + # re-put cursor on previous row self.select_account(self.current_account) return True self.window.set_focus(widget) @@ -1753,7 +1757,7 @@ def update_proxy_list(self): if self.current_account: our_proxy = gajim.config.get_per('accounts', self.current_account, - 'proxy') + 'proxy') else: our_proxy = '' @@ -1773,7 +1777,8 @@ if not self.current_account: self.notebook.set_current_page(0) return - if gajim.config.get_per('accounts', self.current_account, 'is_zeroconf'): + if gajim.config.get_per('accounts', self.current_account, + 'is_zeroconf'): self.ignore_events = True self.init_zeroconf_account() self.ignore_events = False @@ -1786,38 +1791,39 @@ def init_zeroconf_account(self): active = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, - 'active') + 'active') self.xml.get_object('enable_zeroconf_checkbutton2').set_active(active) if not gajim.HAVE_ZEROCONF: self.xml.get_object('enable_zeroconf_checkbutton2').set_sensitive( - False) + False) self.xml.get_object('zeroconf_notebook').set_sensitive(active) # General tab st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, - 'autoconnect') + 'autoconnect') self.xml.get_object('autoconnect_checkbutton2').set_active(st) list_no_log_for = gajim.config.get_per('accounts', - gajim.ZEROCONF_ACC_NAME, 'no_log_for').split() + gajim.ZEROCONF_ACC_NAME, 'no_log_for').split() if gajim.ZEROCONF_ACC_NAME in list_no_log_for: self.xml.get_object('log_history_checkbutton2').set_active(0) else: self.xml.get_object('log_history_checkbutton2').set_active(1) st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, - 'sync_with_global_status') - self.xml.get_object('sync_with_global_status_checkbutton2').set_active(st) + 'sync_with_global_status') + self.xml.get_object('sync_with_global_status_checkbutton2').set_active( + st) st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, - 'use_custom_host') + 'use_custom_host') self.xml.get_object('custom_port_checkbutton2').set_active(st) self.xml.get_object('custom_port_entry2').set_sensitive(st) st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, - 'custom_port') + 'custom_port') if not st: gajim.config.set_per('accounts', gajim.ZEROCONF_ACC_NAME, - 'custom_port', '5298') + 'custom_port', '5298') st = '5298' self.xml.get_object('custom_port_entry2').set_text(str(st)) @@ -1833,7 +1839,7 @@ for opt in ('first_name', 'last_name', 'jabber_id', 'email'): st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, - 'zeroconf_' + opt) + 'zeroconf_' + opt) self.xml.get_object(opt + '_entry2').set_text(st) def init_account_gpg(self): @@ -1850,7 +1856,7 @@ gpg_key_label = self.xml.get_object('gpg_key_label' + widget_name_add) gpg_name_label = self.xml.get_object('gpg_name_label' + widget_name_add) use_gpg_agent_checkbutton = self.xml.get_object( - 'use_gpg_agent_checkbutton' + widget_name_add) + 'use_gpg_agent_checkbutton' + widget_name_add) if not keyid: use_gpg_agent_checkbutton.set_sensitive(False) @@ -1896,7 +1902,7 @@ password_entry.set_text(passstr) jid = gajim.config.get_per('accounts', account, 'name') \ - + '@' + gajim.config.get_per('accounts', account, 'hostname') + + '@' + gajim.config.get_per('accounts', account, 'hostname') self.xml.get_object('jid_entry1').set_text(jid) self.ignore_events = False @@ -1923,36 +1929,38 @@ else: spinbutton.set_range(0, 127) spinbutton.set_value(gajim.config.get_per('accounts', account, - 'priority')) + 'priority')) # Connection tab use_env_http_proxy = gajim.config.get_per('accounts', account, - 'use_env_http_proxy') + 'use_env_http_proxy') self.xml.get_object('use_env_http_proxy_checkbutton1').set_active( - use_env_http_proxy) + use_env_http_proxy) self.xml.get_object('proxy_hbox1').set_sensitive(not use_env_http_proxy) warn_when_insecure_ssl = gajim.config.get_per('accounts', account, - 'warn_when_insecure_ssl_connection') + 'warn_when_insecure_ssl_connection') self.xml.get_object('warn_when_insecure_connection_checkbutton1').\ - set_active(warn_when_insecure_ssl) + set_active(warn_when_insecure_ssl) self.xml.get_object('send_keepalive_checkbutton1').set_active( - gajim.config.get_per('accounts', account, 'keep_alives_enabled')) + gajim.config.get_per('accounts', account, 'keep_alives_enabled')) use_custom_host = gajim.config.get_per('accounts', account, - 'use_custom_host') + 'use_custom_host') self.xml.get_object('custom_host_port_checkbutton1').set_active( - use_custom_host) + use_custom_host) custom_host = gajim.config.get_per('accounts', account, 'custom_host') if not custom_host: custom_host = gajim.config.get_per('accounts', account, 'hostname') - gajim.config.set_per('accounts', account, 'custom_host', custom_host) + gajim.config.set_per('accounts', account, 'custom_host', + custom_host) self.xml.get_object('custom_host_entry1').set_text(custom_host) custom_port = gajim.config.get_per('accounts', account, 'custom_port') if not custom_port: custom_port = 5222 - gajim.config.set_per('accounts', account, 'custom_port', custom_port) + gajim.config.set_per('accounts', account, 'custom_port', + custom_port) self.xml.get_object('custom_port_entry1').set_text(str(custom_port)) # Personal tab @@ -1965,22 +1973,23 @@ self.xml.get_object('gpg_choose_button1').set_sensitive(False) # General tab - self.xml.get_object('autoconnect_checkbutton1').set_active(gajim.config.\ - get_per('accounts', account, 'autoconnect')) + self.xml.get_object('autoconnect_checkbutton1').set_active( + gajim.config.get_per('accounts', account, 'autoconnect')) self.xml.get_object('autoreconnect_checkbutton1').set_active(gajim. - config.get_per('accounts', account, 'autoreconnect')) + config.get_per('accounts', account, 'autoreconnect')) list_no_log_for = gajim.config.get_per('accounts', account, - 'no_log_for').split() + 'no_log_for').split() if account in list_no_log_for: self.xml.get_object('log_history_checkbutton1').set_active(False) else: self.xml.get_object('log_history_checkbutton1').set_active(True) self.xml.get_object('sync_with_global_status_checkbutton1').set_active( - gajim.config.get_per('accounts', account, 'sync_with_global_status')) + gajim.config.get_per('accounts', account, + 'sync_with_global_status')) self.xml.get_object('use_ft_proxies_checkbutton1').set_active( - gajim.config.get_per('accounts', account, 'use_ft_proxies')) + gajim.config.get_per('accounts', account, 'use_ft_proxies')) def on_add_button_clicked(self, widget): """ @@ -1990,7 +1999,7 @@ gajim.interface.instances['account_creation_wizard'].window.present() else: gajim.interface.instances['account_creation_wizard'] = \ - AccountCreationWizardWindow() + AccountCreationWizardWindow() def on_remove_button_clicked(self, widget): """ @@ -2002,7 +2011,7 @@ account = self.current_account if len(gajim.events.get_events(account)): dialogs.ErrorDialog(_('Unread events'), - _('Read all pending events before removing this account.')) + _('Read all pending events before removing this account.')) return if gajim.config.get_per('accounts', account, 'is_zeroconf'): @@ -2028,13 +2037,13 @@ if not account in gajim.interface.instances: gajim.interface.instances[account] = {} gajim.interface.instances[account]['remove_account'] = \ - RemoveAccountWindow(account) + RemoveAccountWindow(account) if win_opened: dialogs.ConfirmationDialog( - _('You have opened chat in account %s') % account, - _('All chat and groupchat windows will be closed. Do you want to ' - 'continue?'), - on_response_ok = (remove, account)) + _('You have opened chat in account %s') % account, + _('All chat and groupchat windows will be closed. Do you want to ' + 'continue?'), + on_response_ok = (remove, account)) else: remove(account) @@ -2044,52 +2053,54 @@ active = gajim.config.get_per('accounts', self.current_account, 'active') if active and gajim.connections[self.current_account].connected != 0: dialogs.ErrorDialog( - _('You are currently connected to the server'), - _('To change the account name, you must be disconnected.')) + _('You are currently connected to the server'), + _('To change the account name, you must be disconnected.')) return if len(gajim.events.get_events(self.current_account)): dialogs.ErrorDialog(_('Unread events'), - _('To change the account name, you must read all pending ' - 'events.')) + _('To change the account name, you must read all pending ' + 'events.')) return # Get the new name def on_renamed(new_name, old_name): if new_name in gajim.connections: dialogs.ErrorDialog(_('Account Name Already Used'), - _('This name is already used by another of your accounts. ' - 'Please choose another name.')) + _('This name is already used by another of your accounts. '

1 0

gajim: make error diaogs in accounts window transient for ccount...
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset aa4412950028 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=aa4412950028 description: make error diaogs in accounts window transient for ccounts window. See #7185 diffstat: src/config.py | 43 ++++++++++++++++++++++++++----------------- src/dialogs.py | 6 ++++-- 2 files changed, 30 insertions(+), 19 deletions(-) diffs (166 lines): diff -r ac9c8fffc491 -r aa4412950028 src/config.py --- a/src/config.py Thu Aug 15 14:57:39 2013 +0200 +++ b/src/config.py Thu Aug 15 15:11:51 2013 +0200 @@ -2011,7 +2011,8 @@ account = self.current_account if len(gajim.events.get_events(account)): dialogs.ErrorDialog(_('Unread events'), - _('Read all pending events before removing this account.')) + _('Read all pending events before removing this account.'), + transient_for=self.window) return if gajim.config.get_per('accounts', account, 'is_zeroconf'): @@ -2054,27 +2055,30 @@ if active and gajim.connections[self.current_account].connected != 0: dialogs.ErrorDialog( _('You are currently connected to the server'), - _('To change the account name, you must be disconnected.')) + _('To change the account name, you must be disconnected.'), + transient_for=self.window) return if len(gajim.events.get_events(self.current_account)): dialogs.ErrorDialog(_('Unread events'), _('To change the account name, you must read all pending ' - 'events.')) + 'events.'), transient_for=self.window) return # Get the new name def on_renamed(new_name, old_name): if new_name in gajim.connections: dialogs.ErrorDialog(_('Account Name Already Used'), _('This name is already used by another of your accounts. ' - 'Please choose another name.')) + 'Please choose another name.'), transient_for=self.window) return if (new_name == ''): dialogs.ErrorDialog(_('Invalid account name'), - _('Account name cannot be empty.')) + _('Account name cannot be empty.'), + transient_for=self.window) return if new_name.find(' ') != -1: dialogs.ErrorDialog(_('Invalid account name'), - _('Account name cannot contain spaces.')) + _('Account name cannot contain spaces.'), + transient_for=self.window) return if active: # update variables @@ -2174,7 +2178,7 @@ except helpers.InvalidFormat as s: if not widget.is_focus(): pritext = _('Invalid Jabber ID') - dialogs.ErrorDialog(pritext, str(s)) + dialogs.ErrorDialog(pritext, str(s), transient_for=self.window) GLib.idle_add(lambda: widget.grab_focus()) return True @@ -2185,7 +2189,7 @@ pritext = _('Invalid Jabber ID') sectext = \ _('A Jabber ID must be in the form "user@servername".') - dialogs.ErrorDialog(pritext, sectext) + dialogs.ErrorDialog(pritext, sectext, transient_for=self.window) GLib.idle_add(lambda: widget.grab_focus()) return True @@ -2251,7 +2255,7 @@ except helpers.InvalidFormat as s: if not widget.is_focus(): pritext = _('Invalid Jabber ID') - dialogs.ErrorDialog(pritext, str(s)) + dialogs.ErrorDialog(pritext, str(s), transient_for=self.window) GLib.idle_add(lambda: widget.grab_focus()) return True @@ -2409,7 +2413,8 @@ except Exception: if not widget.is_focus(): dialogs.ErrorDialog(_('Invalid entry'), - _('Custom port must be a port number.')) + _('Custom port must be a port number.'), + transient_for=self.window) GLib.idle_add(lambda: widget.grab_focus()) return True if self.option_changed('custom_port', custom_port): @@ -2431,7 +2436,8 @@ secret_keys = [] if not secret_keys: dialogs.ErrorDialog(_('Failed to get secret keys'), - _('There is no OpenPGP secret key available.')) + _('There is no OpenPGP secret key available.'), + transient_for=self.window) secret_keys[_('None')] = _('None') def on_key_selected(keyID): @@ -2446,7 +2452,7 @@ gpg_name_label = self.xml.get_object('gpg_name_label' + \ wiget_name_ext) use_gpg_agent_checkbutton = self.xml.get_object( - 'use_gpg_agent_checkbutton' + wiget_name_ext) + 'use_gpg_agent_checkbutton' + wiget_name_ext) if keyID[0] == _('None'): gpg_key_label.set_text(_('No key selected')) gpg_name_label.set_text('') @@ -2479,7 +2485,7 @@ if self.current_account not in gajim.interface.instances: dlg = dialogs.ErrorDialog(_('No such account available'), _('You must create your account before editing your personal ' - 'information.')) + 'information.'), transient_for=self.window) return # show error dialog if account is newly created (not in gajim.connections) @@ -2487,12 +2493,13 @@ gajim.connections[self.current_account].connected < 2: dialogs.ErrorDialog(_('You are not connected to the server'), _('Without a connection, you can not edit your personal ' - 'information.')) + 'information.'), transient_for=self.window) return if not gajim.connections[self.current_account].vcard_supported: dialogs.ErrorDialog(_("Your server doesn't support vCard"), - _("Your server can't save your personal information.")) + _("Your server can't save your personal information."), + transient_for=self.window) return jid = gajim.get_jid_from_account(self.current_account) @@ -2608,7 +2615,8 @@ self.ignore_events = False dialogs.ErrorDialog( _('You are currently connected to the server'), - _('To disable the account, you must be disconnected.')) + _('To disable the account, you must be disconnected.'), + transient_for=self.window) return if gajim.ZEROCONF_ACC_NAME in gajim.connections and not \ gajim.connections[gajim.ZEROCONF_ACC_NAME].is_zeroconf: @@ -2645,7 +2653,8 @@ self.ignore_events = False dialogs.ErrorDialog( _('You are currently connected to the server'), - _('To disable the account, you must be disconnected.')) + _('To disable the account, you must be disconnected.'), + transient_for=self.window) return # add/remove account in roster and all variables if widget.get_active(): diff -r ac9c8fffc491 -r aa4412950028 src/dialogs.py --- a/src/dialogs.py Thu Aug 15 14:57:39 2013 +0200 +++ b/src/dialogs.py Thu Aug 15 15:11:51 2013 +0200 @@ -1628,8 +1628,10 @@ """ def __init__(self, pritext, sectext='', on_response_ok=None, - on_response_cancel=None): - if hasattr(gajim.interface, 'roster') and gajim.interface.roster: + on_response_cancel=None, transient_for=None): + if transient_for: + parent = transient_for + elif hasattr(gajim.interface, 'roster') and gajim.interface.roster: parent = gajim.interface.roster.window else: parent = None

1 0

gajim: make very E2E code transient for the calling window. See ...
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset 5cddd914a01a in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=5cddd914a01a description: make very E2E code transient for the calling window. See #7185 diffstat: src/dialogs.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diffs (29 lines): diff -r aa4412950028 -r 5cddd914a01a src/dialogs.py --- a/src/dialogs.py Thu Aug 15 15:11:51 2013 +0200 +++ b/src/dialogs.py Thu Aug 15 19:45:34 2013 +0200 @@ -1646,10 +1646,13 @@ """ def __init__(self, pritext, sectext='', checktext='', text_label=None, - on_response_yes=None, on_response_no=None, type_=Gtk.MessageType.QUESTION): + on_response_yes=None, on_response_no=None, type_=Gtk.MessageType.QUESTION, + transient_for=None): self.user_response_yes = on_response_yes self.user_response_no = on_response_no - if hasattr(gajim.interface, 'roster') and gajim.interface.roster: + if transient_for: + parent = transient_for + elif hasattr(gajim.interface, 'roster') and gajim.interface.roster: parent = gajim.interface.roster.window else: parent = None @@ -5195,7 +5198,8 @@ self.session.verified_identity = False self.update_info() - YesNoDialog(pritext, sectext, on_response_yes=on_yes, on_response_no=on_no) + YesNoDialog(pritext, sectext, on_response_yes=on_yes, + on_response_no=on_no, transient_for=self.window) class GPGInfoWindow: """

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
33
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2013