Commits

commits@gajim.org

17632 discussions

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

24 Aug '13

changeset d506456ac27d in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=d506456ac27d description: Tv transport icon fix diffstat: src/disco.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 938105bd5564 -r d506456ac27d 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 @@ -112,6 +112,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 56a2a15281c2 in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=56a2a15281c2 description: split long lines diffstat: src/disco.py | 35 +++++++++++++++++++---------------- 1 files changed, 19 insertions(+), 16 deletions(-) diffs (105 lines): diff -r d506456ac27d -r 56a2a15281c2 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 @@ -633,7 +633,7 @@ if text_after: font.set_weight(pango.WEIGHT_NORMAL) markup = '%s\n%s' % \ - (markup, font.to_string(), text_after) + (markup, font.to_string(), text_after) self.banner.set_markup(markup) def paint_banner(self): @@ -759,7 +759,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: @@ -1305,7 +1306,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 = gobject.timeout_add(500, self._show_tooltip, state) @@ -1346,15 +1347,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 @@ -1871,9 +1872,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) @@ -1882,8 +1882,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): """ @@ -2067,7 +2067,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): """ @@ -2238,7 +2239,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): """ @@ -2249,7 +2251,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 ca860dade460 in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=ca860dade460 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 56a2a15281c2 -r ca860dade460 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 @@ -222,11 +222,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 0beaafa3d4ca in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=0beaafa3d4ca 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 ca860dade460 -r 0beaafa3d4ca 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 @@ -223,6 +223,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 4de47ce434bb in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=4de47ce434bb description: coding standards diffstat: src/config.py | 272 +++++++++++++++++++++++++++++++-------------------------- 1 files changed, 146 insertions(+), 126 deletions(-) diffs (truncated from 774 to 300 lines): diff -r 0beaafa3d4ca -r 4de47ce434bb 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 @@ -1614,7 +1614,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 @@ -1633,11 +1634,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.')) - gobject.timeout_add(500, login, account, show_before, status_before) + _('Be right back.')) + gobject.timeout_add(500, login, account, show_before, + status_before) def on_yes(checked, account): relog(account) @@ -1646,10 +1649,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) @@ -1667,7 +1670,8 @@ else: 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 @@ -1685,8 +1689,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) @@ -1725,7 +1729,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 = '' @@ -1745,7 +1749,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 @@ -1758,38 +1763,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)) @@ -1805,7 +1811,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): @@ -1822,7 +1828,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) @@ -1868,7 +1874,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 @@ -1895,36 +1901,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(unicode(custom_port)) # Personal tab @@ -1937,22 +1945,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): """ @@ -1962,7 +1971,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): """ @@ -1974,7 +1983,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'): @@ -2000,13 +2009,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) @@ -2016,52 +2025,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 37e14b6aed6a in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=37e14b6aed6a 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 4de47ce434bb -r 37e14b6aed6a 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 @@ -1983,7 +1983,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'): @@ -2026,27 +2027,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 @@ -2146,7 +2150,7 @@ except helpers.InvalidFormat, s: if not widget.is_focus(): pritext = _('Invalid Jabber ID') - dialogs.ErrorDialog(pritext, str(s)) + dialogs.ErrorDialog(pritext, str(s), transient_for=self.window) gobject.idle_add(lambda: widget.grab_focus()) return True @@ -2157,7 +2161,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) gobject.idle_add(lambda: widget.grab_focus()) return True @@ -2225,7 +2229,7 @@ except helpers.InvalidFormat, s: if not widget.is_focus(): pritext = _('Invalid Jabber ID') - dialogs.ErrorDialog(pritext, str(s)) + dialogs.ErrorDialog(pritext, str(s), transient_for=self.window) gobject.idle_add(lambda: widget.grab_focus()) return True @@ -2383,7 +2387,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) gobject.idle_add(lambda: widget.grab_focus()) return True if self.option_changed('custom_port', custom_port): @@ -2405,7 +2410,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): @@ -2420,7 +2426,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('') @@ -2453,7 +2459,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) @@ -2461,12 +2467,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) @@ -2582,7 +2589,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: @@ -2619,7 +2627,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 4de47ce434bb -r 37e14b6aed6a 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 @@ -1605,8 +1605,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: add translator notes. Fixes #7427
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset 8fc14a7a37b1 in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=8fc14a7a37b1 description: add translator notes. Fixes #7427 diffstat: src/command_system/implementation/standard.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (27 lines): diff -r 2f67aa4b44d1 -r 8fc14a7a37b1 src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Wed Aug 14 14:32:58 2013 +0200 +++ b/src/command_system/implementation/standard.py Wed Aug 14 14:56:15 2013 +0200 @@ -126,6 +126,7 @@ self.echo(formatted) @command(raw=True, empty=True) + #Do not translate online, away, chat, xa, dnd @doc(_(""" Set the current status @@ -353,6 +354,7 @@ self.connection.gc_set_role(self.room_jid, who, 'none', reason or str()) @command(raw=True) + #Do not translate moderator, participant, visitor, none @doc(_("""Set occupant role in group chat. Role can be given as one of the following values: moderator, participant, visitor, none""")) @@ -364,6 +366,7 @@ self.connection.gc_set_role(self.room_jid, who, role) @command(raw=True) + #Do not translate owner, admin, member, outcast, none @doc(_("""Set occupant affiliation in group chat. Affiliation can be given as one of the following values: owner, admin, member, outcast, none"""))

