Commits October 2015

commits@gajim.org

1 participants
37 discussions

gajim-plugins: New version using GTK eventbox instead of xhtml (...
by Gajim Plugins 08 Oct '15

08 Oct '15

changeset 556489c4f110 in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: details:gajim-plugins?cmd=changeset;node=556489c4f110 description: New version using GTK eventbox instead of xhtml (looks cleaner and also provides the url in copy/paste operations) diffstat: url_image_preview/manifest.ini | 4 +- url_image_preview/url_image_preview.py | 54 +++++++++++++++++++++++++-------- 2 Dateien ver?ndert, 43 Zeilen hinzugef?gt(+), 15 Zeilen entfernt(-) Unterschiede (117 Zeilen): diff -r bbf3c1708352 -r 556489c4f110 url_image_preview/manifest.ini --- a/url_image_preview/manifest.ini Tue Oct 06 21:54:16 2015 +0200 +++ b/url_image_preview/manifest.ini Thu Oct 08 15:46:38 2015 +0200 @@ -1,7 +1,7 @@ [info] name: Url image preview short_name: url_image_preview -version: 0.6.1 +version: 0.6.2 description: Url image preview in chatbox.<br/> Based on patch in <a href="http://trac.gajim.org/attachment/ticket/5300">ticket #5300</a>. authors = Denis Fomin <fominde(a)gmail.com> @@ -9,5 +9,5 @@ Anders Sandblad <runeson(a)gmail.com> Thilo Molitor <thilo(a)eightysoft.de> homepage = http://trac-plugins.gajim.org/wiki/UrlImagePreviewPlugin -min_gajim_version: 0.16 +min_gajim_version: 0.16.4 max_gajim_version: 0.16.9 diff -r bbf3c1708352 -r 556489c4f110 url_image_preview/url_image_preview.py --- a/url_image_preview/url_image_preview.py Tue Oct 06 21:54:16 2015 +0200 +++ b/url_image_preview/url_image_preview.py Thu Oct 08 15:46:38 2015 +0200 @@ -4,7 +4,6 @@ import re import os import urllib2 -import base64 from urlparse import urlparse from common import gajim @@ -115,7 +114,7 @@ return # Check if file size is acceptable if file_size > self.plugin.config['MAX_FILE_SIZE'] or file_size == 0: - log.info('File size to big or unknown for URL: %s' % url) + log.info('File size too big or unknown for URL: %s' % url) # URL is already displayed return @@ -131,21 +130,28 @@ loader.write(mem) loader.close() pixbuf = loader.get_pixbuf() - w, h = self.get_thumb_size(pixbuf, self.plugin.config['PREVIEW_SIZE']) - imgb64 = base64.b64encode(mem) - xhtml = '<body xmlns=\'http://www.w3.org/1999/xhtml\'><br/>' - xhtml += '<a href="%s">' % url - xhtml += '<img src="data:%s;base64,%s" width="%s" height="%s"/> ' % \ - (file_mime, imgb64, w, h) - xhtml += '</a></body>' + pixbuf, w, h = self.get_pixbuf_of_size(pixbuf, + self.plugin.config['PREVIEW_SIZE']) buffer_ = repl_start.get_buffer() iter_ = buffer_.get_iter_at_mark(repl_start) + buffer_.insert(iter_, "\n") + anchor = buffer_.create_child_anchor(iter_) + # Use url as tooltip for image + img = TextViewImage(anchor, url) + img.set_from_pixbuf(pixbuf) + eb = gtk.EventBox() + eb.connect('button-press-event', self.on_button_press_event, + url) + eb.connect('enter-notify-event', self.on_enter_event) + eb.connect('leave-notify-event', self.on_leave_event) + eb.add(img) + eb.show_all() buffer_.delete(iter_, buffer_.get_iter_at_mark(repl_end)) - self.textview.tv.display_html(xhtml.encode('utf-8'), self.textview.tv, - self.textview, iter_=iter_) + self.textview.tv.add_child_at_anchor(eb, anchor) except Exception: # URL is already displayed log.error('Could not display image for URL: %s' % url) + raise else: # If image could not be downloaded, URL is already displayed log.error('Could not download image for URL: %s' % url) @@ -237,7 +243,27 @@ pass return (ctype, clen) - def get_thumb_size(self, pixbuf, size): + + + # Change mouse pointer to HAND2 when mouse enter the eventbox with the image + def on_enter_event (self, eb, event): + self.textview.tv.get_window(gtk.TEXT_WINDOW_TEXT).set_cursor( + gtk.gdk.Cursor(gtk.gdk.HAND2)) + + # Change mouse pointer to default when mouse leaves the eventbox + def on_leave_event (self, eb, event): + self.textview.tv.get_window(gtk.TEXT_WINDOW_TEXT).set_cursor( + gtk.gdk.Cursor(gtk.gdk.XTERM)) + + def on_button_press_event(self, eb, event, url): + if event.button == 1: # left click + # Open URL in browser + helpers.launch_browser_mailer('url', url) + + def get_pixbuf_of_size(self, pixbuf, size): + # Creates a pixbuf that fits in the specified square of sizexsize + # while preserving the aspect ratio + # Returns tuple: (scaled_pixbuf, actual_width, actual_height) image_width = pixbuf.get_width() image_height = pixbuf.get_height() @@ -250,7 +276,9 @@ image_width = int(size / float(image_height) * image_width) image_height = int(size) - return (image_width, image_height) + crop_pixbuf = pixbuf.scale_simple(image_width, image_height, + gtk.gdk.INTERP_BILINEAR) + return (crop_pixbuf, image_width, image_height) def disconnect_from_chat_control(self): pass

1 0

gajim-plugins: merge patches from upstream
by Gajim Plugins 06 Oct '15

06 Oct '15

changeset bbf3c1708352 in /home/hg/repos/gajim-plugins author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:gajim-plugins?cmd=changeset;node=bbf3c1708352 description: merge patches from upstream diffstat: gotr/manifest.ini | 2 +- gotr/otrmodule.py | 39 ++++++++++++++++++++++++++------------- 2 files changed, 27 insertions(+), 14 deletions(-) diffs (86 lines): diff -r 45c7ffab06a6 -r bbf3c1708352 gotr/manifest.ini --- a/gotr/manifest.ini Sun Oct 04 17:09:29 2015 +0200 +++ b/gotr/manifest.ini Tue Oct 06 21:54:16 2015 +0200 @@ -1,7 +1,7 @@ [info] name: Off-The-Record Encryption short_name: gotr -version: 1.7.7 +version: 1.8 description: Provide OTR encryption. See <a href="http://www.cypherpunks.ca/otr/">Author website</a> authors: Kjell Braden <afflux.gajim(a)pentabarf.de> homepage: http://gajim-otr.pentabarf.de diff -r 45c7ffab06a6 -r bbf3c1708352 gotr/otrmodule.py --- a/gotr/otrmodule.py Sun Oct 04 17:09:29 2015 +0200 +++ b/gotr/otrmodule.py Tue Oct 06 21:54:16 2015 +0200 @@ -277,6 +277,8 @@ self.events_handlers = {} self.events_handlers['message-received'] = (ged.PRECORE, self.handle_incoming_msg) + self.events_handlers['before-change-show'] = (ged.PRECORE, + self.handle_change_show) self.events_handlers['message-outgoing'] = (ged.OUT_PRECORE, self.handle_outgoing_msg) @@ -480,13 +482,14 @@ if ctrl: ctrl.print_conversation_line(u'[OTR] %s' % msg, 'status', '', None) - id = gajim.logger.write('chat_msg_recv', fjid, - message=u'[OTR: %s]' % msg, tim=tim) - # gajim.logger.write() only marks a message as unread (and so - # only returns an id) when fjid is a real contact (NOT if it's a - # GC private chat) - if id: - gajim.logger.set_read_messages([id]) + if gajim.config.should_log(account, jid): + id = gajim.logger.write('chat_msg_recv', fjid, + message=u'[OTR: %s]' % msg, tim=tim) + # gajim.logger.write() only marks a message as unread (and so + # only returns an id) when fjid is a real contact (NOT if it's a + # GC private chat) + if id: + gajim.logger.set_read_messages([id]) else: session = gajim.connections[account].get_or_create_session(fjid, thread_id) @@ -500,10 +503,11 @@ session.control = ctrl session.control.set_session(session) - msg_id = gajim.logger.write('chat_msg_recv', fjid, - message=u'[OTR: %s]' % msg, tim=tim) - session.roster_message(jid, msg, tim=tim, msg_id=msg_id, - msg_type='chat', resource=resource) + if gajim.config.should_log(account, jid): + msg_id = gajim.logger.write('chat_msg_recv', fjid, + message=u'[OTR: %s]' % msg, tim=tim) + session.roster_message(jid, msg, tim=tim, msg_id=msg_id, + msg_type='chat', resource=resource) @classmethod def update_otr(cls, user, acc, print_status=False): @@ -526,6 +530,17 @@ if ctrl and ctrl.TYPE_ID == TYPE_CHAT: return ctrl + def handle_change_show(self, event): + account = event.conn.name + + if event.show == 'offline': + for us in self.us.itervalues(): + for fjid, ctx in us.ctxs.iteritems(): + if ctx.state == potr.context.STATE_ENCRYPTED: + self.us[account].getContext(fjid).disconnect() + + return PASS + def handle_incoming_msg(self, event): ctx = None account = event.conn.name @@ -680,5 +695,3 @@ s = s.replace("\n", "<br/>") return s -## TODO: -## - disconnect ctxs on disconnect

1 0

gajim: Added tag gajim-0.16.4 for changeset 5253377a8628
by Gajim 05 Oct '15

05 Oct '15

changeset 7f4e9978c415 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=7f4e9978c415 description: Added tag gajim-0.16.4 for changeset 5253377a8628 diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r 00a381228315 -r 7f4e9978c415 .hgtags --- a/.hgtags Sat Sep 26 15:58:33 2015 +0200 +++ b/.hgtags Sat Sep 26 16:14:19 2015 +0200 @@ -16,3 +16,4 @@ 33a5521fed877568ae1de04a76cc9031fdabacbf gajim-0.16.1 9b5eaf71e26776b12eac7f2e11b7d1afd3d78fe7 gajim-0.16.2 412182ce8274ea938638b4d5b2bd373a7fe21ce7 gajim-0.16.3 +5253377a8628abfe2b4438460c2a8a3a51de989c gajim-0.16.4

1 0

gajim: request archiving preferences only if server announce it ...
by Gajim 05 Oct '15

05 Oct '15

changeset d8128b776f31 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=d8128b776f31 description: request archiving preferences only if server announce it supports it, and don't think it supports it while it's buggy. Fixes #7839 diffstat: src/common/connection.py | 18 +++++++++--------- src/common/message_archiving.py | 8 ++++++++ 2 files changed, 17 insertions(+), 9 deletions(-) diffs (53 lines): diff -r 7f4e9978c415 -r d8128b776f31 src/common/connection.py --- a/src/common/connection.py Sat Sep 26 16:14:19 2015 +0200 +++ b/src/common/connection.py Wed Sep 30 20:00:48 2015 +0200 @@ -1919,7 +1919,6 @@ # If we are not resuming, we ask for discovery info # and archiving preferences if not self.sm.supports_sm or (not self.sm.resuming and self.sm.enabled): - self.request_message_archiving_preferences() self.discoverInfo(gajim.config.get_per('accounts', self.name, 'hostname'), id_prefix='Gajim_') @@ -2026,14 +2025,15 @@ if nbxmpp.NS_ARCHIVE in obj.features: self.archiving_supported = True self.archiving_136_supported = True - if nbxmpp.NS_ARCHIVE_AUTO in obj.features: - self.archive_auto_supported = True - if nbxmpp.NS_ARCHIVE_MANAGE in obj.features: - self.archive_manage_supported = True - if nbxmpp.NS_ARCHIVE_MANUAL in obj.features: - self.archive_manual_supported = True - if nbxmpp.NS_ARCHIVE_PREF in obj.features: - self.archive_pref_supported = True + self.request_message_archiving_preferences() + if nbxmpp.NS_ARCHIVE_AUTO in obj.features: + self.archive_auto_supported = True + if nbxmpp.NS_ARCHIVE_MANAGE in obj.features: + self.archive_manage_supported = True + if nbxmpp.NS_ARCHIVE_MANUAL in obj.features: + self.archive_manual_supported = True + if nbxmpp.NS_ARCHIVE_PREF in obj.features: + self.archive_pref_supported = True if nbxmpp.NS_BLOCKING in obj.features: self.blocking_supported = True if nbxmpp.NS_ADDRESS in obj.features: diff -r 7f4e9978c415 -r d8128b776f31 src/common/message_archiving.py --- a/src/common/message_archiving.py Sat Sep 26 16:14:19 2015 +0200 +++ b/src/common/message_archiving.py Wed Sep 30 20:00:48 2015 +0200 @@ -334,6 +334,14 @@ def _nec_archiving_changed_received(self, obj): if obj.conn.name != self.name: return + for key in ('auto', 'default'): + if key not in obj.conf: + self.archiving_136_supported = False + self.archive_auto_supported = False + self.archive_manage_supported = False + self.archive_manual_supported = False + self.archive_pref_supported = False + return True for key in ('auto', 'method_auto', 'method_local', 'method_manual', 'default'): if key in obj.conf:

1 0

gajim: remove debug print
by Gajim 05 Oct '15

05 Oct '15

changeset 14c65bb2ee38 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=14c65bb2ee38 description: remove debug print diffstat: src/common/message_archiving.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (12 lines): diff -r f0b6ca5fd110 -r 14c65bb2ee38 src/common/message_archiving.py --- a/src/common/message_archiving.py Sat Sep 19 13:58:28 2015 +0200 +++ b/src/common/message_archiving.py Sun Sep 20 20:33:39 2015 +0200 @@ -110,8 +110,6 @@ def _nec_mam_decrypted_message_received(self, obj): if obj.conn.name != self.name: return - print 'ici' - print obj.msgtxt gajim.logger.save_if_not_exists(obj.with_, obj.direction, obj.tim, msg=obj.msgtxt, nick=obj.nick)

1 0

gajim: add new event after message stanza is built so it can be ...
by Gajim 05 Oct '15

05 Oct '15

changeset 788fb8924c42 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=788fb8924c42 description: add new event after message stanza is built so it can be modified by plugins. Fixes #8150 diffstat: src/common/connection.py | 15 +++++++++++++-- src/common/connection_handlers_events.py | 6 ++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diffs (63 lines): diff -r 14c65bb2ee38 -r 788fb8924c42 src/common/connection.py --- a/src/common/connection.py Sun Sep 20 20:33:39 2015 +0200 +++ b/src/common/connection.py Wed Sep 23 22:39:11 2015 +0200 @@ -818,6 +818,8 @@ self._nec_message_outgoing) gajim.ged.register_event_handler('gc-message-outgoing', ged.OUT_CORE, self._nec_gc_message_outgoing) + gajim.ged.register_event_handler('stanza-message-outgoing', + ged.OUT_CORE, self._nec_stanza_message_outgoing) # END __init__ def cleanup(self): @@ -832,6 +834,8 @@ self._nec_message_outgoing) gajim.ged.remove_event_handler('gc-message-outgoing', ged.OUT_CORE, self._nec_gc_message_outgoing) + gajim.ged.remove_event_handler('stanza-message-outgoing', ged.OUT_CORE, + self._nec_stanza_message_outgoing) def get_config_values_or_default(self): if gajim.config.get_per('accounts', self.name, 'keep_alives_enabled'): @@ -2131,9 +2135,11 @@ subject, type_, msg_iq, xhtml): if isinstance(msg_iq, list): for iq in msg_iq: - msg_id = self.connection.send(iq, now=obj.now) + gajim.nec.push_incoming_event(StanzaMessageOutgoingEvent( + None, conn=self, msg_iq=iq, now=obj.now)) else: - msg_id = self.connection.send(msg_iq, now=obj.now) + gajim.nec.push_incoming_event(StanzaMessageOutgoingEvent(None, + conn=self, msg_iq=msg_iq, now=obj.now)) gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, jid=jid, message=msg, keyID=keyID, chatstate=obj.chatstate)) if obj.callback: @@ -2159,6 +2165,11 @@ delayed=obj.delayed, attention=obj.attention, correction_msg=obj.correction_msg, callback=cb) + def _nec_stanza_message_outgoing(self, obj): + if obj.conn.name != self.name: + return + obj.msg_id = self.connection.send(obj.msg_iq, now=obj.now) + def send_contacts(self, contacts, fjid, type_='message'): """ Send contacts with RosterX (Xep-0144) diff -r 14c65bb2ee38 -r 788fb8924c42 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Sep 20 20:33:39 2015 +0200 +++ b/src/common/connection_handlers_events.py Wed Sep 23 22:39:11 2015 +0200 @@ -2616,6 +2616,12 @@ def generate(self): return True +class StanzaMessageOutgoingEvent(nec.NetworkOutgoingEvent): + name='stanza-message-outgoing' + base_network_events = [] + + def generate(self): + return True class GcMessageOutgoingEvent(nec.NetworkOutgoingEvent): name = 'gc-message-outgoing'

1 0

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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2015