Commits August 2015

commits@gajim.org

1 participants
40 discussions

gajim: add option to en(dis)able XEP-0136/0313. Fixes #8127
by Gajim 20 Aug '15

20 Aug '15

changeset d2c270eb2f7c 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=d2c270eb2f7c description: add option to en(dis)able XEP-0136/0313. Fixes #8127 diffstat: data/gui/accounts_window.ui | 23 ++++++++++++++++++++--- src/common/config.py | 1 + src/config.py | 8 ++++++++ src/gui_interface.py | 6 ++++-- 4 files changed, 33 insertions(+), 5 deletions(-) diffs (111 lines): diff -r 37c9f39aa69d -r d2c270eb2f7c data/gui/accounts_window.ui --- a/data/gui/accounts_window.ui Wed Aug 12 22:13:29 2015 +0200 +++ b/data/gui/accounts_window.ui Thu Aug 20 15:08:53 2015 +0200 @@ -556,6 +556,23 @@ </packing> </child> <child> + <object class="GtkCheckButton" id="sync_logs_with_server_checkbutton1"> + <property name="label" translatable="yes">Synchronize logs with server</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_sync_logs_with_server_checkbutton_toggled"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> + </child> + <child> <object class="GtkCheckButton" id="sync_with_global_status_checkbutton1"> <property name="label" translatable="yes">Synch_ronize account status with global status</property> <property name="visible">True</property> @@ -569,7 +586,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> @@ -585,7 +602,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> @@ -602,7 +619,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> </object> diff -r 37c9f39aa69d -r d2c270eb2f7c src/common/config.py --- a/src/common/config.py Wed Aug 12 22:13:29 2015 +0200 +++ b/src/common/config.py Thu Aug 20 15:08:53 2015 +0200 @@ -362,6 +362,7 @@ 'custom_host': [ opt_str, '', '', True ], 'sync_with_global_status': [ opt_bool, False, ], 'no_log_for': [ opt_str, '', _('Space separated list of JIDs for which you do not want to store logs. You can also add account name to log nothing for this account.')], + 'sync_logs_with_server': [ opt_bool, True, _('Download logs stored on server on Gajim startup if server supports XEP-0136 or XEP-0313')], 'allow_no_log_for': [ opt_str, '', _('Space separated list of JIDs for which you accept to not log conversations if he does not want to.')], 'minimized_gc': [ opt_str, '' ], 'attached_gpg_keys': [ opt_str, '' ], diff -r 37c9f39aa69d -r d2c270eb2f7c src/config.py --- a/src/config.py Wed Aug 12 22:13:29 2015 +0200 +++ b/src/config.py Thu Aug 20 15:08:53 2015 +0200 @@ -1963,6 +1963,8 @@ else: self.xml.get_object('log_history_checkbutton1').set_active(True) + self.xml.get_object('sync_logs_with_server_checkbutton1').set_active( + gajim.config.get_per('accounts', account, 'sync_logs_with_server')) self.xml.get_object('sync_with_global_status_checkbutton1').set_active( gajim.config.get_per('accounts', account, 'sync_with_global_status')) @@ -2318,6 +2320,12 @@ gajim.config.set_per('accounts', self.current_account, 'no_log_for', ' '.join(list_no_log_for)) + def on_sync_logs_with_server_checkbutton_toggled(self, widget): + if self.ignore_events: + return + self.on_checkbutton_toggled(widget, 'sync_logs_with_server', + account=self.current_account) + def on_sync_with_global_status_checkbutton_toggled(self, widget): if self.ignore_events: return diff -r 37c9f39aa69d -r d2c270eb2f7c src/gui_interface.py --- a/src/gui_interface.py Wed Aug 12 22:13:29 2015 +0200 +++ b/src/gui_interface.py Thu Aug 20 15:08:53 2015 +0200 @@ -1138,13 +1138,15 @@ # Else disable autoaway gajim.sleeper_state[account] = 'off' - if obj.conn.archiving_136_supported: + if obj.conn.archiving_136_supported and gajim.config.get_per('accounts', + account, 'sync_logs_with_server'): # Start merging logs from server obj.conn.request_modifications_page(gajim.config.get_per('accounts', account, 'last_archiving_time')) gajim.config.set_per('accounts', account, 'last_archiving_time', time.strftime('%Y-%m-%dT%H:%M:%SZ', time.gmtime())) - if obj.conn.archiving_313_supported: + if obj.conn.archiving_313_supported and gajim.config.get_per('accounts', + account, 'sync_logs_with_server'): mam_id = gajim.config.get_per('accounts', account, 'last_mam_id') if mam_id: obj.conn.request_archive(after=mam_id)

