Commits

commits@gajim.org

17632 discussions

gajim: prepare 0.16.4 release
by Gajim 05 Oct '15

05 Oct '15

changeset 0ebf23de205f in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=0ebf23de205f description: prepare 0.16.4 release diffstat: ChangeLog | 6 ++++++ autogen.sh | 2 +- debian/changelog | 12 +++++++++--- gajim.nsi | 2 +- setup_win32.py | 2 +- src/common/defs.py | 2 +- 6 files changed, 19 insertions(+), 7 deletions(-) diffs (92 lines): diff -r 788fb8924c42 -r 0ebf23de205f ChangeLog --- a/ChangeLog Wed Sep 23 22:39:11 2015 +0200 +++ b/ChangeLog Sat Sep 26 15:39:01 2015 +0200 @@ -1,3 +1,9 @@ +Gajim 0.16.4 (26 September 2015) + + * Fix trusting GPG keys + * Ability to disable synchronization of logs with server + * Improve MAM usage + Gajim 0.16.3 (31 July 2015) * Fix reading secret file diff -r 788fb8924c42 -r 0ebf23de205f autogen.sh --- a/autogen.sh Wed Sep 23 22:39:11 2015 +0200 +++ b/autogen.sh Sat Sep 26 15:39:01 2015 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.16.3" + gajimversion="0.16.4" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff -r 788fb8924c42 -r 0ebf23de205f debian/changelog --- a/debian/changelog Wed Sep 23 22:39:11 2015 +0200 +++ b/debian/changelog Sat Sep 26 15:39:01 2015 +0200 @@ -1,20 +1,26 @@ +gajim (0.16.4-1) unstable; urgency=low + + * New upstream release + + -- Yann Leboulanger <yann(a)leboulanger.org> Sun, 26 Sep 2015 15:28:29 +0200 + gajim (0.16.3-1) unstable; urgency=low * New upstream release - -- Yann Leboulanger <yann(a)leboulanger.org> Sat, 31 Jul 2014 23:12:04 +0200 + -- Yann Leboulanger <yann(a)leboulanger.org> Sat, 31 Jul 2015 23:12:04 +0200 gajim (0.16.2-1) unstable; urgency=low * New upstream release - -- Yann Leboulanger <yann(a)leboulanger.org> Sat, 24 Jul 2014 22:30:10 +0200 + -- Yann Leboulanger <yann(a)leboulanger.org> Sat, 24 Jul 2015 22:30:10 +0200 gajim (0.16.1-1) unstable; urgency=low * New upstream release - -- Yann Leboulanger <yann(a)leboulanger.org> Sat, 28 Feb 2014 22:30:10 +0200 + -- Yann Leboulanger <yann(a)leboulanger.org> Sat, 28 Feb 2015 22:30:10 +0200 gajim (0.16-1) unstable; urgency=low diff -r 788fb8924c42 -r 0ebf23de205f gajim.nsi --- a/gajim.nsi Wed Sep 23 22:39:11 2015 +0200 +++ b/gajim.nsi Sat Sep 26 15:39:01 2015 +0200 @@ -212,7 +212,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\bin\Gajim.exe" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.16.3" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.16.4" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/" WriteUninstaller "$INSTDIR\Uninstall.exe" diff -r 788fb8924c42 -r 0ebf23de205f setup_win32.py --- a/setup_win32.py Wed Sep 23 22:39:11 2015 +0200 +++ b/setup_win32.py Sat Sep 26 15:39:01 2015 +0200 @@ -56,7 +56,7 @@ setup( name='Gajim', - version='0.16.3', + version='0.16.4', description='A full featured Jabber client', author='Gajim Development Team', url='http://gajim.org/', diff -r 788fb8924c42 -r 0ebf23de205f src/common/defs.py --- a/src/common/defs.py Wed Sep 23 22:39:11 2015 +0200 +++ b/src/common/defs.py Sat Sep 26 15:39:01 2015 +0200 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.16.3' +version = '0.16.4' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,

