Commits

commits@gajim.org

17632 discussions

gajim: fix length of printed string in about tab of vcard window
by Gajim 16 Jun '16

16 Jun '16

changeset 8f80f0e56f0d in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=8f80f0e56f0d description: fix length of printed string in about tab of vcard window diffstat: src/profile_window.py | 2 +- src/vcard.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r 245eea8097ec -r 8f80f0e56f0d src/profile_window.py --- a/src/profile_window.py Thu Jun 16 21:40:15 2016 +0200 +++ b/src/profile_window.py Thu Jun 16 21:49:09 2016 +0200 @@ -288,7 +288,7 @@ else: if i == 'DESC': self.xml.get_object('DESC_textview').get_buffer().set_text( - vcard_[i], len(vcard[i])) + vcard_[i], len(vcard[i].encode('utf-8'))) else: self.set_value(i + '_entry', vcard_[i]) if self.update_progressbar_timeout_id is not None: diff -r 245eea8097ec -r 8f80f0e56f0d src/vcard.py --- a/src/vcard.py Thu Jun 16 21:40:15 2016 +0200 +++ b/src/vcard.py Thu Jun 16 21:49:09 2016 +0200 @@ -240,7 +240,7 @@ else: if i == 'DESC': self.xml.get_object('DESC_textview').get_buffer().set_text( - vcard[i], len(vcard[i])) + vcard[i], len(vcard[i].encode('utf-8'))) elif i != 'jid': # Do not override jid_label self.set_value(i + '_label', vcard[i]) self.vcard_arrived = True

1 0

gajim: fix about tab in vcard
by Gajim 16 Jun '16

16 Jun '16

changeset 245eea8097ec in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=245eea8097ec description: fix about tab in vcard diffstat: src/profile_window.py | 2 +- src/vcard.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r c6f06623f074 -r 245eea8097ec src/profile_window.py --- a/src/profile_window.py Sun May 22 23:09:49 2016 +0200 +++ b/src/profile_window.py Thu Jun 16 21:40:15 2016 +0200 @@ -288,7 +288,7 @@ else: if i == 'DESC': self.xml.get_object('DESC_textview').get_buffer().set_text( - vcard_[i], 0) + vcard_[i], len(vcard[i])) else: self.set_value(i + '_entry', vcard_[i]) if self.update_progressbar_timeout_id is not None: diff -r c6f06623f074 -r 245eea8097ec src/vcard.py --- a/src/vcard.py Sun May 22 23:09:49 2016 +0200 +++ b/src/vcard.py Thu Jun 16 21:40:15 2016 +0200 @@ -240,7 +240,7 @@ else: if i == 'DESC': self.xml.get_object('DESC_textview').get_buffer().set_text( - vcard[i], 0) + vcard[i], len(vcard[i])) elif i != 'jid': # Do not override jid_label self.set_value(i + '_label', vcard[i]) self.vcard_arrived = True

1 0

gajim: prevent a traceback when making metacontact while filteri...
by Gajim 07 Jun '16

07 Jun '16

changeset d03d48f0083c in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=d03d48f0083c description: prevent a traceback when making metacontact while filtering is enabled. Fixes #8341 diffstat: src/roster_window.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 67d97224e7a4 -r d03d48f0083c src/roster_window.py --- a/src/roster_window.py Tue Jun 07 21:21:48 2016 +0200 +++ b/src/roster_window.py Tue Jun 07 22:36:38 2016 +0200 @@ -1688,6 +1688,8 @@ if model.iter_has_child(titer): iter_c = model.iter_children(titer) while iter_c: + if not model[iter_c][C_NAME]: # see #8341 + return False if self.rfilter_string in model[iter_c][C_NAME].decode( 'utf-8').lower(): return True

1 0

gajim: do not show empty groups when filtering roster id showoff...
by Gajim 07 Jun '16

07 Jun '16

