Commits October 2016

commits@gajim.org

1 participants
87 discussions

gajim-plugins: Incremented plugin versions changed in last commit
by Gajim Plugins 12 Oct '16

12 Oct '16

changeset f5a86da044ab in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: gtk3 details:gajim-plugins?cmd=changeset;node=f5a86da044ab description: Incremented plugin versions changed in last commit diffstat: juick/manifest.ini | 2 +- url_shortener/manifest.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r bde54bde9bdf -r f5a86da044ab juick/manifest.ini --- a/juick/manifest.ini Wed Oct 12 02:55:32 2016 +0200 +++ b/juick/manifest.ini Wed Oct 12 02:56:37 2016 +0200 @@ -1,7 +1,7 @@ [info] name: Juick short_name: Juick -version: 0.9.4 +version: 0.9.5 description: Clickable Juick links , Juick nicks, preview Juick picturs. The key combination alt + up in the textbox allow insert the number of last message (comment or topic). authors: Denis Fomin <fominde(a)gmail.com> diff -r bde54bde9bdf -r f5a86da044ab url_shortener/manifest.ini --- a/url_shortener/manifest.ini Wed Oct 12 02:55:32 2016 +0200 +++ b/url_shortener/manifest.ini Wed Oct 12 02:56:37 2016 +0200 @@ -1,7 +1,7 @@ [info] name: Url Shortener short_name: url_shortener -version: 0.3.4 +version: 0.3.5 description: Plugin that allows users to shorten a long URL in messages. For example, you can turn this link: https://trac.gajim.org/timeline

1 0

python-nbxmpp: Add markable namespace
by Python-nbxmpp 12 Oct '16

12 Oct '16

changeset 60c74f3e7b1b in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=60c74f3e7b1b description: Add markable namespace diffstat: nbxmpp/protocol.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (15 lines): diff -r 4dec26e5cd71 -r 60c74f3e7b1b nbxmpp/protocol.py --- a/nbxmpp/protocol.py Thu Jul 28 07:44:57 2016 +0200 +++ b/nbxmpp/protocol.py Wed Oct 12 02:12:49 2016 +0200 @@ -160,8 +160,9 @@ NS_DATA_LAYOUT = 'http://jabber.org/protocol/xdata-layout' # XEP-0141 NS_DATA_VALIDATE = 'http://jabber.org/protocol/xdata-validate' # XEP-0122 NS_XMPP_STREAMS = 'urn:ietf:params:xml:ns:xmpp-streams' -NS_RECEIPTS = 'urn:xmpp:receipts' -NS_PUBKEY_PUBKEY = 'urn:xmpp:pubkey:2' # XEP-0189 +NS_RECEIPTS = 'urn:xmpp:receipts' # XEP-0184 +NS_MARKABLE = 'urn:xmpp:chat-markers:0' # XEP-0333 +NS_PUBKEY_PUBKEY = 'urn:xmpp:pubkey:2' # XEP-0189 NS_PUBKEY_REVOKE = 'urn:xmpp:revoke:2' NS_PUBKEY_ATTEST = 'urn:xmpp:attest:2' NS_STREAM_MGMT = 'urn:xmpp:sm:2' # XEP-198

1 0

gajim: default branch is 0.16.10
by Gajim 11 Oct '16

11 Oct '16

changeset 09ffc58c0df5 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=09ffc58c0df5 description: default branch is 0.16.10 diffstat: ChangeLog | 7 +++++++ autogen.sh | 2 +- gajim.nsi | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diffs (36 lines): diff -r b00c380d9994 -r 09ffc58c0df5 ChangeLog --- a/ChangeLog Fri Jun 03 20:47:40 2016 +0200 +++ b/ChangeLog Tue Oct 11 23:15:15 2016 +0200 @@ -1,3 +1,10 @@ +Gajim 0.16.6 ( September 2016) + + * Fix using gpg2 + * Improve message receips usage + * Improve roster filtering + * several minor bugs + Gajim 0.16.5 (28 December 2015) * Improve MAM implementation diff -r b00c380d9994 -r 09ffc58c0df5 autogen.sh --- a/autogen.sh Fri Jun 03 20:47:40 2016 +0200 +++ b/autogen.sh Tue Oct 11 23:15:15 2016 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.16.5" + gajimversion="0.16.10.2" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff -r b00c380d9994 -r 09ffc58c0df5 gajim.nsi --- a/gajim.nsi Fri Jun 03 20:47:40 2016 +0200 +++ b/gajim.nsi Tue Oct 11 23:15:15 2016 +0200 @@ -155,7 +155,7 @@ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" "$INSTDIR\Uninstall.exe" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayIcon" "$INSTDIR\build\Gajim.exe" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.16.4" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.16.10" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/" WriteUninstaller "$INSTDIR\Uninstall.exe"