1 0

python-nbxmpp: correctly convert unicode to bytes
by Python-nbxmpp 16 Aug '15

16 Aug '15

changeset 1affd30d986f in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=1affd30d986f description: correctly convert unicode to bytes diffstat: nbxmpp/auth_nb.py | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diffs (38 lines): diff -r ffa6dc7501b6 -r 1affd30d986f nbxmpp/auth_nb.py --- a/nbxmpp/auth_nb.py Sun Jul 26 13:10:42 2015 +0200 +++ b/nbxmpp/auth_nb.py Sun Aug 16 21:34:37 2015 +0200 @@ -110,7 +110,7 @@ :param username: XMPP username :param password: XMPP password :param on_sasl: Callback, will be called after each SASL auth-step. - :param channel_binding: TLS channel binding data, None if the + :param channel_binding: TLS channel binding data, None if the binding data is not available :param auth_mechs: Set of valid authentication mechanisms. Possible entries are: @@ -184,11 +184,11 @@ return self.mecs = set( - mec.getData() - for mec + mec.getData() + for mec in feats.getTag('mechanisms', namespace=NS_SASL).getTags('mechanism') ) & self.enabled_auth_mechs - + # Password based authentication mechanism ordered by strength. # If the server supports a mechanism disable all weaker mechanisms. password_auth_mechs_strength = ['SCRAM-SHA-1-PLUS', 'SCRAM-SHA-1', @@ -422,8 +422,8 @@ r = 'c=' + scram_base64(self.scram_gs2) else: # Channel binding data goes in here too. - r = 'c=' + scram_base64(bytes(self.scram_gs2) - + self.channel_binding) + r = 'c=' + scram_base64(self.scram_gs2.encode('utf-8') + + self.channel_binding) r += ',r=' + data['r'] self.scram_soup += r self.scram_soup = self.scram_soup.encode('utf-8')

1 0

gajim: use introspection instead of ctype to use gtkspell
by Gajim 16 Aug '15

16 Aug '15