changeset 67d97224e7a4 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=67d97224e7a4 description: do not show empty groups when filtering roster id showoffline=True Correctly redraw group icon after filtering. Fixes #8342 diffstat: src/roster_window.py | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diffs (45 lines): diff -r a5053540b806 -r 67d97224e7a4 src/roster_window.py --- a/src/roster_window.py Fri Jun 03 20:47:40 2016 +0200 +++ b/src/roster_window.py Tue Jun 07 21:21:48 2016 +0200 @@ -1521,6 +1521,23 @@ self.tree.expand_row(path, False) self.modelfilter.foreach(func) + # Now redraw group icons for all groups, even hidden ones + def func2(model, path, iter_): + type_ = model[iter_][C_TYPE] + if type_ != 'group': + return + acct = model[iter_][C_ACCOUNT].decode('utf-8') + jid = model[iter_][C_JID].decode('utf-8') + key = acct + jid + if key in self.collapsed_rows: + model[iter_][C_IMG] = gajim.interface.\ + jabber_state_images['16']['closed'] + else: + model[iter_][C_IMG] = gajim.interface.\ + jabber_state_images['16']['opened'] + + self.model.foreach(func2) + def _adjust_account_expand_collapse_state(self, account): """ Expand/collapse account row based on self.collapsed_rows @@ -1587,6 +1604,8 @@ def contact_is_visible(self, contact, account): if self.rfilter_enabled: return self.rfilter_string in contact.get_shown_name().lower() + if gajim.config.get('showoffline'): + return True if self.contact_has_pending_roster_events(contact, account): return True @@ -1644,8 +1663,6 @@ return gajim.config.get('show_transports_group') and \ (gajim.account_is_connected(account) or \ gajim.config.get('showoffline')) - if gajim.config.get('showoffline'): - return True if self.regroup: # C_ACCOUNT for groups depends on the order

1 0

gajim: Add gajim-remote.desktop.in to POTFILES.skip. Fixes #8345
by Gajim 03 Jun '16

03 Jun '16

changeset a5053540b806 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=a5053540b806 description: Add gajim-remote.desktop.in to POTFILES.skip. Fixes #8345 diffstat: autogen.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r dd39d9f43ed8 -r a5053540b806 autogen.sh --- a/autogen.sh Thu Jun 02 21:51:48 2016 +0200 +++ b/autogen.sh Fri Jun 03 20:47:40 2016 +0200 @@ -17,7 +17,7 @@ && ls -1 data/gajim.desktop.in.in data/gajim-remote.desktop.in.in \ src/*.py src/common/*.py src/command_system/*.py src/command_system/implementation/*.py src/common/zeroconf/*.py src/plugins/*.py | grep -v ipython_view.py >> \ po/POTFILES.in \ - && echo -e "data/gajim.desktop.in\nsrc/ipython_view.py" > po/POTFILES.skip || exit 1 + && echo -e "data/gajim.desktop.in\ndata/gajim-remote.desktop.in\nsrc/ipython_view.py" > po/POTFILES.skip || exit 1 if [ $(find plugins/ -name '*.py' | wc -l) -gt 0 ];then ls -1 plugins/*/*.py plugins/*/*.ui >> po/POTFILES.skip fi

1 0

gajim: [mister] Correctly restore metacontact collapse state aft...
by Gajim 02 Jun '16

02 Jun '16

changeset dd39d9f43ed8 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=dd39d9f43ed8 description: [mister] Correctly restore metacontact collapse state after filtering. See #8342 diffstat: src/roster_window.py | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diffs (59 lines): diff -r d10220579f97 -r dd39d9f43ed8 src/roster_window.py --- a/src/roster_window.py Mon May 16 20:24:53 2016 +0200 +++ b/src/roster_window.py Thu Jun 02 21:51:48 2016 +0200 @@ -4186,7 +4186,8 @@ for account in accounts: if group in gajim.groups[account]: # This account has this group gajim.groups[account][group]['expand'] = True - if account + group in self.collapsed_rows: + if account + group in self.collapsed_rows \ + and not self.rfilter_enabled: self.collapsed_rows.remove(account + group) for contact in gajim.contacts.iter_contacts(account): jid = contact.jid @@ -4199,7 +4200,8 @@ self.tree.expand_row(path, False) elif type_ == 'account': account = accounts[0] # There is only one cause we don't use merge - if account in self.collapsed_rows: + if account in self.collapsed_rows \ + and not self.rfilter_enabled: self.collapsed_rows.remove(account) self.draw_account(account) # When we expand, groups are collapsed. Restore expand state @@ -4215,7 +4217,8 @@ account = model[titer][C_ACCOUNT].decode('utf-8') contact = gajim.contacts.get_contact(account, jid) for group in contact.groups: - if account + group + jid in self.collapsed_rows: + if account + group + jid in self.collapsed_rows \ + and not self.rfilter_enabled: self.collapsed_rows.remove(account + group + jid) family = gajim.contacts.get_metacontacts_family(account, jid) nearby_family = \ @@ -4250,11 +4253,13 @@ for account in accounts: if group in gajim.groups[account]: # This account has this group gajim.groups[account][group]['expand'] = False - if account + group not in self.collapsed_rows: + if account + group not in self.collapsed_rows \ + and not self.rfilter_enabled: self.collapsed_rows.append(account + group) elif type_ == 'account': account = accounts[0] # There is only one cause we don't use merge - if account not in self.collapsed_rows: + if account not in self.collapsed_rows \ + and not self.rfilter_enabled: self.collapsed_rows.append(account) self.draw_account(account) elif type_ == 'contact': @@ -4266,7 +4271,8 @@ if not groups: groups = [_('General')] for group in groups: - if account + group + jid not in self.collapsed_rows: + if account + group + jid not in self.collapsed_rows \ + and not self.rfilter_enabled: self.collapsed_rows.append(account + group + jid) family = gajim.contacts.get_metacontacts_family(account, jid) nearby_family = \