1 0

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

11 Oct '16

changeset b00c380d9994 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=b00c380d9994 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 694045d6273c -r b00c380d9994 autogen.sh --- a/autogen.sh Tue Oct 11 21:02:30 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: fix configure to require python3
by Gajim 11 Oct '16

11 Oct '16

changeset 694045d6273c in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=694045d6273c description: fix configure to require python3 diffstat: configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r f36fd235b49d -r 694045d6273c configure.ac --- a/configure.ac Tue Oct 11 09:51:31 2016 +0100 +++ b/configure.ac Tue Oct 11 21:02:30 2016 +0200 @@ -36,7 +36,7 @@ ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" AC_SUBST(ACLOCAL_AMFLAGS) -AM_PATH_PYTHON([2.5]) +AM_PATH_PYTHON([3.5]) dnl **** dnl enable installation in python-2.x/site-packages/gajim

1 0

gajim-plugins: [Linus Heckemann] Fix API change for print_specia...
by Gajim Plugins 11 Oct '16

11 Oct '16

changeset 362fab6a454d in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chelo.at> branches: gtk3 details:gajim-plugins?cmd=changeset;node=362fab6a454d description: [Linus Heckemann] Fix API change for print_special_text, and GTK deprecation warning diffstat: url_image_preview/manifest.ini | 2 +- url_image_preview/url_image_preview.py | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diffs (38 lines): diff -r 1ef6c127f3ab -r 362fab6a454d url_image_preview/manifest.ini --- a/url_image_preview/manifest.ini Mon Oct 10 14:28:41 2016 +0100 +++ b/url_image_preview/manifest.ini Tue Oct 11 12:07:42 2016 +0200 @@ -1,7 +1,7 @@ [info] name: Url image preview short_name: url_image_preview -version: 0.5.4 +version: 0.5.5 description: Url image preview in chatbox. authors = Denis Fomin <fominde(a)gmail.com> Yann Leboulanger <asterix(a)lagaule.org> diff -r 1ef6c127f3ab -r 362fab6a454d url_image_preview/url_image_preview.py --- a/url_image_preview/url_image_preview.py Mon Oct 10 14:28:41 2016 +0100 +++ b/url_image_preview/url_image_preview.py Tue Oct 11 12:07:42 2016 +0200 @@ -46,7 +46,7 @@ self.controls = [] def print_special_text(self, tv, special_text, other_tags, graphics=True, - additional_data): + additional_data={}): for control in self.controls: if control.chat_control.conv_textview != tv: continue @@ -142,7 +142,12 @@ self.xml.set_translation_domain('gajim_plugins') self.xml.add_objects_from_file(self.GTK_BUILDER_FILE_PATH, ['vbox1']) self.preview_size_spinbutton = self.xml.get_object('preview_size') - adjustment = Gtk.Adjustment(20, 10, 512, 1, 10, 0) + adjustment = Gtk.Adjustment(value=20, + lower=10, + upper=512, + step_increment=1, + page_increment=10, + page_size=0) self.preview_size_spinbutton.set_adjustment(adjustment) vbox = self.xml.get_object('vbox1') self.get_child().pack_start(vbox, True, True, 0)

1 0

gajim: Allow startup even with malformed plugin manifests
by Gajim 11 Oct '16

11 Oct '16

changeset f36fd235b49d in /home/hg/repos/gajim author: Linus Heckemann <git(a)sphalerite.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=f36fd235b49d description: Allow startup even with malformed plugin manifests diffstat: src/plugins/pluginmanager.py | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diffs (21 lines): diff -r bbb2c16e481d -r f36fd235b49d src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Mon Oct 10 20:54:15 2016 +0200 +++ b/src/plugins/pluginmanager.py Tue Oct 11 09:51:31 2016 +0100 @@ -447,9 +447,14 @@ # read metadata from manifest.ini conf.remove_section('info') - conf_file = open(manifest_path, encoding='utf-8') - conf.read_file(conf_file) - conf_file.close() + with open(manifest_path, encoding='utf-8') as conf_file: + try: + conf.read_file(conf_file) + except configparser.Error: + log.warning(("Plugin {plugin} not loaded, error loading" + " manifest").format(plugin=elem_name) + , exc_info=True) + continue min_v = conf.get('info', 'min_gajim_version', fallback=None) max_v = conf.get('info', 'max_gajim_version', fallback=None)