1 0

gajim: fix error when there is a ' char in the config path. Fixe...
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset eae8639691c6 in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=eae8639691c6 description: fix error when there is a ' char in the config path. Fixes #7344 diffstat: src/common/logger.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 8fc14a7a37b1 -r eae8639691c6 src/common/logger.py --- a/src/common/logger.py Wed Aug 14 14:56:15 2013 +0200 +++ b/src/common/logger.py Wed Aug 14 18:58:48 2013 +0200 @@ -149,7 +149,8 @@ def attach_cache_database(self): try: - self.cur.execute("ATTACH DATABASE '%s' AS cache" % CACHE_DB_PATH) + self.cur.execute("ATTACH DATABASE '%s' AS cache" % \ + CACHE_DB_PATH.replace("'", "''")) except sqlite.Error, e: log.debug("Failed to attach cache database: %s" % str(e))

1 0

gajim: [Darlan] Update Hebrew translation
by Denis Fomin 24 Aug '13

24 Aug '13

changeset f6aef2d5ae33 in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=f6aef2d5ae33 description: [Darlan] Update Hebrew translation diffstat: po/he.po | 1135 ++++++++++++++++++++----------------------------------------- 1 files changed, 368 insertions(+), 767 deletions(-) diffs (truncated from 3707 to 300 lines): diff -r eae8639691c6 -r f6aef2d5ae33 po/he.po --- a/po/he.po Wed Aug 14 18:58:48 2013 +0200 +++ b/po/he.po Wed Aug 14 23:52:24 2013 +0400 @@ -65,7 +65,6 @@ msgid "Gajim: Account Creation Wizard" msgstr "‫Gajim: אשף יצירת חשבון" -# עליך להחזיק #: ../data/gui/account_creation_wizard_window.ui.h:2 msgid "" "You need to have an account in order to connect\n" @@ -74,15 +73,10 @@ "יש צורך בחשבון בכדי להתחבר\n" "אל רשת התקשורת Jabber." -# בו אני רוצה לעשות #: ../data/gui/account_creation_wizard_window.ui.h:4 msgid "I already have an account I want to _use" msgstr "כבר קיים ברשותי _חשבון אשר ברצוני לעשות בו שימוש" -# I want to _register a new account -# אני רוצה _לרשום חשבון חדש -# I want to _register for a new account -# אני רוצה _להירשם לחשבון חדש #: ../data/gui/account_creation_wizard_window.ui.h:5 msgid "I want to _register for a new account" msgstr "ברצוני ל_רשום חשבון חדש" @@ -108,11 +102,6 @@ msgstr "שמו_ר סיסמה" # BUG: a dot at the end -# From: Clipman -# If checked, this option allows to store one image inside the history -# במידה והמשבצת/והאפשרות מסומנת -# במידה ומשבצת/ואפשרות זו מסומנת -# בבוחרך באפשרות זו, Wicd #: ../data/gui/account_creation_wizard_window.ui.h:10 #: ../data/gui/accounts_window.ui.h:21 msgid "If checked, Gajim will remember the password for this account" @@ -163,8 +152,6 @@ msgid "_Advanced" msgstr "_מתקדם" -# הוספת אישור זה לרשימת האישורים המהימנים.\n -# טביעת אצבע (מסוג) SHA1 של האישור:\n #: ../data/gui/account_creation_wizard_window.ui.h:21 msgid "" "Add this certificate to the list of trusted certificates.\n" @@ -183,10 +170,9 @@ "\n" "אנא המתן..." -# מיידית לאחר ש #: ../data/gui/account_creation_wizard_window.ui.h:27 msgid "Connect when I press Finish" -msgstr "התחבר מידית כאשר אני אלחץ על סיים" +msgstr "התחבר כאשר אני אלחץ על סיים" #: ../data/gui/account_creation_wizard_window.ui.h:28 msgid "Set my profile when I connect" @@ -203,8 +189,8 @@ #: ../src/config.py:1738 ../src/config.py:2314 ../src/config.py:2393 #: ../src/config.py:2406 ../src/config.py:3682 ../src/config.py:3757 #: ../src/dialogs.py:315 ../src/dialogs.py:317 ../src/dialogs.py:523 -#: ../src/dialogs.py:536 ../src/roster_window.py:3148 -#: ../src/roster_window.py:3154 ../src/roster_window.py:3159 +#: ../src/dialogs.py:536 ../src/roster_window.py:3149 +#: ../src/roster_window.py:3155 ../src/roster_window.py:3160 msgid "None" msgstr "ללא" @@ -225,7 +211,7 @@ msgstr "מחק" #. Rename -#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5793 +#: ../data/gui/accounts_window.ui.h:5 ../src/roster_window.py:5790 msgid "Re_name" msgstr "_שנה שם" @@ -234,10 +220,9 @@ msgid "_Enable" msgstr "א_פשר" -# אימות אלמוני #: ../data/gui/accounts_window.ui.h:7 msgid "Anonymous authentication" -msgstr "התאמתות אלמונית" +msgstr "אימות אלמוני" #: ../data/gui/accounts_window.ui.h:8 msgid "" @@ -275,7 +260,6 @@ msgid "Chan_ge Password" msgstr "ש_נה סיסמה" -# Omitted: Click to #: ../data/gui/accounts_window.ui.h:13 msgid "Click to change account's password" msgstr "שנה סיסמת חשבון" @@ -301,7 +285,6 @@ msgid "A_djust to status" msgstr "_התאם אל מצב חיבור" -# תשונה #: ../data/gui/accounts_window.ui.h:17 msgid "Priority will change automatically according to your status." msgstr "העדיפות תשתנה אוטומטית בהתאם אל מצב החיבור שלך." @@ -335,7 +318,6 @@ msgid "Account" msgstr "חשבון" -# אתחול #: ../data/gui/accounts_window.ui.h:29 msgid "C_onnect on Gajim startup" msgstr "התחבר בעת ה_פעלת Gajim" @@ -351,17 +333,14 @@ "חשבון זה" # BUG: _underline -# במידה והחיבור #: ../data/gui/accounts_window.ui.h:31 msgid "Auto-reconnect when connection is lost" msgstr "התחבר אוטומטית כאשר החיבור אובד" -# יו_מני שיחות #: ../data/gui/accounts_window.ui.h:32 msgid "Save conversation _logs for all contacts" msgstr "שמור רשו_מות שיחה עבור כל אנשי קשר" -# כוללני #: ../data/gui/accounts_window.ui.h:33 msgid "Synch_ronize account status with global status" msgstr "סנכרן מצב חשבון עם מצב חיבור _גלובלי" @@ -386,25 +365,24 @@ msgid "Use file transfer proxies" msgstr "השתמש במתווכי העברת קובץ" -# שיהיו סיכויים גדולים יותר להעברת קובץ לעבוד #: ../data/gui/accounts_window.ui.h:36 msgid "" "If checked, Gajim will also broadcast some more IPs except from just your " "IP, so file transfer has higher chances of working." msgstr "" "במידה ואפשרות זו מסומנת, Gajim ישדר, בנוסף לכתובת פרוטוקול המרשתת (IP; ‏" -"Internet Protocol) שלך, מספר כתובות IP נוספות, כך שלהעברת קובץ יהיו סיכויים " -"גדולים יותר לעבוד." - -# אכן, זוהי קבוצה כללית. אנא לא להפוך זאת באופן שרירותי ל"רישום" כללי או לכל מילה אחר אשר לא קשורה אל התוכנית +"Internet Protocol) שלך, מספר כתובות IP נוספות, כך שלפעולת העברת קובץ יהיו " +"סיכויים גדולים יותר לעבוד." + +# (קבוצה כללית) #. FIXME: Ugly workaround. #. FIXME: Ugly workaround. #. Maybe we haven't been in any group (defaults to General) #. General group cannot be changed #: ../data/gui/accounts_window.ui.h:37 ../data/gui/preferences_window.ui.h:41 #: ../src/common/contacts.py:135 ../src/dialogs.py:115 ../src/dialogs.py:127 -#: ../src/roster_window.py:3090 ../src/roster_window.py:4220 -#: ../src/roster_window.py:5843 +#: ../src/roster_window.py:3091 ../src/roster_window.py:4217 +#: ../src/roster_window.py:5840 msgid "General" msgstr "כללית" @@ -432,7 +410,6 @@ "סמן את אפשרות זו כדי ש־Gajim ישאל אותך טרם שליחת סיסמתך על פני חיבור לא " "מאובטח." -# חבילות נתונים מסוג #: ../data/gui/accounts_window.ui.h:43 msgid "Send _keep-alive packets" msgstr "ש_לח חבילות keep-alive" @@ -446,7 +423,6 @@ "במידה ואפשרות זו מסומנת, Gajim ישלח חבילות keep-alive כדי למנוע פקיעת זמן של " "חיבור (connection timeout) המביאה לידי ניתוק" -# ה_תאם #: ../data/gui/accounts_window.ui.h:45 msgid "Use cust_om hostname/port" msgstr "השתמש בשם מארח\\פורט מו_תאמים" @@ -540,10 +516,6 @@ msgid "Last Name:" msgstr "שם משפחה:" -# ״ -# " -# דוא\"ל: -# דוא״ל: #: ../data/gui/accounts_window.ui.h:66 #: ../data/gui/zeroconf_information_window.ui.h:8 msgid "E-Mail:" @@ -641,7 +613,6 @@ msgid "Check once more" msgstr "בדוק פעם נוספת" -# "Please wait while the command is sending..." has been turned to "Please wait while the command is being sent..." #: ../data/gui/adhoc_commands_window.ui.h:5 msgid "Please wait while the command is sending..." msgstr "אנא המתן בזמן שהפקודה נשלחת..." @@ -680,7 +651,6 @@ msgid "Description" msgstr "תיאור" -# יש צורך לאתחל #: ../data/gui/advanced_configuration_window.ui.h:4 msgid "NOTE: You should restart Gajim for some settings to take effect" msgstr "הערה: עליך לאתחל את Gajim כדי שהגדרות מסוימות ייכנסו לתוקף" @@ -734,7 +704,6 @@ msgid "Delete MOTD" msgstr "מחק MOTD" -# הודעה יומית #: ../data/gui/advanced_menuitem_menu.ui.h:12 msgid "Deletes Message of the Day" msgstr "מחיקת הודעת היום (Message of the Day)" @@ -757,7 +726,6 @@ msgid "Concede" msgstr "וותר" -# אסירה #: ../data/gui/archiving_preferences_window.ui.h:5 msgid "Forbid" msgstr "אסור" @@ -809,8 +777,8 @@ #: ../data/gui/blocked_contacts_window.ui.h:2 #: ../data/gui/contact_context_menu.ui.h:20 -#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5812 -#: ../src/roster_window.py:5939 ../src/roster_window.py:6072 +#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5809 +#: ../src/roster_window.py:5936 ../src/roster_window.py:6069 msgid "_Unblock" msgstr "_בטל חסימה" @@ -842,10 +810,9 @@ msgid "Enter new password:" msgstr "הזן סיסמה חדשה:" -# לשם #: ../data/gui/change_password_dialog.ui.h:3 msgid "Enter it again for confirmation:" -msgstr "הזן את הסיסמה, פעם נוספת, לאימות:" +msgstr "הזן את הסיסמה, פעם נוספת, לשם אימות:" # ערוך מראש #: ../data/gui/change_status_message_dialog.ui.h:1 @@ -868,7 +835,6 @@ msgid "Type your new status message" msgstr "הקלד הודעת מצב חדשה" -# אתר #: ../data/gui/chat_context_menu.ui.h:1 msgid "_Copy Link Location" msgstr "ה_עתק כתובת מיקום" @@ -920,7 +886,6 @@ msgid "Browse the chat history (Ctrl+H)" msgstr "עיון בהיסטוריית השיחה (Ctrl+H)" -# תפקודיות #: ../data/gui/chat_control.ui.h:6 ../data/gui/groupchat_control.ui.h:7 msgid "Show advanced functions (Alt+D)" msgstr "הצגת פקדים מתקדמים (Alt+D)" @@ -945,44 +910,36 @@ msgstr "" #: ../data/gui/chat_control.ui.h:12 -#, fuzzy msgid "2" -msgstr "2 (דהו)" +msgstr "" #: ../data/gui/chat_control.ui.h:13 -#, fuzzy msgid "3" -msgstr "3 (אבג)" +msgstr "" #: ../data/gui/chat_control.ui.h:14 -#, fuzzy msgid "4" -msgstr "4 (מנ)" +msgstr "" #: ../data/gui/chat_control.ui.h:15 -#, fuzzy msgid "5" -msgstr "5 (יכל)" +msgstr "" #: ../data/gui/chat_control.ui.h:16 -#, fuzzy msgid "6" -msgstr "6 (זחט)" +msgstr "" #: ../data/gui/chat_control.ui.h:17 -#, fuzzy msgid "7"

1 0

gajim: prevent bug when forming a jid. Fixes #7428
by Yann Leboulanger 24 Aug '13

24 Aug '13

changeset 4da818156da7 in /home/hg/repos/gajim branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=4da818156da7 description: prevent bug when forming a jid. Fixes #7428 diffstat: src/common/stanza_session.py | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diffs (14 lines): diff -r f6aef2d5ae33 -r 4da818156da7 src/common/stanza_session.py --- a/src/common/stanza_session.py Wed Aug 14 23:52:24 2013 +0400 +++ b/src/common/stanza_session.py Thu Aug 15 10:00:42 2013 +0200 @@ -83,9 +83,7 @@ def get_to(self): to = str(self.jid) - if self.resource and not to.endswith(self.resource): - to += '/' + self.resource - return to + return gajim.get_jid_without_resource(to) + self.resource def remove_events(self, types): """

1 0

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