1 0

gajim: remember which speller language was use for each contact....
by Gajim 22 May '16

22 May '16

changeset c6f06623f074 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=c6f06623f074 description: remember which speller language was use for each contact. Fixes #8326 diffstat: src/chat_control.py | 26 ++++++++++++-------------- src/gtkspell.py | 15 +++++++++++++-- 2 files changed, 25 insertions(+), 16 deletions(-) diffs (101 lines): diff -r 3ebf1e2b8edf -r c6f06623f074 src/chat_control.py --- a/src/chat_control.py Sat May 21 18:56:01 2016 +0200 +++ b/src/chat_control.py Sun May 22 23:09:49 2016 +0200 @@ -441,11 +441,22 @@ lang = gajim.LANG if lang: try: - gtkspell.Spell(self.msg_textview, lang) + self.spell = gtkspell.Spell(self.msg_textview, lang) self.msg_textview.lang = lang + self.spell.connect('language_changed', self.on_language_changed) except (GObject.GError, RuntimeError, TypeError, OSError): dialogs.AspellDictError(lang) + def on_language_changed(self, spell, lang): + per_type = 'contacts' + if self.type_id == message_control.TYPE_GC: + per_type = 'rooms' + if not gajim.config.get_per(per_type, self.contact.jid): + gajim.config.add_per(per_type, self.contact.jid) + gajim.config.set_per(per_type, self.contact.jid, 'speller_language', + lang) + self.msg_textview.lang = lang + def on_banner_label_populate_popup(self, label, menu): """ Override the default context menu and add our own menutiems @@ -480,19 +491,6 @@ Override the default context menu and we prepend an option to switch languages """ - def _on_select_dictionary(widget, lang): - per_type = 'contacts' - if self.type_id == message_control.TYPE_GC: - per_type = 'rooms' - if not gajim.config.get_per(per_type, self.contact.jid): - gajim.config.add_per(per_type, self.contact.jid) - gajim.config.set_per(per_type, self.contact.jid, 'speller_language', - lang) - spell = gtkspell.get_from_text_view(self.msg_textview) - self.msg_textview.lang = lang - spell.set_language(lang) - widget.set_active(True) - item = Gtk.MenuItem.new_with_mnemonic(_('_Undo')) menu.prepend(item) id_ = item.connect('activate', self.msg_textview.undo) diff -r 3ebf1e2b8edf -r c6f06623f074 src/gtkspell.py --- a/src/gtkspell.py Sat May 21 18:56:01 2016 +0200 +++ b/src/gtkspell.py Sun May 22 23:09:49 2016 +0200 @@ -17,6 +17,7 @@ ## You should have received a copy of the GNU General Public License ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from gi.repository import GObject from gi.repository import Gtk import gi gi.require_version('GtkSpell', '3.0') @@ -31,9 +32,14 @@ return f -class Spell(object): +class Spell(GObject.GObject): + __gsignals__ = { + 'language_changed': (GObject.SignalFlags.RUN_FIRST, None, (str,)) + } - def __init__(self, textview, language=None, create=True): + def __init__(self, textview, language=None, create=True, jid=None, + per_type=None): + GObject.GObject.__init__(self) if not isinstance(textview, Gtk.TextView): raise TypeError("Textview must be derived from Gtk.TextView") spell = GtkSpell.Checker.get_from_text_view(textview) @@ -47,6 +53,7 @@ raise OSError("Unable to attach spell object.") if not self.spell.set_language(language): raise OSError("Unable to set language: '%s'" % language) + self.spell.connect('language-changed', self.on_language_changed) else: if spell: @@ -54,6 +61,9 @@ else: raise RuntimeError("Textview has no Spell object attached") + def on_language_changed(self, spell, lang): + self.emit('language_changed', lang) + @ensure_attached def set_language(self, language): if not self.spell.set_language(language): @@ -68,6 +78,7 @@ self.spell.detach() self.spell = None +GObject.type_register(Spell) def get_from_text_view(textview): return Spell(textview, create=False)