1 0

gajim: Support old print_status tag in Bookmarks
by Gajim 10 Oct '16

10 Oct '16

changeset bbb2c16e481d in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=bbb2c16e481d description: Support old print_status tag in Bookmarks diffstat: src/common/connection_handlers_events.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diffs (16 lines): diff -r c9ab416e87df -r bbb2c16e481d src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Oct 10 19:10:18 2016 +0200 +++ b/src/common/connection_handlers_events.py Mon Oct 10 20:54:15 2016 +0200 @@ -518,8 +518,10 @@ minimize_val = minimize_val.getData() print_status = conf.getTag('print_status', namespace=NS_GAJIM_BM) - if not print_status: - print_status = conf.getTagData('show_status') + if not print_status: # not there, try old Gajim behaviour + print_status = conf.getTagData('print_status') + if not print_status: # not there, try old Gajim behaviour + print_status = conf.getTagData('show_status') else: print_status = print_status.getData()

1 0

gajim: Store optional fields correctly in Bookmarks
by Gajim 10 Oct '16

10 Oct '16

changeset c9ab416e87df in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=c9ab416e87df description: Store optional fields correctly in Bookmarks diffstat: src/common/connection.py | 27 +++++++++++++--------- src/common/connection_handlers_events.py | 37 ++++++++++++++++++++----------- 2 files changed, 40 insertions(+), 24 deletions(-) diffs (126 lines): diff -r f196f08e65f9 -r c9ab416e87df src/common/connection.py --- a/src/common/connection.py Mon Oct 10 15:22:51 2016 +0200 +++ b/src/common/connection.py Mon Oct 10 19:10:18 2016 +0200 @@ -2474,7 +2474,8 @@ """ if not gajim.account_is_connected(self.name): return - if self.pubsub_supported and storage_type != 'xml': + if self.pubsub_supported and self.pubsub_publish_options_supported \ + and storage_type != 'xml': self.send_pb_retrieve('', 'storage:bookmarks') # some server (ejabberd) are so slow to answer that we request via XML # if we don't get answer in the next 30 seconds @@ -2489,15 +2490,17 @@ storage_type can be set to 'pubsub' or 'xml' so store in only one method else it will be stored on both """ + NS_GAJIM_BM = 'xmpp:gajim.org/bookmarks' if not gajim.account_is_connected(self.name): return iq = nbxmpp.Node(tag='storage', attrs={'xmlns': 'storage:bookmarks'}) for bm in self.bookmarks: - iq2 = iq.addChild(name = "conference") + iq2 = iq.addChild(name="conference") iq2.setAttr('jid', bm['jid']) iq2.setAttr('autojoin', bm['autojoin']) - iq2.setAttr('minimize', bm['minimize']) iq2.setAttr('name', bm['name']) + iq2.setTag('minimize', namespace=NS_GAJIM_BM). \ + setData(bm['minimize']) # Only add optional elements if not empty # Note: need to handle both None and '' as empty # thus shouldn't use "is not None" @@ -2506,21 +2509,23 @@ if bm.get('password', None): iq2.setTagData('password', bm['password']) if bm.get('print_status', None): - iq2.setTagData('print_status', bm['print_status']) + iq2.setTag('print_status', namespace=NS_GAJIM_BM). \ + setData(bm['print_status']) - if self.pubsub_supported and self.pubsub_publish_options_supported and \ - storage_type != 'xml': + if self.pubsub_supported and self.pubsub_publish_options_supported and\ + storage_type != 'xml': options = nbxmpp.Node(nbxmpp.NS_DATA + ' x', - attrs={'type': 'submit'}) - f = options.addChild('field', attrs={'var': 'FORM_TYPE', - 'type': 'hidden'}) + attrs={'type': 'submit'}) + f = options.addChild('field', + attrs={'var': 'FORM_TYPE', 'type': 'hidden'}) f.setTagData('value', nbxmpp.NS_PUBSUB_PUBLISH_OPTIONS) - f = options.addChild('field', attrs={'var': 'pubsub#persist_items'}) + f = options.addChild('field', + attrs={'var': 'pubsub#persist_items'}) f.setTagData('value', 'true') f = options.addChild('field', attrs={'var': 'pubsub#access_model'}) f.setTagData('value', 'whitelist') self.send_pb_publish('', 'storage:bookmarks', iq, 'current', - options=options) + options=options) if storage_type != 'pubsub': iqA = nbxmpp.Iq(typ='set') iqB = iqA.addChild(name='query', namespace=nbxmpp.NS_PRIVATE) diff -r f196f08e65f9 -r c9ab416e87df src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Oct 10 15:22:51 2016 +0200 +++ b/src/common/connection_handlers_events.py Mon Oct 10 19:10:18 2016 +0200 @@ -499,33 +499,44 @@ self.namespace = self.storage_node.getNamespace() return True + class BookmarksHelper: def parse_bookmarks(self): self.bookmarks = [] + NS_GAJIM_BM = 'xmpp:gajim.org/bookmarks' confs = self.storage_node.getTags('conference') for conf in confs: autojoin_val = conf.getAttr('autojoin') - if autojoin_val is None: # not there (it's optional) + if not autojoin_val: # not there (it's optional) autojoin_val = False - minimize_val = conf.getAttr('minimize') - if minimize_val is None: # not there (it's optional) - minimize_val = False - print_status = conf.getTagData('print_status') + minimize_val = conf.getTag('minimize', namespace=NS_GAJIM_BM) + if not minimize_val: # not there, try old Gajim behaviour + minimize_val = conf.getAttr('minimize') + if not minimize_val: # not there (it's optional) + minimize_val = False + else: + minimize_val = minimize_val.getData() + + print_status = conf.getTag('print_status', namespace=NS_GAJIM_BM) if not print_status: print_status = conf.getTagData('show_status') + else: + print_status = print_status.getData() + try: jid = helpers.parse_jid(conf.getAttr('jid')) except helpers.InvalidFormat: - log.warning('Invalid JID: %s, ignoring it' % conf.getAttr('jid')) + log.warning('Invalid JID: %s, ignoring it' + % conf.getAttr('jid')) continue + bm = {'name': conf.getAttr('name'), - 'jid': jid, - 'autojoin': autojoin_val, - 'minimize': minimize_val, - 'password': conf.getTagData('password'), - 'nick': conf.getTagData('nick'), - 'print_status': print_status} - + 'jid': jid, + 'autojoin': autojoin_val, + 'minimize': minimize_val, + 'password': conf.getTagData('password'), + 'nick': conf.getTagData('nick'), + 'print_status': print_status} bm_jids = [b['jid'] for b in self.bookmarks] if bm['jid'] not in bm_jids:

