Commits

commits@gajim.org

17632 discussions

gajim-plugins: [OTR] [fiaxh] mark OTR encrypted messages as priv...
by Gajim Plugins 24 Oct '15

24 Oct '15

changeset 0d88137a1b6c in /home/hg/repos/gajim-plugins author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:gajim-plugins?cmd=changeset;node=0d88137a1b6c description: [OTR] [fiaxh] mark OTR encrypted messages as private. Fixes #116 diffstat: gotr/manifest.ini | 2 +- gotr/otrmodule.py | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 54 insertions(+), 6 deletions(-) diffs (129 lines): diff -r a6efe8973330 -r 0d88137a1b6c gotr/manifest.ini --- a/gotr/manifest.ini Tue Oct 13 00:19:12 2015 +0200 +++ b/gotr/manifest.ini Sat Oct 24 13:08:35 2015 +0200 @@ -1,7 +1,7 @@ [info] name: Off-The-Record Encryption short_name: gotr -version: 1.8 +version: 1.9 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 a6efe8973330 -r 0d88137a1b6c gotr/otrmodule.py --- a/gotr/otrmodule.py Tue Oct 13 00:19:12 2015 +0200 +++ b/gotr/otrmodule.py Sat Oct 24 13:08:35 2015 +0200 @@ -46,6 +46,8 @@ MMS = 1024 PROTOCOL = 'xmpp' +MINVERSION_OUTGOING_MSG_STAZA = "0.16.4" + enc_tip = 'A private chat session is established to this contact ' \ 'with this fingerprint' unused_tip = 'A private chat session is established to this contact using ' \ @@ -53,15 +55,21 @@ ended_tip = 'The private chat session to this contact has ended' inactive_tip = 'Communication to this contact is currently ' \ 'unencrypted' +msg_not_send = _('Your message was not send. Either end ' + 'your private conversation, or restart it') + import logging +import nbxmpp import os import pickle import time import sys from pprint import pformat +from distutils.version import StrictVersion import common.xmpp +from common import defs from common import gajim from common import ged from common.connection_handlers_events import MessageOutgoingEvent @@ -134,6 +142,7 @@ session = appdata.get('session', None) if session is not None: stanza.setThread(session.thread_id) + add_message_processing_hints(stanza) gajim.connections[account].connection.send(stanza, now=True) def setState(self, newstate): @@ -279,8 +288,12 @@ 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) + if StrictVersion(defs.version) < StrictVersion(MINVERSION_OUTGOING_MSG_STAZA): + self.events_handlers['message-outgoing'] = (ged.OUT_PRECORE, + self.handle_outgoing_msg) + else: + self.events_handlers['stanza-message-outgoing'] = (ged.OUT_PRECORE, + self.handle_outgoing_msg_stanza) self.gui_extension_points = { 'chat_control' : (self.cc_connect, self.cc_disconnect) @@ -605,6 +618,39 @@ return PASS + def handle_outgoing_msg_stanza(self, event): + xhtml = event.msg_iq.getXHTML() + body = event.msg_iq.getBody() + encrypted = False + try: + if xhtml: + xhtml = xhtml.encode('utf8') + encrypted_msg = self.us[event.conn.name].\ + getContext(event.msg_iq.getTo()).\ + sendMessage(potr.context.FRAGMENT_SEND_ALL_BUT_LAST, xhtml) + if xhtml != encrypted_msg.strip(): #.strip() because sendMessage() adds whitespaces + encrypted = True + event.msg_iq.setXHTML(encrypted_msg) + elif body: + body = escape(body).encode('utf8') + encrypted_msg = self.us[event.conn.name].\ + getContext(event.msg_iq.getTo()).\ + sendMessage(potr.context.FRAGMENT_SEND_ALL_BUT_LAST, body) + if body != encrypted_msg.strip(): + encrypted = True + event.msg_iq.setBody(encrypted_msg) + except potr.context.NotEncryptedError, e: + if e.args[0] == potr.context.EXC_FINISHED: + self.gajim_log(msg_not_send, event.conn.name, event.msg_iq.getTo()) + return IGNORE + else: + raise e + + if encrypted: + add_message_processing_hints(event.msg_iq) + + return PASS + def handle_outgoing_msg(self, event): try: if hasattr(event, 'otrmessage'): @@ -635,9 +681,7 @@ potrrootlog.debug('processed message={0!r}'.format(newmsg)) except potr.context.NotEncryptedError, e: if e.args[0] == potr.context.EXC_FINISHED: - self.gajim_log(_('Your message was not send. Either end ' - 'your private conversation, or restart it'), event.account, - fjid) + self.gajim_log(msg_not_send, event.account, fjid) return IGNORE else: raise e @@ -695,3 +739,7 @@ s = s.replace("\n", " ") return s +def add_message_processing_hints(stanza): + stanza.addChild(name='private', namespace=nbxmpp.NS_CARBONS) + stanza.addChild(name='no-permanent-store', namespace=nbxmpp.NS_MSG_HINTS) + stanza.addChild(name='no-copy', namespace=nbxmpp.NS_MSG_HINTS) \ No newline at end of file