changeset 6614fa79b26c in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=6614fa79b26c description: use introspection instead of ctype to use gtkspell diffstat: src/gtkspell.py | 58 +++++++++++++------------------------------------------- 1 files changed, 14 insertions(+), 44 deletions(-) diffs (100 lines): diff -r 911e8772dd7c -r 6614fa79b26c src/gtkspell.py --- a/src/gtkspell.py Sat Aug 15 22:16:45 2015 +0200 +++ b/src/gtkspell.py Sun Aug 16 14:22:04 2015 +0200 @@ -1,6 +1,7 @@ ## src/gtkspell.py ## ## (C) 2008 Thorsten P. 'dGhvcnN0ZW5wIEFUIHltYWlsIGNvbQ==\n'.decode("base64") +## (C) 2015 Yann Leboulanger <asterix AT lagaule.org> ## ## This file is part of Gajim. ## @@ -16,40 +17,8 @@ ## You should have received a copy of the GNU General Public License ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -import ctypes -import ctypes.util - from gi.repository import Gtk - - -gboolean = ctypes.c_int -gchar_p = ctypes.c_char_p -gerror_p = ctypes.c_void_p -gobject_p = ctypes.c_void_p -gtkspell_p = ctypes.c_void_p -gtktextview_p = ctypes.c_void_p - - -class PyGObject(ctypes.Structure): - _fields_ = [ - ("PyObject_HEAD", ctypes.c_byte * object.__basicsize__), - ("obj", gobject_p) - ] - - -libgtkspell_path = ctypes.util.find_library("gtkspell") -if libgtkspell_path == None: - raise ImportError("libgtkspell not found") -libgtkspell = ctypes.cdll.LoadLibrary(libgtkspell_path) -libgtkspell.gtkspell_new_attach.restype = gtkspell_p -libgtkspell.gtkspell_new_attach.argtypes = [gtktextview_p, gchar_p, gerror_p] -libgtkspell.gtkspell_set_language.restype = gboolean -libgtkspell.gtkspell_set_language.argtypes = [gtkspell_p, gchar_p, gerror_p] -libgtkspell.gtkspell_recheck_all.argtypes = [gtkspell_p] -libgtkspell.gtkspell_get_from_text_view.restype = gtkspell_p -libgtkspell.gtkspell_get_from_text_view.argtypes = [gtktextview_p] -libgtkspell.gtkspell_detach.argtypes = [gtkspell_p] - +from gi.repository import GtkSpell def ensure_attached(func): def f(self, *args, **kwargs): @@ -65,16 +34,18 @@ def __init__(self, textview, language=None, create=True): if not isinstance(textview, Gtk.TextView): raise TypeError("Textview must be derived from Gtk.TextView") - tv = PyGObject.from_address(id(textview)).obj - spell = libgtkspell.gtkspell_get_from_text_view(tv) + spell = GtkSpell.Checker.get_from_text_view(textview) if create: if spell: raise RuntimeError("Textview has already a Spell obj attached") - self.spell = libgtkspell.gtkspell_new_attach(tv, language.encode( - 'utf-8'), None) + self.spell = GtkSpell.Checker.new() if not self.spell: - raise OSError("Unable to attach spell object. " - "Language: '%s'" % str(language)) + raise OSError("Unable to create spell object.") + if not self.spell.attach(textview): + raise OSError("Unable to attach spell object.") + if not self.spell.set_language(language): + raise OSError("Unable to set language: '%s'" % language) + else: if spell: self.spell = spell @@ -83,17 +54,16 @@ @ensure_attached def set_language(self, language): - if libgtkspell.gtkspell_set_language(self.spell, language.encode( - 'utf-8'), None) == 0: - raise OSError("Unable to set language '%s'" % str(language)) + if not self.spell.set_language(language): + raise OSError("Unable to set language: '%s'" % language) @ensure_attached def recheck_all(self): - libgtkspell.gtkspell_recheck_all(self.spell) + self.spell.recheck_all() @ensure_attached def detach(self): - libgtkspell.gtkspell_detach(self.spell) + self.spell.detach() self.spell = None

1 0

gajim: place roster tooltips correctly.
by Gajim 15 Aug '15

15 Aug '15