1 0

gajim-plugins: Fix url_image_preview for gtk3
by Gajim Plugins 10 Oct '16

10 Oct '16

changeset 1ef6c127f3ab in /home/hg/repos/gajim-plugins author: Linus Heckemann <git(a)sphalerite.org> branches: gtk3 details:gajim-plugins?cmd=changeset;node=1ef6c127f3ab description: Fix url_image_preview for gtk3 diffstat: url_image_preview/manifest.ini | 2 +- url_image_preview/url_image_preview.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diffs (25 lines): diff -r 506034128f9a -r 1ef6c127f3ab url_image_preview/manifest.ini --- a/url_image_preview/manifest.ini Thu Oct 06 19:33:44 2016 +0200 +++ b/url_image_preview/manifest.ini Mon Oct 10 14:28:41 2016 +0100 @@ -1,7 +1,7 @@ [info] name: Url image preview short_name: url_image_preview -version: 0.5.3 +version: 0.5.4 description: Url image preview in chatbox. authors = Denis Fomin <fominde(a)gmail.com> Yann Leboulanger <asterix(a)lagaule.org> diff -r 506034128f9a -r 1ef6c127f3ab url_image_preview/url_image_preview.py --- a/url_image_preview/url_image_preview.py Thu Oct 06 19:33:44 2016 +0200 +++ b/url_image_preview/url_image_preview.py Mon Oct 10 14:28:41 2016 +0100 @@ -45,7 +45,8 @@ control.disconnect_from_chat_control() self.controls = [] - def print_special_text(self, tv, special_text, other_tags, graphics=True): + def print_special_text(self, tv, special_text, other_tags, graphics=True, + additional_data): for control in self.controls: if control.chat_control.conv_textview != tv: continue

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2016