1 0

gajim: fix attribute name
by Gajim 21 May '16

21 May '16

changeset aab71c751b67 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=aab71c751b67 description: fix attribute name diffstat: src/common/events.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 5fca8868e23d -r aab71c751b67 src/common/events.py --- a/src/common/events.py Wed Apr 27 02:53:43 2016 +0300 +++ b/src/common/events.py Sat May 21 18:55:45 2016 +0200 @@ -129,7 +129,7 @@ class GcInvitationtEvent(Event): type_ = 'gc-invitation' - def __init__(self, room_jid, reason, password, is_continued, from_jid, + def __init__(self, room_jid, reason, password, is_continued, jid_from, time_=None, show_in_roster=False, show_in_systray=True): Event.__init__(self, time_, show_in_roster=show_in_roster, show_in_systray=show_in_systray) @@ -137,7 +137,7 @@ self.reason = reason self.password = password self.is_continued = is_continued - self.from_jid = from_jid + self.jid_from = jid_from class FileRequestEvent(Event): type_ = 'file-request'

1 0

gajim: fix listing GPG keys
by Gajim 21 May '16

21 May '16

changeset 3ebf1e2b8edf in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=3ebf1e2b8edf description: fix listing GPG keys diffstat: src/roster_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r aab71c751b67 -r 3ebf1e2b8edf src/roster_window.py --- a/src/roster_window.py Sat May 21 18:55:45 2016 +0200 +++ b/src/roster_window.py Sat May 21 18:56:01 2016 +0200 @@ -3213,7 +3213,7 @@ 'attached_gpg_keys').split() keys = {} keyID = _('None') - for i in list(range(len(attached_keys)/2)): + for i in list(range(int(len(attached_keys)/2))): keys[attached_keys[2*i]] = attached_keys[2*i+1] if attached_keys[2*i] == contact.jid: keyID = attached_keys[2*i+1]

1 0

gajim: fix some log calls
by Gajim 16 May '16

16 May '16

changeset d10220579f97 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=d10220579f97 description: fix some log calls diffstat: src/common/socks5.py | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diffs (49 lines): diff -r 7452dc852b30 -r d10220579f97 src/common/socks5.py --- a/src/common/socks5.py Wed May 11 21:40:30 2016 +0200 +++ b/src/common/socks5.py Mon May 16 20:24:53 2016 +0200 @@ -132,13 +132,19 @@ else: fp = fingerprint if receiving: - log.debug('Trying to connect as receiver to cid ' + streamhost['cid']) + if 'cid' in streamhost: # jingle + log.debug('Trying to connect as receiver to cid ' + streamhost['cid']) + else: # SI + log.debug('Trying to connect as receiver to host ' + streamhost['host']) file_props.type_ = 'r' socks5obj = Socks5ReceiverClient(self.idlequeue, streamhost, sid, file_props, fingerprint=fp) self.add_sockobj(account, socks5obj) else: - log.debug('Trying to connect as sender to cid' + streamhost['cid']) + if 'cid' in streamhost: #jingle + log.debug('Trying to connect as sender to cid ' + streamhost['cid']) + else: # SI + log.debug('Trying to connect as sender to host ' + streamhost['host']) if file_props.sha_str: idx = file_props.sha_str else: @@ -165,7 +171,10 @@ Called when there is a host connected to one of the senders's streamhosts. Stop other attempts for connections """ - log.debug('Connected to cid ' + streamhost['cid']) + if 'cid' in streamhost: # jingle + log.debug('Connected to cid ' + streamhost['cid']) + else: # SI + log.debug('Connected to host ' + streamhost['host']) for host in file_props.streamhosts: if host != streamhost and 'idx' in host: if host['state'] == 1: @@ -227,7 +236,10 @@ """ Called when we loose connection during transfer """ - log.debug('Connection refused to cid ' + streamhost['cid']) + if 'cid' in streamhost: # jingle + log.debug('Connection refused to cid ' + streamhost['cid']) + else: # SI + log.debug('Connection refused to host ' + streamhost['host']) if file_props is None: return streamhost['state'] = -1

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