changeset 911e8772dd7c in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=911e8772dd7c description: place roster tooltips correctly. diffstat: src/roster_window.py | 2 +- src/tooltips.py | 54 +++++++++++++++++++++++++++++---------------------- 2 files changed, 32 insertions(+), 24 deletions(-) diffs (91 lines): diff -r 00b5461290f1 -r 911e8772dd7c src/roster_window.py --- a/src/roster_window.py Mon Aug 10 23:12:12 2015 +0200 +++ b/src/roster_window.py Sat Aug 15 22:16:45 2015 +0200 @@ -4114,7 +4114,7 @@ self.tree.expand_row(path, False) return if self.rfilter_enabled: - Gobject.idle_add(self.disable_rfilter) + GObject.idle_add(self.disable_rfilter) jid = model[path][C_JID] resource = None contact = gajim.contacts.get_contact_with_highest_priority(account, jid) diff -r 00b5461290f1 -r 911e8772dd7c src/tooltips.py --- a/src/tooltips.py Mon Aug 10 23:12:12 2015 +0200 +++ b/src/tooltips.py Sat Aug 15 22:16:45 2015 +0200 @@ -73,6 +73,7 @@ self.cur_data = None self.check_last_time = None self.shown = False + self.position_computed = False def populate(self, data): """ @@ -115,30 +116,36 @@ self.hide_tooltip() def on_size_allocate(self, widget, rect): - half_width = rect.width / 2 + 1 - if self.preferred_position[1] + rect.height > self.screen.get_height(): - # flip tooltip up - self.preferred_position[1] -= rect.height + self.widget_height + 8 - if self.preferred_position[1] < 0: - self.preferred_position[1] = self.screen.get_height() - \ - rect.height - 2 + if not self.position_computed: + half_width = rect.width / 2 + 1 + if self.preferred_position[1] + rect.height > \ + self.screen.get_height(): + # flip tooltip up + self.preferred_position[1] -= rect.height + self.widget_height \ + + 8 + if self.preferred_position[1] < 0: + self.preferred_position[1] = self.screen.get_height() - \ + rect.height - 2 - if self.preferred_position[0] + rect.width + 7 < \ - self.screen.get_width(): - self.preferred_position[0] = self.preferred_position[0] + 7 - else: - self.preferred_position[0] = self.preferred_position[0] - \ - rect.width - 7 - self.win.move(self.preferred_position[0], - self.preferred_position[1]) - return - if self.preferred_position[0] < half_width: - self.preferred_position[0] = 0 - elif self.preferred_position[0] + rect.width > \ - self.screen.get_width() + half_width: - self.preferred_position[0] = self.screen.get_width() - rect.width - elif not self.check_last_time: - self.preferred_position[0] -= half_width + if self.preferred_position[0] + rect.width + 7 < \ + self.screen.get_width(): + self.preferred_position[0] = self.preferred_position[0]\ + + 7 + else: + self.preferred_position[0] = self.preferred_position[0]\ + - rect.width - 7 + self.win.move(self.preferred_position[0], + self.preferred_position[1]) + return + if self.preferred_position[0] < half_width: + self.preferred_position[0] = 0 + elif self.preferred_position[0] + rect.width > \ + self.screen.get_width() + half_width: + self.preferred_position[0] = self.screen.get_width() - \ + rect.width + elif not self.check_last_time: + self.preferred_position[0] -= half_width + self.position_computed = True self.win.move(self.preferred_position[0], self.preferred_position[1]) def show_tooltip(self, data, widget_height, widget_y_position): @@ -151,6 +158,7 @@ """ if self.shown: return + self.position_computed = False self.cur_data = data # set tooltip contents self.populate(data)

1 0

gajim: fix calling gnupg.list_keys. Fixes #8122
by Gajim 12 Aug '15

12 Aug '15

changeset 37c9f39aa69d 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=37c9f39aa69d description: fix calling gnupg.list_keys. Fixes #8122 diffstat: src/common/gpg.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diffs (13 lines): diff -r 706f2c75e2c3 -r 37c9f39aa69d src/common/gpg.py --- a/src/common/gpg.py Sun Aug 09 13:48:02 2015 +0200 +++ b/src/common/gpg.py Wed Aug 12 22:13:29 2015 +0200 @@ -56,8 +56,7 @@ trust = False if not trust: # check that we'll be able to encrypt - result = super(GnuPG, self).list_keys(recipients, - keys=recipients) + result = super(GnuPG, self).list_keys(keys=recipients) for key in result: if key['trust'] not in ('f', 'u'): return '', 'NOT_TRUSTED'

1 0

gajim-website: new windows installer
by Gajim Website 11 Aug '15

11 Aug '15

changeset 5c2bedfaf0c9 in /home/hg/repos/gajim-website author: Yann Leboulanger <asterix(a)lagaule.org> details:http://hg.gajim.org/gajim-website?cmd=changeset;node=5c2bedfaf0c9 description: new windows installer diffstat: downloads.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 3d923a1e852c -r 5c2bedfaf0c9 downloads.php --- a/downloads.php Fri Jul 31 14:34:04 2015 +0200 +++ b/downloads.php Tue Aug 11 21:36:22 2015 +0200 @@ -201,7 +201,7 @@ #13)Windows print "<div id='windows'>\n"; print "<h2>Windows:</h2>\n"; -print _("There is a ")." <a href='downloads/".$download_folder."/gajim-".$last_version."-1.exe'>"._("Gajim installer")."</a>.\n"; +print _("There is a ")." <a href='downloads/".$download_folder."/gajim-".$last_version."-2.exe'>"._("Gajim installer")."</a>.\n"; print ("<br/>\n"); #print _("Here is a")." <a href='downloads/0.16/gajim-0.16-alpha2-1.exe'>"._("Gajim installer")."</a> "; #printf(_("for %s version "), "0.16-alpha2\n");