1 0

gajim-plugins: Fixed some concurrency problems when using gtk te...
by Gajim Plugins 12 Oct '15

12 Oct '15

changeset a6efe8973330 in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: details:gajim-plugins?cmd=changeset;node=a6efe8973330 description: Fixed some concurrency problems when using gtk textview from multiple threads... diffstat: url_image_preview/manifest.ini | 2 +- url_image_preview/url_image_preview.py | 33 +++++++++++++++++++-------------- 2 Dateien ver?ndert, 20 Zeilen hinzugef?gt(+), 15 Zeilen entfernt(-) Unterschiede (82 Zeilen): diff -r 3c8e529eba17 -r a6efe8973330 url_image_preview/manifest.ini --- a/url_image_preview/manifest.ini Sat Oct 10 14:32:24 2015 +0200 +++ b/url_image_preview/manifest.ini Tue Oct 13 00:19:12 2015 +0200 @@ -1,7 +1,7 @@ [info] name: Url image preview short_name: url_image_preview -version: 0.6.2 +version: 0.6.3 description: Url image preview in chatbox. Based on patch in <a href="http://trac.gajim.org/attachment/ticket/5300">ticket #5300</a>. authors = Denis Fomin <fominde(a)gmail.com> diff -r 3c8e529eba17 -r a6efe8973330 url_image_preview/url_image_preview.py --- a/url_image_preview/url_image_preview.py Sat Oct 10 14:32:24 2015 +0200 +++ b/url_image_preview/url_image_preview.py Tue Oct 13 00:19:12 2015 +0200 @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- import gtk +import gobject import re import os import urllib2 @@ -110,17 +111,17 @@ # Check if mime type is acceptable if file_mime.lower() not in ACCEPTED_MIME_TYPES: # URL is already displayed - log.info('Not accepted mime type for URL: %s' % url) + log.info("Not accepted mime type '%s' for URL: '%s'" % (file_mime.lower(), url)) return # Check if file size is acceptable if file_size > self.plugin.config['MAX_FILE_SIZE'] or file_size == 0: - log.info('File size too big or unknown for URL: %s' % url) + log.info("File size too big or unknown for URL: '%s'" % url) # URL is already displayed return # Start downloading image gajim.thread_interface(helpers.download_image, [ self.textview.account, { - 'src': url, 'max_size':self.plugin.config['MAX_FILE_SIZE'] } ], + 'src': url, 'max_size': self.plugin.config['MAX_FILE_SIZE'] } ], self._update_img, [url, file_mime, repl_start, repl_end]) def _update_img(self, (mem, alt), url, file_mime, repl_start, repl_end): @@ -132,22 +133,26 @@ pixbuf = loader.get_pixbuf() 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.add_child_at_anchor(eb, anchor) + # this is threadsafe (gtk textview is NOT threadsafe by itself!!) + def add_to_textview(): + 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.add(img) + eb.show_all() + self.textview.tv.add_child_at_anchor(eb, anchor) + buffer_.delete(iter_, buffer_.get_iter_at_mark(repl_end)) + return False + gobject.idle_add(add_to_textview) except Exception: # URL is already displayed log.error('Could not display image for URL: %s' % url)