1 0

gajim: build windows version with PyopenSSL 0.15.1
by Gajim 05 Oct '15

05 Oct '15

changeset 032149457a99 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=032149457a99 description: build windows version with PyopenSSL 0.15.1 diffstat: gajim.nsi | 57 ++++----------------------------------------------------- setup_win32.py | 1 + 2 files changed, 5 insertions(+), 53 deletions(-) diffs (109 lines): diff -r 0ebf23de205f -r 032149457a99 gajim.nsi --- a/gajim.nsi Sat Sep 26 15:39:01 2015 +0200 +++ b/gajim.nsi Sat Sep 26 15:43:32 2015 +0200 @@ -156,6 +156,7 @@ SetOutPath "$INSTDIR\bin" File "bin\_bsddb.pyd" + File "bin\_cffi_backend.pyd" File "bin\_ctypes.pyd" File "bin\_hashlib.pyd" File "bin\_socket.pyd" @@ -171,6 +172,9 @@ File "bin\Crypto.Random.OSRNG.winrandom.pyd" File "bin\Crypto.Util._counter.pyd" File "bin\Crypto.Util.strxor.pyd" + File "bin\cryptography.hazmat.bindings._constant_time.pyd" + File "bin\cryptography.hazmat.bindings._openssl.pyd" + File "bin\cryptography.hazmat.bindings._padding.pyd" File "bin\farstream.pyd" File "bin\gajim.exe" File "bin\gio._gio.pyd" @@ -181,7 +185,6 @@ File "bin\gst.interfaces.pyd" File "bin\gtk._gtk.pyd" File "bin\history_manager.exe" - File "bin\OpenSSL.crypto.pyd" File "bin\libeay32.dll" File "bin\libgoocanvas-3.dll" File "bin\library.zip" @@ -194,11 +197,9 @@ File "bin\python27.dll" File "bin\pythoncom27.dll" File "bin\pywintypes27.dll" - File "bin\OpenSSL.rand.pyd" File "bin\select.pyd" File "bin\sqlite3.dll" File "bin\ssleay32.dll" - File "bin\OpenSSL.SSL.pyd" File "bin\unicodedata.pyd" File "bin\win32api.pyd" File "bin\win32file.pyd" @@ -542,56 +543,6 @@ RMDir /r "$INSTDIR\bin\gtk\share" RMDir "$INSTDIR\bin\gtk" RMDir "$INSTDIR\bin\win32com" - Delete "$INSTDIR\bin\_bsddb.pyd" - Delete "$INSTDIR\bin\_ctypes.pyd" - Delete "$INSTDIR\bin\_hashlib.pyd" - Delete "$INSTDIR\bin\_socket.pyd" - Delete "$INSTDIR\bin\_sqlite3.pyd" - Delete "$INSTDIR\bin\_ssl.pyd" - Delete "$INSTDIR\bin\atk.pyd" - Delete "$INSTDIR\bin\bz2.pyd" - Delete "$INSTDIR\bin\cairo._cairo.pyd" - Delete "$INSTDIR\bin\Crypto.Cipher._AES.pyd" - Delete "$INSTDIR\bin\Crypto.Cipher._DES.pyd" - Delete "$INSTDIR\bin\Crypto.Cipher._DES3.pyd" - Delete "$INSTDIR\bin\Crypto.Hash._SHA256.pyd" - Delete "$INSTDIR\bin\Crypto.Random.OSRNG.winrandom.pyd" - Delete "$INSTDIR\bin\Crypto.Util._counter.pyd" - Delete "$INSTDIR\bin\farstream.pyd" - Delete "$INSTDIR\bin\gajim.exe" - Delete "$INSTDIR\bin\gio._gio.pyd" - Delete "$INSTDIR\bin\glib._glib.pyd" - Delete "$INSTDIR\bin\gobject._gobject.pyd" - Delete "$INSTDIR\bin\goocanvas.pyd" - Delete "$INSTDIR\bin\gst._gst.pyd" - Delete "$INSTDIR\bin\gst.interfaces.pyd" - Delete "$INSTDIR\bin\gtk._gtk.pyd" - Delete "$INSTDIR\bin\history_manager.exe" - Delete "$INSTDIR\bin\libeay32.dll" - Delete "$INSTDIR\bin\libgoocanvas-3.dll" - Delete "$INSTDIR\bin\library.zip" - Delete "$INSTDIR\bin\libxml2mod.pyd" - Delete "$INSTDIR\bin\libxmlmods.libxml2mod.pyd" - Delete "$INSTDIR\bin\OpenSSL.crypto.pyd" - Delete "$INSTDIR\bin\OpenSSL.rand.pyd" - Delete "$INSTDIR\bin\OpenSSL.SSL.pyd" - Delete "$INSTDIR\bin\pango.pyd" - Delete "$INSTDIR\bin\pangocairo.pyd" - Delete "$INSTDIR\bin\pycurl.pyd" - Delete "$INSTDIR\bin\pyexpat.pyd" - Delete "$INSTDIR\bin\python27.dll" - Delete "$INSTDIR\bin\pythoncom27.dll" - Delete "$INSTDIR\bin\pywintypes27.dll" - Delete "$INSTDIR\bin\select.pyd" - Delete "$INSTDIR\bin\sqlite3.dll" - Delete "$INSTDIR\bin\ssleay32.dll" - Delete "$INSTDIR\bin\unicodedata.pyd" - Delete "$INSTDIR\bin\win32api.pyd" - Delete "$INSTDIR\bin\win32file.pyd" - Delete "$INSTDIR\bin\win32pipe.pyd" - Delete "$INSTDIR\bin\win32ui.pyd" - Delete "$INSTDIR\bin\winsound.pyd" - Delete "$INSTDIR\bin\msvcr90.dll" RMDir /r "$INSTDIR\bin" RMDir /r "$INSTDIR\data\gui" RMDir /r "$INSTDIR\data\moods" diff -r 0ebf23de205f -r 032149457a99 setup_win32.py --- a/setup_win32.py Sat Sep 26 15:39:01 2015 +0200 +++ b/setup_win32.py Sat Sep 26 15:43:32 2015 +0200 @@ -35,6 +35,7 @@ 'goocanvas', 'Crypto.PublicKey.DSA', 'Crypto.Hash.HMAC', 'numbers', 'win32com.client', 'win32com.server', 'HTMLParser'], 'base': 'Win32GUI', + 'packages': ['cffi', 'cryptography'] 'bin_excludes': [ 'iconv.dll', 'intl.dll', 'libatk-1.0-0.dll', 'libgdk_pixbuf-2.0-0.dll', 'libgdk-win32-2.0-0.dll',

1 0

gajim: fix typo
by Gajim 05 Oct '15

05 Oct '15

changeset 00a381228315 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=00a381228315 description: fix typo diffstat: setup_win32.py | 2 +- src/common/optparser.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r 032149457a99 -r 00a381228315 setup_win32.py --- a/setup_win32.py Sat Sep 26 15:43:32 2015 +0200 +++ b/setup_win32.py Sat Sep 26 15:58:33 2015 +0200 @@ -35,7 +35,7 @@ 'goocanvas', 'Crypto.PublicKey.DSA', 'Crypto.Hash.HMAC', 'numbers', 'win32com.client', 'win32com.server', 'HTMLParser'], 'base': 'Win32GUI', - 'packages': ['cffi', 'cryptography'] + 'packages': ['cffi', 'cryptography'], 'bin_excludes': [ 'iconv.dll', 'intl.dll', 'libatk-1.0-0.dll', 'libgdk_pixbuf-2.0-0.dll', 'libgdk-win32-2.0-0.dll', diff -r 032149457a99 -r 00a381228315 src/common/optparser.py --- a/src/common/optparser.py Sat Sep 26 15:43:32 2015 +0200 +++ b/src/common/optparser.py Sat Sep 26 15:58:33 2015 +0200 @@ -43,7 +43,7 @@ class OptionsParser: def __init__(self, filename): - self.__filename = filename + self.__filename = os.path.realpath(filename) self.old_values = {} # values that are saved in the file and maybe # no longer valid

1 0

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

05 Oct '15

changeset 4d99acdadf05 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=4d99acdadf05 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 f5d025f0120f -r 4d99acdadf05 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 @@ -580,6 +580,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> @@ -594,7 +611,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> @@ -611,7 +628,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> @@ -629,7 +646,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 f5d025f0120f -r 4d99acdadf05 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 @@ -363,6 +363,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 f5d025f0120f -r 4d99acdadf05 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 @@ -1990,6 +1990,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')) @@ -2343,6 +2345,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 f5d025f0120f -r 4d99acdadf05 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 @@ -1139,13 +1139,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

gajim: [tmolitor] ability to download bigger files with higher t...
by Gajim 05 Oct '15

05 Oct '15

changeset 1db402099910 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=1db402099910 description: [tmolitor] ability to download bigger files with higher timeouts. Fixes #8130 diffstat: src/common/helpers.py | 29 ++++++++++++++++++----------- 1 files changed, 18 insertions(+), 11 deletions(-) diffs (68 lines): diff -r 4d99acdadf05 -r 1db402099910 src/common/helpers.py --- a/src/common/helpers.py Thu Aug 20 15:08:53 2015 +0200 +++ b/src/common/helpers.py Thu Aug 20 21:53:59 2015 +0200 @@ -1433,8 +1433,11 @@ """ mem = b'' alt = '' - # Wait maximum 5s for connection - socket.setdefaulttimeout(5) + max_size = 2*1024*1024 + if 'max_size' in attrs: + max_size = attrs['max_size'] + # Wait maximum 10s for connection + socket.setdefaulttimeout(10) try: req = urllib.request.Request(attrs['src']) req.add_header('User-Agent', 'Gajim ' + gajim.version) @@ -1444,13 +1447,13 @@ pixbuf = None alt = attrs.get('alt', 'Broken image') else: - # Wait 0.5s between each byte + # Wait 2s between each byte try: - f.fp._sock.fp._sock.settimeout(0.5) + f.fp._sock.fp._sock.settimeout(2) except Exception: pass - # Max image size = 2 MB (to try to prevent DoS) - deadline = time.time() + 3 + # On a slow internet connection with ~1000kbps you need ~10 seconds for 1 MB + deadline = time.time() + (10 * (max_size / 1048576)) while True: if time.time() > deadline: log.debug('Timeout loading image %s ' % attrs['src']) @@ -1473,7 +1476,7 @@ mem += temp else: break - if len(mem) > 2*1024*1024: + if len(mem) > max_size: alt = attrs.get('alt', '') if alt: alt += '\n' @@ -1489,15 +1492,19 @@ """ if not gajim.HAVE_PYCURL: return '', _('PyCURL is not installed') - mem, alt = '', '' + mem, alt, max_size = '', '', 2*1024*1024 + if 'max_size' in attrs: + max_size = attrs['max_size'] try: b = StringIO() c = pycurl.Curl() c.setopt(pycurl.URL, attrs['src'].encode('utf-8')) c.setopt(pycurl.FOLLOWLOCATION, 1) - c.setopt(pycurl.CONNECTTIMEOUT, 5) - c.setopt(pycurl.TIMEOUT, 10) - c.setopt(pycurl.MAXFILESIZE, 2000000) + # Wait maximum 10s for connection + c.setopt(pycurl.CONNECTTIMEOUT, 10) + # On a slow internet connection with ~1000kbps you need ~10 seconds for 1 MB + c.setopt(pycurl.TIMEOUT, 10 * (max_size / 1048576)) + c.setopt(pycurl.MAXFILESIZE, max_size) c.setopt(pycurl.WRITEFUNCTION, b.write) c.setopt(pycurl.USERAGENT, 'Gajim ' + gajim.version) # set proxy

1 0

gajim: update links and copyright in manpages. Fixes #8136, #7719
by Gajim 05 Oct '15

05 Oct '15

changeset 140a7df1068b in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=140a7df1068b description: update links and copyright in manpages. Fixes #8136, #7719 diffstat: data/gajim-history-manager.1 | 16 ++++++++-------- data/gajim-remote.1 | 14 +++++++------- data/gajim.1 | 32 ++++++++++++++++---------------- 3 files changed, 31 insertions(+), 31 deletions(-) diffs (206 lines): diff -r 1db402099910 -r 140a7df1068b data/gajim-history-manager.1 --- a/data/gajim-history-manager.1 Thu Aug 20 21:53:59 2015 +0200 +++ b/data/gajim-history-manager.1 Wed Aug 26 22:01:35 2015 +0200 @@ -1,4 +1,4 @@ -.Dd August 11, 2013 +.Dd August 26, 2015 .Dt GAJIM-HISTORY-MANAGER 1 URM .Os UNIX .Sh NAME @@ -27,7 +27,7 @@ .El .Sh FILES .Bl -tag -width Ds -.It ~/.local/share/gajim/logs.db +.It $XDG_DATA_DIR/gajim/logs.db The history database log file used when .Op Fl c is not specified. @@ -46,7 +46,7 @@ .Pa THANKS , for a complete list. .Sh COPYRIGHT -Copyright (C) 2003-2013 Gajim Team +Copyright (C) 2003-2015 Gajim Team .Pp .Nm is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 3 only. @@ -56,7 +56,7 @@ .Pp You should have received a copy of the GNU General Public License along with .Nm . -If not, see <http://www.gnu.org/licenses/>. +If not, see <https://www.gnu.org/licenses/>. .Sh FEEDBACK You can report bugs or feature requests in our bug tracker at .Em trac.gajim.org @@ -65,19 +65,19 @@ mailing list; if you want to send us a patch, please do so in our bug tracker. You can also find us in our chat room. .Sh WWW -http://www.gajim.org/ +https://www.gajim.org/ .Sh XMPP You are welcome to join us at gajim(a)conference.gajim.org .Sh MAILING LIST Below are public mailing lists on lists.gajim.org .Bd -literal -offset indent -http://lists.gajim.org/cgi-bin/listinfo/gajim-devel -http://lists.gajim.org/cgi-bin/listinfo/translators +https://lists.gajim.org/cgi-bin/listinfo/gajim-devel +https://lists.gajim.org/cgi-bin/listinfo/translators .Ed .Pp More mailing lists at .Bd -literal -offset indent -http://lists.gajim.org/cgi-bin/listinfo +https://lists.gajim.org/cgi-bin/listinfo .Ed .Sh BUGS Please submit bugs at https://trac.gajim.org/ diff -r 1db402099910 -r 140a7df1068b data/gajim-remote.1 --- a/data/gajim-remote.1 Thu Aug 20 21:53:59 2015 +0200 +++ b/data/gajim-remote.1 Wed Aug 26 22:01:35 2015 +0200 @@ -1,4 +1,4 @@ -.Dd August 11, 2013 +.Dd August 26, 2015 .Dt GAJIM-REMOTE 1 URM .Os UNIX .Sh NAME @@ -99,7 +99,7 @@ .Pa THANKS , for a complete list. .Sh COPYRIGHT -Copyright (C) 2003-2013 Gajim Team +Copyright (C) 2003-2015 Gajim Team .Pp .Nm is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 3 only. @@ -109,7 +109,7 @@ .Pp You should have received a copy of the GNU General Public License along with .Nm . -If not, see <http://www.gnu.org/licenses/>. +If not, see <https://www.gnu.org/licenses/>. .Sh FEEDBACK You can report bugs or feature requests in our bug tracker at .Em trac.gajim.org @@ -118,19 +118,19 @@ mailing list; if you want to send us a patch, please do so in our bug tracker. You can also find us in our chat room. .Sh WWW -http://www.gajim.org/ +https://www.gajim.org/ .Sh XMPP You are welcome to join us at gajim(a)conference.gajim.org .Sh MAILING LIST Below are public mailing lists on lists.gajim.org .Bd -literal -offset indent -http://lists.gajim.org/cgi-bin/listinfo/gajim-devel -http://lists.gajim.org/cgi-bin/listinfo/translators +https://lists.gajim.org/cgi-bin/listinfo/gajim-devel +https://lists.gajim.org/cgi-bin/listinfo/translators .Ed .Pp More mailing lists at .Bd -literal -offset indent -http://lists.gajim.org/cgi-bin/listinfo +https://lists.gajim.org/cgi-bin/listinfo .Ed .Sh BUGS Please submit bugs at https://trac.gajim.org/ diff -r 1db402099910 -r 140a7df1068b data/gajim.1 --- a/data/gajim.1 Thu Aug 20 21:53:59 2015 +0200 +++ b/data/gajim.1 Wed Aug 26 22:01:35 2015 +0200 @@ -1,4 +1,4 @@ -.Dd August 11, 2013 +.Dd August 26, 2015 .Dt GAJIM 1 URM .Os UNIX .Sh NAME @@ -26,7 +26,7 @@ technologies for instant messaging, presence, multi-party chat, voice and video calls, collaboration, lightweight middleware, content syndication, and generalized routing of XML data. For more information -on the XMPP protocol see <http://xmpp.org/about-xmpp/>. +on the XMPP protocol see <https://xmpp.org/about-xmpp/>. .Sh OPTIONS .Bl -tag -width Ds .It Fl h Fl Fl help @@ -60,19 +60,19 @@ .El .Sh FILES .Bl -tag -width Ds -.It ~/.cache/gajim/cache.db +.It $XDG_CACHE_DIR/gajim/cache.db Cache database file of transports, caps, roster entry, and roster group. -.It ~/.cache/gajim/avatars/ +.It $XDG_CACHE_DIR/gajim/avatars/ Cache directory of avatars. -.It ~/.cache/gajim/vcards/ +.It $XDG_CACHE_DIR/gajim/vcards/ Cache directory of vCards (virtual cards). -.It ~/.config/gajim/ +.It $XDG_CONFIG_DIR/gajim/ The config-path used when .Op Fl c is not specified. -.It ~/.local/share/gajim/certs/ +.It $XDG_DATA_DIR/gajim/certs/ Directory where certificates are stored. -.It ~/.local/share/gajim/logs.db +.It $XDG_DATA_DIR/gajim/logs.db The history database log file. For more information on database logs see <https://trac.gajim.org/wiki/LogsDatabase>. .El @@ -90,7 +90,7 @@ .Pa THANKS , for a complete list. .Sh COPYRIGHT -Copyright (C) 2003-2013 Gajim Team +Copyright (C) 2003-2015 Gajim Team .Pp .Nm is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 3 only. @@ -100,7 +100,7 @@ .Pp You should have received a copy of the GNU General Public License along with .Nm . -If not, see <http://www.gnu.org/licenses/>. +If not, see <https://www.gnu.org/licenses/>. .Sh FEEDBACK You can report bugs or feature requests in our bug tracker at .Em trac.gajim.org @@ -109,26 +109,26 @@ mailing list; if you want to send us a patch, please do so in our bug tracker. You can also find us in our chat room. .Sh WWW -http://www.gajim.org/ +https://www.gajim.org/ .Sh XMPP You are welcome to join us at gajim(a)conference.gajim.org .Sh MAILING LIST Below are public mailing lists on lists.gajim.org .Bd -literal -offset indent -http://lists.gajim.org/cgi-bin/listinfo/gajim-devel -http://lists.gajim.org/cgi-bin/listinfo/translators +https://lists.gajim.org/cgi-bin/listinfo/gajim-devel +https://lists.gajim.org/cgi-bin/listinfo/translators .Ed .Pp More mailing lists at .Bd -literal -offset indent -http://lists.gajim.org/cgi-bin/listinfo +https://lists.gajim.org/cgi-bin/listinfo .Ed .Sh BUGS Please submit bugs at .Bd -literal -offset indent https://trac.gajim.org/ -http://trac-plugins.gajim.org/ -http://python-nbxmpp.gajim.org/ +https://trac-plugins.gajim.org/ +https://python-nbxmpp.gajim.org/ .Ed .Sh SEE ALSO .Xr gajim-remote 1

1 0

gajim: delete cache db when logs db doesn't exist. Anyway data w...
by Gajim 05 Oct '15

05 Oct '15

changeset e24804289058 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=e24804289058 description: delete cache db when logs db doesn't exist. Anyway data will be wrong inside. Fixes #8133 diffstat: src/common/check_paths.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 140a7df1068b -r e24804289058 src/common/check_paths.py --- a/src/common/check_paths.py Wed Aug 26 22:01:35 2015 +0200 +++ b/src/common/check_paths.py Thu Aug 27 14:53:18 2015 +0200 @@ -330,6 +330,8 @@ check_and_possibly_move_config() if not os.path.exists(LOG_DB_PATH): + if os.path.exists(CACHE_DB_PATH): + os.remove(CACHE_DB_PATH) create_log_db() gajim.logger.init_vars() elif os.path.isdir(LOG_DB_PATH):

1 0

gajim: show error message when we try to connect anonymously to ...
by Gajim 05 Oct '15

05 Oct '15

changeset 055dfd32975c in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=055dfd32975c description: show error message when we try to connect anonymously to a server that doesn't support anonymous connection. Fixes #8138 diffstat: src/common/connection.py | 6 ++++++ src/common/connection_handlers_events.py | 4 ++++ src/gui_interface.py | 8 ++++++++ 3 files changed, 18 insertions(+), 0 deletions(-) diffs (55 lines): diff -r e24804289058 -r 055dfd32975c src/common/connection.py --- a/src/common/connection.py Thu Aug 27 14:53:18 2015 +0200 +++ b/src/common/connection.py Mon Aug 31 13:47:18 2015 +0200 @@ -2860,6 +2860,12 @@ self.connection.send(iq) def get_password(self, callback, type_): + if gajim.config.get_per('accounts', self.name, 'anonymous_auth') and \ + type_ != 'ANONYMOUS': + gajim.nec.push_incoming_event(NonAnonymousServerErrorEvent(None, + conn=self)) + self._on_disconnected() + return self.pasword_callback = (callback, type_) if type_ == 'X-MESSENGER-OAUTH2': client_id = gajim.config.get_per('accounts', self.name, diff -r e24804289058 -r 055dfd32975c src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Thu Aug 27 14:53:18 2015 +0200 +++ b/src/common/connection_handlers_events.py Mon Aug 31 13:47:18 2015 +0200 @@ -1924,6 +1924,10 @@ name = 'privacy-list-active-default' base_network_events = [] +class NonAnonymousServerErrorEvent(nec.NetworkIncomingEvent): + name = 'non-anonymous-server-error' + base_network_events = [] + class VcardReceivedEvent(nec.NetworkIncomingEvent): name = 'vcard-received' base_network_events = [] diff -r e24804289058 -r 055dfd32975c src/gui_interface.py --- a/src/gui_interface.py Thu Aug 27 14:53:18 2015 +0200 +++ b/src/gui_interface.py Mon Aug 31 13:47:18 2015 +0200 @@ -1376,6 +1376,13 @@ self.instances[account]['online_dialog']['ssl_error'].set_title( _('SSL Certificate Verification for %s') % account) + def handle_event_non_anonymous_server(self, obj): + account = obj.conn.name + server = gajim.config.get_per('accounts', account, 'hostname') + dialogs.ErrorDialog(_('Non Anonymous Server'), sectext='Server "%s"' + 'does not support anonymous connection' % server, + transient_for=self.roster.window) + def handle_event_fingerprint_error(self, obj): # ('FINGERPRINT_ERROR', account, (new_fingerprint_sha1,new_fingerprint_sha256,)) account = obj.conn.name @@ -1579,6 +1586,7 @@ [self.handle_event_roster_item_exchange], 'signed-in': [self.handle_event_signed_in], 'ssl-error': [self.handle_event_ssl_error], + 'non-anonymous-server-error': [self.handle_event_non_anonymous_server], 'stream-conflict-received': [self.handle_event_resource_conflict], 'subscribe-presence-received': [ self.handle_event_subscribe_presence],

1 0

gajim: don't fail when we receive a MAM message without a body. ...
by Gajim 05 Oct '15

05 Oct '15

changeset 42f23776b9af in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=42f23776b9af description: don't fail when we receive a MAM message without a body. Fixes #8140 diffstat: src/common/logger.py | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diffs (40 lines): diff -r 055dfd32975c -r 42f23776b9af src/common/logger.py --- a/src/common/logger.py Mon Aug 31 13:47:18 2015 +0200 +++ b/src/common/logger.py Thu Sep 03 22:06:04 2015 +0200 @@ -1104,21 +1104,22 @@ time_col = int(float(time.mktime(tim))) else: time_col = int(float(time.time())) - if msg: - if self.jid_is_from_pm(with_) or nick: - # It's a groupchat message - if nick: - # It's a message from a groupchat occupent - type_ = 'gc_msg' - with_ = with_ + '/' + nick - else: - # It's a server message message, we don't log them - return + if not msg: + return + if self.jid_is_from_pm(with_) or nick: + # It's a groupchat message + if nick: + # It's a message from a groupchat occupent + type_ = 'gc_msg' + with_ = with_ + '/' + nick else: - if direction == 'from': - type_ = 'chat_msg_recv' - elif direction == 'to': - type_ = 'chat_msg_sent' + # It's a server message message, we don't log them + return + else: + if direction == 'from': + type_ = 'chat_msg_recv' + elif direction == 'to': + type_ = 'chat_msg_sent' jid_id = self.get_jid_id(with_) where_sql = 'jid_id = %s AND message=?' % jid_id if type_ == 'gc_msg':

1 0

gajim: update XEP-0334 (Message Processing Hints) to V0.2
by Gajim 05 Oct '15

05 Oct '15

changeset c1f05409a916 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=c1f05409a916 description: update XEP-0334 (Message Processing Hints) to V0.2 diffstat: src/common/connection.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 42f23776b9af -r c1f05409a916 src/common/connection.py --- a/src/common/connection.py Thu Sep 03 22:06:04 2015 +0200 +++ b/src/common/connection.py Sun Sep 13 13:57:04 2015 +0200 @@ -426,7 +426,7 @@ if msgenc: msg_iq.setTag(nbxmpp.NS_ENCRYPTED + ' x').setData(msgenc) - msg_iq.addChild(name='no-permanent-storage', + msg_iq.addChild(name='no-permanent-store', namespace=nbxmpp.NS_MSG_HINTS) if form_node: @@ -506,7 +506,7 @@ if self.carbons_enabled: msg_iq.addChild(name='private', namespace=nbxmpp.NS_CARBONS) - msg_iq.addChild(name='no-permanent-storage', + msg_iq.addChild(name='no-permanent-store', namespace=nbxmpp.NS_MSG_HINTS) msg_iq.addChild(name='no-copy', namespace=nbxmpp.NS_MSG_HINTS)

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