1 0

gajim: make ADE readable
by Gajim 10 Aug '15

10 Aug '15

changeset 00b5461290f1 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=00b5461290f1 description: make ADE readable diffstat: src/advanced_configuration_window.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (27 lines): diff -r f98c7a3df18a -r 00b5461290f1 src/advanced_configuration_window.py --- a/src/advanced_configuration_window.py Tue Aug 04 16:42:59 2015 +0200 +++ b/src/advanced_configuration_window.py Mon Aug 10 23:12:12 2015 +0200 @@ -26,6 +26,7 @@ from gi.repository import Gtk import gtkgui_helpers from gi.repository import GLib +from gi.repository import Pango from common import gajim from common import helpers @@ -112,6 +113,7 @@ renderer_text = Gtk.CellRendererText() renderer_text.connect('edited', self.on_config_edited) + renderer_text.set_property('ellipsize', Pango.EllipsizeMode.END) col = Gtk.TreeViewColumn(_('Value'),renderer_text, text = 1) treeview.insert_column(col, -1) col.set_cell_data_func(renderer_text, self.cb_value_column_data) @@ -123,7 +125,6 @@ renderer_text = Gtk.CellRendererText() col = Gtk.TreeViewColumn(_('Type'), renderer_text, text = 2) treeview.insert_column(col, -1) - col.props.expand = True col.props.sizing = Gtk.TreeViewColumnSizing.FIXED treeview.set_model(self.modelfilter)

1 0

gajim: allow to add EventBox to conversation textview for plugin...
by Gajim 09 Aug '15

09 Aug '15

changeset 706f2c75e2c3 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=706f2c75e2c3 description: allow to add EventBox to conversation textview for plugins for example. diffstat: src/conversation_textview.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diffs (15 lines): diff -r dc6380e97f46 -r 706f2c75e2c3 src/conversation_textview.py --- a/src/conversation_textview.py Fri Aug 07 13:56:28 2015 +0200 +++ b/src/conversation_textview.py Sun Aug 09 13:48:02 2015 +0200 @@ -122,6 +122,11 @@ if not parent: self._disconnect_signals() return + if isinstance(parent, gtk.EventBox): + parent = parent.get_parent() + if not parent: + self._disconnect_signals() + return self._do_connect(parent, 'style-set', self.do_queue_draw) self._do_connect(parent, 'focus-in-event', self.do_queue_draw)

1 0

gajim: fix reading secrets file under windows. Fixes #8118
by Gajim 07 Aug '15

07 Aug '15

changeset dc6380e97f46 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=dc6380e97f46 description: fix reading secrets file under windows. Fixes #8118 diffstat: src/secrets.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r dff4fba5ceb7 -r dc6380e97f46 src/secrets.py --- a/src/secrets.py Fri Jul 31 14:27:30 2015 +0200 +++ b/src/secrets.py Fri Aug 07 13:56:28 2015 +0200 @@ -96,7 +96,7 @@ def load_secrets(filename): global Secrets - f = open(filename, 'rb') + f = open(filename, 'r') try: secrets = pickle.load(f)

1 0

gajim: specify module version before importing
by Gajim 04 Aug '15

04 Aug '15

changeset f98c7a3df18a in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=f98c7a3df18a description: specify module version before importing diffstat: src/features_window.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (19 lines): diff -r 29d066279e93 -r f98c7a3df18a src/features_window.py --- a/src/features_window.py Fri Jul 31 14:27:30 2015 +0200 +++ b/src/features_window.py Tue Aug 04 16:42:59 2015 +0200 @@ -25,6 +25,7 @@ import os import sys +import gi from gi.repository import Gtk import gtkgui_helpers @@ -194,6 +195,7 @@ if kwalletbinding.kwallet_available(): return True try: + gi.require_version('GnomeKeyring', '1.0') from gi.repository import GnomeKeyring except Exception: return False

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2015