1 0

gajim-plugins: fix loading zip file under windows, ignore packs ...
by Gajim Plugins 10 Oct '15

10 Oct '15

changeset 3c8e529eba17 in /home/hg/repos/gajim-plugins author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:gajim-plugins?cmd=changeset;node=3c8e529eba17 description: fix loading zip file under windows, ignore packs that can't be loaded. Fixes #114 diffstat: emoticons_pack/emoticons_pack.py | 27 +++++++++++++++------------ emoticons_pack/manifest.ini | 2 +- 2 files changed, 16 insertions(+), 13 deletions(-) diffs (55 lines): diff -r 3fb7dec776d0 -r 3c8e529eba17 emoticons_pack/emoticons_pack.py --- a/emoticons_pack/emoticons_pack.py Thu Oct 08 15:54:46 2015 +0200 +++ b/emoticons_pack/emoticons_pack.py Sat Oct 10 14:32:24 2015 +0200 @@ -282,24 +282,27 @@ conf.readfp(_file) for section in conf.sections(): # get icon - filename = conf.get(section, 'icon') - filename = os.path.join(section, filename) - zip_file = os.path.join(self.__path__, 'emoticons_pack.zip') - with zipfile.ZipFile(zip_file, 'r') as myzip: - icon_file = myzip.open(filename, mode='r') - data = icon_file.read() - pbl = gtk.gdk.PixbufLoader() - pbl.set_size(16, 16) - pbl.write(data) - pbl.close() - icon = pbl.get_pixbuf() + try: + filename = conf.get(section, 'icon') + filename = section + '/' + filename + zip_file = os.path.join(self.__path__, 'emoticons_pack.zip') + with zipfile.ZipFile(zip_file, 'r') as myzip: + icon_file = myzip.open(filename, mode='r') + data = icon_file.read() + pbl = gtk.gdk.PixbufLoader() + pbl.set_size(16, 16) + pbl.write(data) + pbl.close() + icon = pbl.get_pixbuf() + except Exception: + continue authors = _('Unknown') converter = _('Unknown') if conf.has_option(section, 'authors'): authors = conf.get(section, 'authors') if conf.has_option(section, 'converter'): - authors = conf.get(section, 'converter') + converter = conf.get(section, 'converter') self.model.append( [icon, section, diff -r 3fb7dec776d0 -r 3c8e529eba17 emoticons_pack/manifest.ini --- a/emoticons_pack/manifest.ini Thu Oct 08 15:54:46 2015 +0200 +++ b/emoticons_pack/manifest.ini Sat Oct 10 14:32:24 2015 +0200 @@ -1,7 +1,7 @@ [info] name: Emoticons pack short_name: emoticons_pack -version: 0.0.7 +version: 0.1 description: Install, update and view detailed legend of emoticons authors: Denis Fomin <fominde(a)gmail.com> homepage: http://trac-plugins.gajim.org/wiki/

1 0

gajim-plugins: Use GTK Pixbuf as fallback for downsampling image...
by Gajim Plugins 08 Oct '15

08 Oct '15

changeset 3fb7dec776d0 in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: details:gajim-plugins?cmd=changeset;node=3fb7dec776d0 description: Use GTK Pixbuf as fallback for downsampling images, if PIL is not available...some minor bugfixes in upload component detection... diffstat: httpupload/httpupload.py | 144 ++++++++++++++++++++++++++++++++++++++-------- httpupload/manifest.ini | 3 +- 2 Dateien ver?ndert, 119 Zeilen hinzugef?gt(+), 28 Zeilen entfernt(-) Unterschiede (257 Zeilen): diff -r 556489c4f110 -r 3fb7dec776d0 httpupload/httpupload.py --- a/httpupload/httpupload.py Thu Oct 08 15:46:38 2015 +0200 +++ b/httpupload/httpupload.py Thu Oct 08 15:54:46 2015 +0200 @@ -3,20 +3,23 @@ from common import demandimport demandimport.enable() -demandimport.ignore += ['builtins', '__builtin__'] +demandimport.ignore += ['builtins', '__builtin__', 'PIL'] import gtk import gobject import os +import time import base64 +import tempfile import urllib2 import mimetypes # better use the magic packet, but that's not a standard lib import gtkgui_helpers from Queue import Queue try: from PIL import Image + pil_available = True except: - pass + pil_available = False import StringIO import base64 @@ -28,15 +31,16 @@ from dialogs import FileChooserDialog, ImageChooserDialog, ErrorDialog import nbxmpp -#NS_HTTPUPLOAD = 'eu:siacs:conversations:http:upload' # old namespace before XEP publication NS_HTTPUPLOAD = 'urn:xmpp:http:upload' # XEP-0363 (http://xmpp.org/extensions/xep-0363.html) jid_to_servers = {} iq_ids_to_callbacks = {} +last_info_query = {} max_thumbnail_size = 2048 max_thumbnail_dimension = 160 class HttpuploadPlugin(GajimPlugin): + @log_calls('HttpuploadPlugin') def init(self): self.config_dialog = None # HttpuploadPluginConfigDialog(self) @@ -73,10 +77,40 @@ # update all buttons for base in self.controls: self.update_button_state(base.chat_control) - + @log_calls('HttpuploadPlugin') def connect_with_chat_control(self, control): + global jid_to_servers + global iq_ids_to_callbacks + global last_info_query self.chat_control = control + # query info at most every 300 seconds (5 minutes) in case something goes wrong + if (not self.chat_control.account in last_info_query or \ + last_info_query[self.chat_control.account] + 300 < time.time()) and \ + not gajim.get_jid_from_account(self.chat_control.account) in jid_to_servers and \ + gajim.account_is_connected(self.chat_control.account): + log.info("Account %s: Using dicovery to find jid of httpupload component" % self.chat_control.account) + id_ = gajim.get_an_id() + iq = nbxmpp.Iq( + typ='get', + to=gajim.get_server_from_jid(gajim.get_jid_from_account(self.chat_control.account)), + queryNS="http://jabber.org/protocol/disco#items" + ) + iq.setID(id_) + def query_info(stanza): + global last_info_query + for item in stanza.getTag("query").getTags("item"): + id_ = gajim.get_an_id() + iq = nbxmpp.Iq( + typ='get', + to=item.getAttr("jid"), + queryNS="http://jabber.org/protocol/disco#info" + ) + iq.setID(id_) + gajim.connections[control.account].connection.send(iq) + last_info_query[self.chat_control.account] = time.time() + iq_ids_to_callbacks[str(id_)] = query_info + gajim.connections[self.chat_control.account].connection.send(iq) base = Base(self, self.chat_control) self.controls.append(base) if self.first_run: @@ -85,6 +119,7 @@ gtk.keysyms.u, gtk.gdk.MOD1_MASK, 'mykeypress', int, gtk.keysyms.u, gtk.gdk.ModifierType, gtk.gdk.MOD1_MASK) self.first_run = False + self.update_button_state(self.chat_control) @log_calls('HttpuploadPlugin') def disconnect_from_chat_control(self, chat_control): @@ -98,7 +133,10 @@ if base.chat_control == chat_control: if gajim.connections[chat_control.account].connection == None and \ gajim.get_jid_from_account(chat_control.account) in jid_to_servers: + # maybe don't delete this and detect vanished upload components when actually trying to upload something + log.info("Deleting %s from jid_to_servers (disconnected)" % gajim.get_jid_from_account(chat_control.account)) del jid_to_servers[gajim.get_jid_from_account(chat_control.account)] + #pass is_supported = gajim.get_jid_from_account(chat_control.account) in jid_to_servers and \ gajim.connections[chat_control.account].connection != None if not is_supported: @@ -181,7 +219,8 @@ actions_hbox = self.chat_control.xml.get_object('actions_hbox') actions_hbox.remove(self.button) actions_hbox.remove(self.image_button) - if self.chat_control.handlers[self.keypress_id].handler_is_connected(self.keypress_id): + if self.keypress_id in self.chat_control.handlers and \ + self.chat_control.handlers[self.keypress_id].handler_is_connected(self.keypress_id): self.chat_control.handlers[self.keypress_id].disconnect(self.keypress_id) del self.chat_control.handlers[self.keypress_id] @@ -263,27 +302,57 @@ if (not isinstance(self.chat_control, chat_control.ChatControl) or not self.chat_control.gpg_is_active) and \ self.dialog_type == 'image' and is_image: progress_messages.put(_('Calculating (possible) image thumbnail...')) - try: - quality_steps = (100, 80, 60, 50, 40, 30, 25, 23, 20, 18, 15, 13, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1) - for quality in quality_steps: - thumb = Image.open(path_to_file) - thumb.thumbnail((max_thumbnail_dimension, max_thumbnail_dimension), Image.ANTIALIAS) - output = StringIO.StringIO() - thumb.save(output, format='JPEG', quality=quality, optimize=True) - thumb = output.getvalue() - output.close() - thumb = urllib2.quote(base64.standard_b64encode(thumb), '') - log.debug("thumbnail jpeg quality %d produces an image of size %d..." % (quality, len(thumb))) - if len(thumb) < max_thumbnail_size: - break - if len(thumb) > max_thumbnail_size: - log.info("Couldn't compress image enough, not sending any thumbnail") - else: - log.info("Using thumbnail jpeg quality %d (image size: %d bytes)" % (quality, len(thumb))) - xhtml = '<body> <a href="%s"> <img alt="%s" src="data:image/png;base64,%s"/> </a></body>' % \ - (get.getData(), get.getData(), thumb) - except: - pass + thumb = None + quality_steps = (100, 80, 60, 50, 40, 35, 30, 25, 23, 20, 18, 15, 13, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1) + if pil_available: + log.info("PIL available, using it for image downsampling") + try: + for quality in quality_steps: + thumb = Image.open(path_to_file) + thumb.thumbnail((max_thumbnail_dimension, max_thumbnail_dimension), Image.ANTIALIAS) + output = StringIO.StringIO() + thumb.save(output, format='JPEG', quality=quality, optimize=True) + thumb = output.getvalue() + output.close() + thumb = urllib2.quote(base64.standard_b64encode(thumb), '') + log.debug("thumbnail jpeg quality %d produces an image of size %d..." % (quality, len(thumb))) + if len(thumb) < max_thumbnail_size: + break + except: + thumb = None + else: + log.info("PIL not available, using GTK for image downsampling") + temp_file = None + try: + with open(path_to_file, 'rb') as content_file: + thumb = content_file.read() + loader = gtk.gdk.PixbufLoader() + loader.write(thumb) + loader.close() + pixbuf = loader.get_pixbuf() + scaled_pb = self.get_pixbuf_of_size(pixbuf, max_thumbnail_dimension) + handle, temp_file = tempfile.mkstemp(suffix='.jpeg', prefix='gajim_httpupload_scaled_tmp', dir=gajim.TMP) + log.debug("Saving temporary jpeg image to '%s'..." % temp_file) + os.close(handle) + for quality in quality_steps: + scaled_pb.save(temp_file, "jpeg", {"quality": str(quality)}) + with open(temp_file, 'rb') as content_file: + thumb = content_file.read() + thumb = urllib2.quote(base64.standard_b64encode(thumb), '') + log.debug("thumbnail jpeg quality %d produces an image of size %d..." % (quality, len(thumb))) + if len(thumb) < max_thumbnail_size: + break + except: + thumb = None + finally: + if temp_file: + os.unlink(temp_file) + if thumb and len(thumb) > max_thumbnail_size: + log.info("Couldn't compress image enough, not sending any thumbnail") + else: + log.info("Using thumbnail jpeg quality %d (image size: %d bytes)" % (quality, len(thumb))) + xhtml = '<body> <a href="%s"> <img alt="%s" src="data:image/png;base64,%s"/> </a></body>' % \ + (get.getData(), get.getData(), thumb) progress_window.close_dialog() self.chat_control.send_message(message=get.getData(), xhtml=xhtml) self.chat_control.msg_textview.grab_focus() @@ -322,10 +391,11 @@ is_supported = gajim.get_jid_from_account(self.chat_control.account) in jid_to_servers and \ gajim.connections[self.chat_control.account].connection != None + log.debug("jid_to_servers of %s: %s ; connection: %s" % (gajim.get_jid_from_account(self.chat_control.account), str(jid_to_servers[gajim.get_jid_from_account(self.chat_control.account)]), str(gajim.connections[self.chat_control.account].connection))) if not is_supported: progress_window.close_dialog() log.error("upload component vanished, account got disconnected??") - ErrorDialog(_('Your server does not support http uploads or you just got disconnected'), + ErrorDialog(_('Your server does not support http uploads or you just got disconnected.\nPlease try to reconnect or reopen the chat window to fix this.'), transient_for=self.chat_control.parent_win.window) return @@ -371,6 +441,26 @@ def on_image_button_clicked(self, widget): self.dialog_type = 'image' self.dlg = ImageChooserDialog(on_response_ok=self.on_file_dialog_ok, on_response_cancel=None) + + 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 scaled_pixbuf + image_width = pixbuf.get_width() + image_height = pixbuf.get_height() + + if image_width > image_height: + if image_width > size: + image_height = int(size / float(image_width) * image_height) + image_width = int(size) + else: + if image_height > size: + image_width = int(size / float(image_height) * image_width) + image_height = int(size) + + crop_pixbuf = pixbuf.scale_simple(image_width, image_height, + gtk.gdk.INTERP_BILINEAR) + return crop_pixbuf class StreamFileWithProgress(file): diff -r 556489c4f110 -r 3fb7dec776d0 httpupload/manifest.ini --- a/httpupload/manifest.ini Thu Oct 08 15:46:38 2015 +0200 +++ b/httpupload/manifest.ini Thu Oct 08 15:54:46 2015 +0200 @@ -1,7 +1,7 @@ [info] name: HttpUpload short_name: httpupload -version: 0.2.11 +version: 0.3.1 description: This plugin is designed to send a file to a contact or muc by using httpupload. Your server must support <a href="http://xmpp.org/extensions/xep-0363.html">XEP-0363: HTTP Upload</a>. Conversations supported this. @@ -9,6 +9,7 @@ and maintains the scheme data: URI, a thumbnail image is send along the link to the full size image. If the receiving side doesn't support this, only a text message containing the link to the image is send. authors: Thilo Molitor <thilo(a)eightysoft.de> + Anders Sandblad <runeson(a)gmail.com> homepage: https://trac-plugins.gajim.org/wiki/HttpUploadPlugin min_gajim_version: 0.16.0 max_gajim_version: 0.16.9

1 0

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. 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\'> ' - 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", " ") 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

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