Commits September 2015

commits@gajim.org

1 participants
27 discussions

gajim-plugins: Fixed format string (%% instead of single % for l...
by Gajim Plugins 24 Sep '15

24 Sep '15

changeset fdc7548539b7 in /home/hg/repos/gajim-plugins author: hg branches: details:gajim-plugins?cmd=changeset;node=fdc7548539b7 description: Fixed format string (%% instead of single % for literal percent char) diffstat: httpupload/httpupload.py | 2 +- 1 Dateien ver?ndert, 1 Zeilen hinzugef?gt(+), 1 Zeilen entfernt(-) Unterschiede (12 Zeilen): diff -r 4e19c058eae8 -r fdc7548539b7 httpupload/httpupload.py --- a/httpupload/httpupload.py Thu Sep 24 14:24:27 2015 +0200 +++ b/httpupload/httpupload.py Thu Sep 24 20:01:20 2015 +0200 @@ -450,7 +450,7 @@ pct = (float(seen) / total) * 100.0 self.progressbar.set_fraction(float(seen) / total) self.progressbar.set_text(str(int(pct)) + "%") - log.debug('upload progress: %.2f% (%d of %d bytes)' % (pct, seen, total)) + log.debug('upload progress: %.2f%% (%d of %d bytes)' % (pct, seen, total)) def close_dialog(self): self.on_cancel(None)

1 0

gajim-plugins: Changed namespace to official namespace assigned ...
by Gajim Plugins 24 Sep '15

24 Sep '15

changeset 4fabbde3c957 in /home/hg/repos/gajim-plugins author: hg branches: details:gajim-plugins?cmd=changeset;node=4fabbde3c957 description: Changed namespace to official namespace assigned by XEP-0363 (http://xmpp.org/extensions/xep-0363.html) diffstat: httpupload/httpupload.py | 5 +++-- 1 Dateien ver?ndert, 3 Zeilen hinzugef?gt(+), 2 Zeilen entfernt(-) Unterschiede (22 Zeilen): diff -r 880aab3698b1 -r 4fabbde3c957 httpupload/httpupload.py --- a/httpupload/httpupload.py Thu Sep 03 01:47:28 2015 +0200 +++ b/httpupload/httpupload.py Thu Sep 24 14:19:15 2015 +0200 @@ -28,7 +28,8 @@ from dialogs import FileChooserDialog, ImageChooserDialog, ErrorDialog import nbxmpp -NS_HTTPUPLOAD = 'eu:siacs:conversations:http:upload' # XEP-0363 (http://xmpp.org/extensions/xep-0363.html) +#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 = {} @@ -449,7 +450,7 @@ pct = (float(seen) / total) * 100.0 self.progressbar.set_fraction(float(seen) / total) self.progressbar.set_text(str(int(pct)) + "%") - log.debug('upload progress: %.2f (%d of %d bytes)' % (pct, seen, total)) + log.debug('upload progress: %.2f% (%d of %d bytes)' % (pct, seen, total)) def close_dialog(self): self.on_cancel(None)

1 0

gajim-plugins: Updated version numer in manifest file and slight...
by Gajim Plugins 24 Sep '15

24 Sep '15

changeset 1998f8122646 in /home/hg/repos/gajim-plugins author: hg branches: details:gajim-plugins?cmd=changeset;node=1998f8122646 description: Updated version numer in manifest file and slightly updated the description text diffstat: httpupload/manifest.ini | 3 ++- 1 Dateien ver?ndert, 2 Zeilen hinzugef?gt(+), 1 Zeilen entfernt(-) Unterschiede (18 Zeilen): diff -r 4fabbde3c957 -r 1998f8122646 httpupload/manifest.ini --- a/httpupload/manifest.ini Thu Sep 24 14:19:15 2015 +0200 +++ b/httpupload/manifest.ini Thu Sep 24 14:22:48 2015 +0200 @@ -1,12 +1,13 @@ [info] name: HttpUpload short_name: httpupload -version: 0.2.9 +version: 0.2.10 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. If the receiving side supports <a href="http://xmpp.org/extensions/xep-0071.html">XEP-0071: XHTML-IM</a> 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> homepage: https://trac-plugins.gajim.org/wiki/HttpUploadPlugin min_gajim_version: 0.16.0

1 0

gajim-plugins: Merged url_image_preview and httpupload changes
by Gajim Plugins 24 Sep '15

24 Sep '15

changeset 4e19c058eae8 in /home/hg/repos/gajim-plugins author: hg branches: details:gajim-plugins?cmd=changeset;node=4e19c058eae8 description: Merged url_image_preview and httpupload changes diffstat: url_image_preview/config_dialog.ui | 140 ++++++++++++++++----- url_image_preview/manifest.ini | 3 +- url_image_preview/url_image_preview.py | 208 ++++++++++++++++++++++++++------ 3 Dateien ver?ndert, 278 Zeilen hinzugef?gt(+), 73 Zeilen entfernt(-) Unterschiede (gek?rzt von 471 auf 300 Zeilen): diff -r 1998f8122646 -r 4e19c058eae8 url_image_preview/config_dialog.ui --- a/url_image_preview/config_dialog.ui Thu Sep 24 14:22:48 2015 +0200 +++ b/url_image_preview/config_dialog.ui Thu Sep 24 14:24:27 2015 +0200 @@ -1,56 +1,128 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> <requires lib="gtk+" version="2.16"/>  + <object class="GtkListStore" id="liststore1"> + <columns> +  + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">256 KiB</col> + </row> + <row> + <col id="0" translatable="yes">512 KiB</col> + </row> + <row> + <col id="0" translatable="yes">1 MiB</col> + </row> + <row> + <col id="0" translatable="yes">5 MiB</col> + </row> + <row> + <col id="0" translatable="yes">10 MiB</col> + </row> + </data> + </object> <object class="GtkWindow" id="window1"> + <property name="can_focus">False</property> <child> <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">9</property> - <property name="orientation">vertical</property> <child> - <object class="GtkHBox" id="hbox2"> + <object class="GtkFrame" id="frame1"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <object class="GtkLabel" id="preview_size_lebel"> - <property name="width_request">133</property> + <object class="GtkTable" id="table1"> <property name="visible">True</property> - <property name="xalign">0.029999999329447746</property> - <property name="label" translatable="yes">Preview size</property> - <property name="ellipsize">start</property> - <property name="single_line_mode">True</property> - <property name="track_visited_links">False</property> + <property name="can_focus">False</property> + <property name="n_rows">2</property> + <property name="n_columns">2</property> + <child> + <object class="GtkSpinButton" id="preview_size"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + <property name="width_chars">6</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + <property name="primary_icon_sensitive">True</property> + <property name="secondary_icon_sensitive">True</property> + <property name="snap_to_ticks">True</property> + <property name="numeric">True</property> + <signal name="value-changed" handler="preview_size_value_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options"/> + </packing> + </child> + <child> + <object class="GtkComboBox" id="max_size_combobox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="model">liststore1</property> + <signal name="changed" handler="max_size_value_changed" swapped="no"/> + <child> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options">GTK_EXPAND</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="max_size_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="xpad">13</property> + <property name="label" translatable="yes">Accept files smaller then</property> + <property name="track_visited_links">False</property> + </object> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options">GTK_EXPAND</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="preview_size_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="xpad">12</property> + <property name="label" translatable="yes">Preview size</property> + <property name="track_visited_links">False</property> + </object> + <packing> + <property name="y_options">GTK_EXPAND</property> + </packing> + </child> </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="preview_size"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Preview size(10-512)</property> - <property name="invisible_char">●</property> - <property name="width_chars">6</property> - <property name="snap_to_ticks">True</property> - <property name="numeric">True</property> - <signal name="value_changed" handler="preview_size_value_changed"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="padding">6</property> <property name="position">0</property> </packing> </child> - <child> - <placeholder/> - </child> </object> </child> </object> diff -r 1998f8122646 -r 4e19c058eae8 url_image_preview/manifest.ini --- a/url_image_preview/manifest.ini Thu Sep 24 14:22:48 2015 +0200 +++ b/url_image_preview/manifest.ini Thu Sep 24 14:24:27 2015 +0200 @@ -1,11 +1,12 @@ [info] name: Url image preview short_name: url_image_preview -version: 0.5.4 +version: 0.6.0 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> Yann Leboulanger <asterix(a)lagaule.org> + Anders Sandblad <runeson(a)gmail.com> homepage = http://trac-plugins.gajim.org/wiki/UrlImagePreviewPlugin min_gajim_version: 0.16 max_gajim_version: 0.16.9 diff -r 1998f8122646 -r 4e19c058eae8 url_image_preview/url_image_preview.py --- a/url_image_preview/url_image_preview.py Thu Sep 24 14:22:48 2015 +0200 +++ b/url_image_preview/url_image_preview.py Thu Sep 24 14:24:27 2015 +0200 @@ -3,16 +3,18 @@ import gtk import re import os +import urllib2 +import base64 from common import gajim from common import helpers from plugins import GajimPlugin -from plugins.helpers import log_calls +from plugins.helpers import log_calls, log from plugins.gui import GajimPluginConfigDialog from conversation_textview import TextViewImage -EXTENSIONS = ('.png','.jpg','.jpeg','.gif','.raw','.svg') - +ACCEPTED_MIME_TYPES = ('image/png','image/jpeg','image/gif','image/raw', + 'image/svg+xml') class UrlImagePreviewPlugin(GajimPlugin): @log_calls('UrlImagePreviewPlugin') @@ -24,7 +26,8 @@ 'print_special_text': (self.print_special_text, self.print_special_text1),} self.config_default_values = { - 'PREVIEW_SIZE': (150, 'Preview size(10-512)'),} + 'PREVIEW_SIZE': (150, 'Preview size(10-512)'), + 'MAX_FILE_SIZE': (524288, 'Max file size for image preview')} self.chat_control = None self.controls = [] @@ -47,7 +50,7 @@ if control.chat_control.conv_textview != tv: continue control.print_special_text(special_text, other_tags, graphics=True, - iter_=None) + iter_=iter_) def print_special_text1(self, chat_control, special_text, other_tags=None, graphics=True, iter_=None): @@ -69,48 +72,167 @@ # remove qip bbcode special_text = special_text.rsplit('[/img]')[0] - name, extension = os.path.splitext(special_text) - if extension.lower() not in EXTENSIONS: - return - if not special_text.startswith('http://') and \ - special_text.startswith('www.'): + if special_text.startswith('www.'): special_text = 'http://' + special_text - if not special_text.startswith('ftp://') and \ - special_text.startswith('ftp.'): + if special_text.startswith('ftp.'): special_text = 'ftp://' + special_text - # show pics preview buffer_ = self.textview.tv.get_buffer() - iter_ = buffer_.get_end_iter() - mark = buffer_.create_mark(None, iter_, True) - # start downloading image - gajim.thread_interface(helpers.download_image, [ - self.textview.account, {'src': special_text}], self._update_img, - [mark]) + if not iter_: + iter_ = buffer_.get_end_iter() - def _update_img(self, (mem, alt), mark): + # Detect XHTML-IM link + ttt = buffer_.get_tag_table() + tags_ = [(ttt.lookup(t) if isinstance(t, str) else t) for t in other_tags] + for t in tags_: + is_xhtml_link = getattr(t, 'href', None) + if is_xhtml_link: + break + + # Show URL, until image is loaded (if ever) + repl_start = buffer_.create_mark(None, iter_, True) + buffer_.insert_with_tags(iter_, special_text, \ + *[(ttt.lookup(t) if isinstance(t, str) else t) for t in ["url"]]) + repl_end = buffer_.create_mark(None, iter_, True) + + # First get the http head request with does not fetch data, just headers + gajim.thread_interface(self._get_http_head, [self.textview.account, + special_text], self._check_mime_size, [special_text, repl_start, repl_end]) + + # Don't print the URL in the message window (in the calling function) + self.textview.plugin_modified = True + + def _check_mime_size(self, (file_mime, file_size), url, repl_start, repl_end): + # 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) + 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) + # 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'] } ], + self._update_img, [url, file_mime, repl_start, repl_end]) + + def _update_img(self, (mem, alt), url, file_mime, repl_start, repl_end): if mem: try: loader = gtk.gdk.PixbufLoader() loader.write(mem) loader.close() pixbuf = loader.get_pixbuf()

1 0

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

23 Sep '15

changeset f626afbd5747 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=f626afbd5747 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 f08b1d429e2a -r f626afbd5747 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 @@ -817,6 +817,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): @@ -831,6 +833,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'): @@ -2111,9 +2115,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: @@ -2139,6 +2145,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 f08b1d429e2a -r f626afbd5747 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 @@ -2592,6 +2592,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: remove debug print
by Gajim 20 Sep '15

20 Sep '15

changeset f08b1d429e2a in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=f08b1d429e2a description: remove debug print diffstat: src/common/message_archiving.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (12 lines): diff -r 302855b1f881 -r f08b1d429e2a 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-plugins: [url_image_preview] [Arune]:
by Gajim Plugins 20 Sep '15

20 Sep '15

changeset 0a250491573a in /home/hg/repos/gajim-plugins author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:gajim-plugins?cmd=changeset;node=0a250491573a description: [url_image_preview] [Arune]: * Content-type and content-length are checked for every URL in MUCs and regular chats * Plugin config now have a setting for max image download size (which is checked to content-length) * If content-type match and content-length is smaller then setting the image will be downloaded and displayed * If image can be loaded, the URL is no longer displayed (except as a tooltip on the image) * Image is clickable (opens browser with URL) * Images are displayed using XHTML * URL is displayed until image is displayed Fixes #102, #105 diffstat: url_image_preview/config_dialog.ui | 140 ++++++++++++++++----- url_image_preview/manifest.ini | 3 +- url_image_preview/url_image_preview.py | 208 ++++++++++++++++++++++++++------ 3 files changed, 278 insertions(+), 73 deletions(-) diffs (truncated from 471 to 300 lines): diff -r 880aab3698b1 -r 0a250491573a url_image_preview/config_dialog.ui --- a/url_image_preview/config_dialog.ui Thu Sep 03 01:47:28 2015 +0200 +++ b/url_image_preview/config_dialog.ui Sun Sep 20 18:51:51 2015 +0200 @@ -1,56 +1,128 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> <requires lib="gtk+" version="2.16"/>  + <object class="GtkListStore" id="liststore1"> + <columns> +  + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">256 KiB</col> + </row> + <row> + <col id="0" translatable="yes">512 KiB</col> + </row> + <row> + <col id="0" translatable="yes">1 MiB</col> + </row> + <row> + <col id="0" translatable="yes">5 MiB</col> + </row> + <row> + <col id="0" translatable="yes">10 MiB</col> + </row> + </data> + </object> <object class="GtkWindow" id="window1"> + <property name="can_focus">False</property> <child> <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">9</property> - <property name="orientation">vertical</property> <child> - <object class="GtkHBox" id="hbox2"> + <object class="GtkFrame" id="frame1"> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> <child> - <object class="GtkLabel" id="preview_size_lebel"> - <property name="width_request">133</property> + <object class="GtkTable" id="table1"> <property name="visible">True</property> - <property name="xalign">0.029999999329447746</property> - <property name="label" translatable="yes">Preview size</property> - <property name="ellipsize">start</property> - <property name="single_line_mode">True</property> - <property name="track_visited_links">False</property> + <property name="can_focus">False</property> + <property name="n_rows">2</property> + <property name="n_columns">2</property> + <child> + <object class="GtkSpinButton" id="preview_size"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + <property name="width_chars">6</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + <property name="primary_icon_sensitive">True</property> + <property name="secondary_icon_sensitive">True</property> + <property name="snap_to_ticks">True</property> + <property name="numeric">True</property> + <signal name="value-changed" handler="preview_size_value_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options"/> + </packing> + </child> + <child> + <object class="GtkComboBox" id="max_size_combobox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="model">liststore1</property> + <signal name="changed" handler="max_size_value_changed" swapped="no"/> + <child> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options">GTK_EXPAND</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="max_size_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="xpad">13</property> + <property name="label" translatable="yes">Accept files smaller then</property> + <property name="track_visited_links">False</property> + </object> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options">GTK_EXPAND</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="preview_size_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="xpad">12</property> + <property name="label" translatable="yes">Preview size</property> + <property name="track_visited_links">False</property> + </object> + <packing> + <property name="y_options">GTK_EXPAND</property> + </packing> + </child> </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="preview_size"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Preview size(10-512)</property> - <property name="invisible_char">●</property> - <property name="width_chars">6</property> - <property name="snap_to_ticks">True</property> - <property name="numeric">True</property> - <signal name="value_changed" handler="preview_size_value_changed"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="padding">6</property> <property name="position">0</property> </packing> </child> - <child> - <placeholder/> - </child> </object> </child> </object> diff -r 880aab3698b1 -r 0a250491573a url_image_preview/manifest.ini --- a/url_image_preview/manifest.ini Thu Sep 03 01:47:28 2015 +0200 +++ b/url_image_preview/manifest.ini Sun Sep 20 18:51:51 2015 +0200 @@ -1,11 +1,12 @@ [info] name: Url image preview short_name: url_image_preview -version: 0.5.4 +version: 0.6.0 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> Yann Leboulanger <asterix(a)lagaule.org> + Anders Sandblad <runeson(a)gmail.com> homepage = http://trac-plugins.gajim.org/wiki/UrlImagePreviewPlugin min_gajim_version: 0.16 max_gajim_version: 0.16.9 diff -r 880aab3698b1 -r 0a250491573a url_image_preview/url_image_preview.py --- a/url_image_preview/url_image_preview.py Thu Sep 03 01:47:28 2015 +0200 +++ b/url_image_preview/url_image_preview.py Sun Sep 20 18:51:51 2015 +0200 @@ -3,16 +3,18 @@ import gtk import re import os +import urllib2 +import base64 from common import gajim from common import helpers from plugins import GajimPlugin -from plugins.helpers import log_calls +from plugins.helpers import log_calls, log from plugins.gui import GajimPluginConfigDialog from conversation_textview import TextViewImage -EXTENSIONS = ('.png','.jpg','.jpeg','.gif','.raw','.svg') - +ACCEPTED_MIME_TYPES = ('image/png','image/jpeg','image/gif','image/raw', + 'image/svg+xml') class UrlImagePreviewPlugin(GajimPlugin): @log_calls('UrlImagePreviewPlugin') @@ -24,7 +26,8 @@ 'print_special_text': (self.print_special_text, self.print_special_text1),} self.config_default_values = { - 'PREVIEW_SIZE': (150, 'Preview size(10-512)'),} + 'PREVIEW_SIZE': (150, 'Preview size(10-512)'), + 'MAX_FILE_SIZE': (524288, 'Max file size for image preview')} self.chat_control = None self.controls = [] @@ -47,7 +50,7 @@ if control.chat_control.conv_textview != tv: continue control.print_special_text(special_text, other_tags, graphics=True, - iter_=None) + iter_=iter_) def print_special_text1(self, chat_control, special_text, other_tags=None, graphics=True, iter_=None): @@ -69,48 +72,167 @@ # remove qip bbcode special_text = special_text.rsplit('[/img]')[0] - name, extension = os.path.splitext(special_text) - if extension.lower() not in EXTENSIONS: - return - if not special_text.startswith('http://') and \ - special_text.startswith('www.'): + if special_text.startswith('www.'): special_text = 'http://' + special_text - if not special_text.startswith('ftp://') and \ - special_text.startswith('ftp.'): + if special_text.startswith('ftp.'): special_text = 'ftp://' + special_text - # show pics preview buffer_ = self.textview.tv.get_buffer() - iter_ = buffer_.get_end_iter() - mark = buffer_.create_mark(None, iter_, True) - # start downloading image - gajim.thread_interface(helpers.download_image, [ - self.textview.account, {'src': special_text}], self._update_img, - [mark]) + if not iter_: + iter_ = buffer_.get_end_iter() - def _update_img(self, (mem, alt), mark): + # Detect XHTML-IM link + ttt = buffer_.get_tag_table() + tags_ = [(ttt.lookup(t) if isinstance(t, str) else t) for t in other_tags] + for t in tags_: + is_xhtml_link = getattr(t, 'href', None) + if is_xhtml_link: + break + + # Show URL, until image is loaded (if ever) + repl_start = buffer_.create_mark(None, iter_, True) + buffer_.insert_with_tags(iter_, special_text, \ + *[(ttt.lookup(t) if isinstance(t, str) else t) for t in ["url"]]) + repl_end = buffer_.create_mark(None, iter_, True) + + # First get the http head request with does not fetch data, just headers + gajim.thread_interface(self._get_http_head, [self.textview.account, + special_text], self._check_mime_size, [special_text, repl_start, repl_end]) + + # Don't print the URL in the message window (in the calling function) + self.textview.plugin_modified = True + + def _check_mime_size(self, (file_mime, file_size), url, repl_start, repl_end): + # 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) + 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) + # 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'] } ], + self._update_img, [url, file_mime, repl_start, repl_end]) + + def _update_img(self, (mem, alt), url, file_mime, repl_start, repl_end): if mem: try: loader = gtk.gdk.PixbufLoader() loader.write(mem) loader.close() pixbuf = loader.get_pixbuf()

1 0

gajim: don't use GtkAlignment anymore. Fixe 2 missing import
by Gajim 20 Sep '15

20 Sep '15

changeset d7afa524cc30 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=d7afa524cc30 description: don't use GtkAlignment anymore. Fixe 2 missing import diffstat: data/gui/account_creation_wizard_window.ui | 77 +- data/gui/accounts_window.ui | 401 +- data/gui/advanced_configuration_window.ui | 15 +- data/gui/change_status_message_dialog.ui | 387 +- data/gui/chat_control.ui | 301 +- data/gui/esession_info_window.ui | 52 +- data/gui/features_window.ui | 17 +- data/gui/groupchat_control.ui | 112 +- data/gui/manage_proxies_window.ui | 426 +- data/gui/message_window.ui | 14 +- data/gui/plugins_window.ui | 87 +- data/gui/preferences_window.ui | 3550 +++++++++++++-------------- data/gui/remove_account_window.ui | 75 +- data/gui/roster_item_exchange_window.ui | 54 +- data/gui/single_message_window.ui | 2 +- data/gui/subscription_request_window.ui | 76 +- src/chat_control.py | 1 + src/gtkspell.py | 1 + 18 files changed, 2665 insertions(+), 2983 deletions(-) diffs (truncated from 6608 to 300 lines): diff -r 78bb694fa308 -r d7afa524cc30 data/gui/account_creation_wizard_window.ui --- a/data/gui/account_creation_wizard_window.ui Sun Aug 30 23:23:10 2015 +0200 +++ b/data/gui/account_creation_wizard_window.ui Sun Sep 20 18:18:35 2015 +0200 @@ -83,53 +83,46 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment68"> + <object class="GtkBox" id="vbox83"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="top_padding">5</property> - <property name="left_padding">12</property> + <property name="margin_left">12</property> + <property name="border_width">6</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkBox" id="vbox83"> + <object class="GtkRadioButton" id="use_existing_account_radiobutton"> + <property name="label" translatable="yes">I already have an account I want to _use</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">6</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkRadioButton" id="use_existing_account_radiobutton"> - <property name="label" translatable="yes">I already have an account I want to _use</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="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="register_new_account_radiobutton"> - <property name="label" translatable="yes">I want to _register for a new account</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="xalign">0</property> - <property name="draw_indicator">True</property> - <property name="group">use_existing_account_radiobutton</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="register_new_account_radiobutton"> + <property name="label" translatable="yes">I want to _register for a new account</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="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">use_existing_account_radiobutton</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> </child> </object> </child> diff -r 78bb694fa308 -r d7afa524cc30 data/gui/accounts_window.ui --- a/data/gui/accounts_window.ui Sun Aug 30 23:23:10 2015 +0200 +++ b/data/gui/accounts_window.ui Sun Sep 20 18:18:35 2015 +0200 @@ -664,84 +664,77 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment4"> + <object class="GtkBox" id="vbox11"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="left_padding">12</property> + <property name="margin_left">12</property> + <property name="border_width">6</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkBox" id="vbox11"> + <object class="GtkCheckButton" id="use_env_http_proxy_checkbutton1"> + <property name="label" translatable="yes">_use HTTP__PROXY environment variable</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_use_env_http_proxy_checkbutton1_toggled" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="proxy_hbox1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="border_width">6</property> - <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkCheckButton" id="use_env_http_proxy_checkbutton1"> - <property name="label" translatable="yes">_use HTTP__PROXY environment variable</property> + <object class="GtkComboBox" id="proxies_combobox1"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="use_underline">True</property> - <property name="xalign">0.5</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_use_env_http_proxy_checkbutton1_toggled" swapped="no"/> + <property name="can_focus">False</property> + <property name="model">liststore1</property> + <signal name="changed" handler="on_proxies_combobox1_changed" swapped="no"/> + <child> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkBox" id="proxy_hbox1"> + <object class="GtkButton" id="manage_proxies_button1"> + <property name="label" translatable="yes">_Manage...</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkComboBox" id="proxies_combobox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="model">liststore1</property> - <signal name="changed" handler="on_proxies_combobox1_changed" swapped="no"/> - <child> - <object class="GtkCellRendererText" id="cellrenderertext1"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="manage_proxies_button1"> - <property name="label" translatable="yes">_Manage...</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="on_manage_proxies_button1_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_manage_proxies_button1_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> </child> @@ -768,28 +761,79 @@ <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkBox" id="vbox4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="left_padding">12</property> + <property name="margin_left">12</property> + <property name="border_width">6</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkBox" id="vbox4"> + <object class="GtkCheckButton" id="warn_when_insecure_connection_checkbutton1"> + <property name="label" translatable="yes">_Warn before using an insecure connection</property> <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Check this so Gajim will ask you before sending your password over an insecure connection.</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_warn_when_insecure_connection_checkbutton1_toggled" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="send_keepalive_checkbutton1"> + <property name="label" translatable="yes">Send _keep-alive packets</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_send_keepalive_checkbutton1_toggled" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="custom_host_port_checkbutton1"> + <property name="label" translatable="yes">Use cust_om hostname/port</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="xalign">0</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_custom_host_port_checkbutton1_toggled" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkBox" id="custom_host_port_hbox1"> + <property name="visible">True</property> + <property name="sensitive">False</property> <property name="can_focus">False</property>

1 0

gajim: decode PGP messages in MAM response. Fixes #8103
by Gajim 19 Sep '15

19 Sep '15

changeset 302855b1f881 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=302855b1f881 description: decode PGP messages in MAM response. Fixes #8103 diffstat: src/common/connection_handlers.py | 38 +++++++++- src/common/connection_handlers_events.py | 122 ++++++++++++++++++------------ src/common/message_archiving.py | 18 ++++- 3 files changed, 127 insertions(+), 51 deletions(-) diffs (254 lines): diff -r 0b2efd97cfed -r 302855b1f881 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Wed Sep 16 20:43:57 2015 +0200 +++ b/src/common/connection_handlers.py Sat Sep 19 13:58:28 2015 +0200 @@ -894,6 +894,8 @@ self._nec_gc_presence_received) gajim.ged.register_event_handler('message-received', ged.CORE, self._nec_message_received) + gajim.ged.register_event_handler('mam-message-received', ged.CORE, + self._nec_mam_message_received) gajim.ged.register_event_handler('decrypted-message-received', ged.CORE, self._nec_decrypted_message_received) @@ -906,6 +908,8 @@ self._nec_gc_presence_received) gajim.ged.remove_event_handler('message-received', ged.CORE, self._nec_message_received) + gajim.ged.remove_event_handler('mam-message-received', ged.CORE, + self._nec_mam_message_received) gajim.ged.remove_event_handler('decrypted-message-received', ged.CORE, self._nec_decrypted_message_received) @@ -1118,14 +1122,46 @@ gajim.nec.push_incoming_event(DecryptedMessageReceivedEvent(None, conn=self, msg_obj=obj)) + def _nec_mam_message_received(self, obj): + if obj.conn.name != self.name: + return + if obj.enc_tag and self.USE_GPG: + encmsg = obj.enc_tag.getData() + + keyID = gajim.config.get_per('accounts', self.name, 'keyid') + if keyID: + self.gpg_messages_to_decrypt.append([encmsg, keyID, obj]) + if len(self.gpg_messages_to_decrypt) == 1: + gajim.thread_interface(self.decrypt_thread, [encmsg, keyID, + obj], self._on_mam_message_decrypted, [obj]) + return + gajim.nec.push_incoming_event(MamDecryptedMessageReceivedEvent(None, + conn=self, msg_obj=obj)) + def _on_message_decrypted(self, output, obj): if len(self.gpg_messages_to_decrypt): encmsg, keyID, obj2 = self.gpg_messages_to_decrypt[0] + if type(obj2) == MessageReceivedEvent: + cb = self._on_message_decrypted + else: + cb = self._on_mam_message_decrypted gajim.thread_interface(self.decrypt_thread, [encmsg, keyID, obj2], - self._on_message_decrypted, [obj2]) + cb, [obj2]) gajim.nec.push_incoming_event(DecryptedMessageReceivedEvent(None, conn=self, msg_obj=obj)) + def _on_mam_message_decrypted(self, output, obj): + if len(self.gpg_messages_to_decrypt): + encmsg, keyID, obj2 = self.gpg_messages_to_decrypt[0] + if type(obj2) == MessageReceivedEvent: + cb = self._on_message_decrypted + else: + cb = self._on_mam_message_decrypted + gajim.thread_interface(self.decrypt_thread, [encmsg, keyID, obj2], + cb, [obj2]) + gajim.nec.push_incoming_event(MamDecryptedMessageReceivedEvent(None, + conn=self, msg_obj=obj)) + def _nec_decrypted_message_received(self, obj): if obj.conn.name != self.name: return diff -r 0b2efd97cfed -r 302855b1f881 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Wed Sep 16 20:43:57 2015 +0200 +++ b/src/common/connection_handlers_events.py Sat Sep 19 13:58:28 2015 +0200 @@ -1011,6 +1011,77 @@ name = 'before-change-show' base_network_events = [] +class MamMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): + name = 'mam-message-received' + base_network_events = [] + + def generate(self): + if not self.stanza: + return + account = self.conn.name + delay = self.stanza.getTag('delay', namespace=nbxmpp.NS_DELAY2) + if not delay: + return + tim = delay.getAttr('stamp') + tim = helpers.datetime_tuple(tim) + self.tim = localtime(timegm(tim)) + self.msg_ = self.stanza.getTag('message') + to_ = self.msg_.getAttr('to') + if to_: + to_ = gajim.get_jid_without_resource(to_) + else: + to_ = gajim.get_jid_from_account(account) + frm_ = gajim.get_jid_without_resource(self.msg_.getAttr('from')) + self.msgtxt = self.msg_.getTagData('body') + if to_ == gajim.get_jid_from_account(account): + self.with_ = frm_ + self.direction = 'from' + self.resource = gajim.get_resource_from_jid( + self.msg_.getAttr('from')) + else: + self.with_ = to_ + self.direction = 'to' + self.resource = gajim.get_resource_from_jid(self.msg_.getAttr('to')) + self.enc_tag = self.msg_.getTag('x', namespace=nbxmpp.NS_ENCRYPTED) + return True + +class MamDecryptedMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): + name = 'mam-decrypted-message-received' + base_network_events = [] + + def generate(self): + self.nick = None + msg_ = self.msg_obj.msg_ + self.with_ = self.msg_obj.with_ + self.direction = self.msg_obj.direction + self.tim = self.msg_obj.tim + res = self.msg_obj.resource + self.msgtxt = self.msg_obj.msgtxt + is_pm = gajim.logger.jid_is_room_jid(self.with_) + if msg_.getAttr('type') == 'groupchat': + if is_pm == False: + log.warn('JID %s is marked as normal contact in database ' + 'but we got a groupchat message from it.') + return + if is_pm == None: + gajim.logger.get_jid_id(self.with_, 'ROOM') + self.nick = res + else: + if is_pm == None: + # we don't know this JID, we need to disco it. + server = gajim.get_server_from_jid(self.with_) + if server not in self.conn.mam_awaiting_disco_result: + self.conn.mam_awaiting_disco_result[server] = [ + [self.with_, self.direction, self.tim, self.msgtxt, + res]] + self.conn.discoverInfo(server) + else: + self.conn.mam_awaiting_disco_result[server].append( + [self.with_, self.direction, self.tim, self.msgtxt, + res]) + return + return True + class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): name = 'message-received' base_network_events = ['raw-message-received'] @@ -1092,55 +1163,8 @@ result = self.stanza.getTag('result', namespace=nbxmpp.NS_MAM) if result: forwarded = result.getTag('forwarded', namespace=nbxmpp.NS_FORWARD) - if not forwarded: - return - delay = forwarded.getTag('delay', namespace=nbxmpp.NS_DELAY2) - if not delay: - return - tim = delay.getAttr('stamp') - tim = helpers.datetime_tuple(tim) - tim = localtime(timegm(tim)) - msg_ = forwarded.getTag('message') - to_ = msg_.getAttr('to') - if to_: - to_ = gajim.get_jid_without_resource(to_) - else: - to_ = gajim.get_jid_from_account(account) - frm_ = gajim.get_jid_without_resource(msg_.getAttr('from')) - nick = None - msg_txt = msg_.getTagData('body') - if to_ == gajim.get_jid_from_account(account): - with_ = frm_ - direction = 'from' - res = gajim.get_resource_from_jid(msg_.getAttr('from')) - else: - with_ = to_ - direction = 'to' - res = gajim.get_resource_from_jid(msg_.getAttr('to')) - is_pm = gajim.logger.jid_is_room_jid(with_) - if msg_.getAttr('type') == 'groupchat': - if is_pm == False: - log.warn('JID %s is marked as normal contact in database ' - 'but we got a groupchat message from it.') - return - if is_pm == None: - gajim.logger.get_jid_id(with_, 'ROOM') - nick = res - else: - if is_pm == None: - # we don't know this JID, we need to disco it. - server = gajim.get_server_from_jid(with_) - if server not in self.conn.mam_awaiting_disco_result: - self.conn.mam_awaiting_disco_result[server] = [ - [with_, direction, tim, msg_txt, res]] - self.conn.discoverInfo(server) - else: - self.conn.mam_awaiting_disco_result[server].append( - [with_, direction, tim, msg_txt, res]) - return - - gajim.logger.save_if_not_exists(with_, direction, tim, - msg=msg_txt, nick=nick) + gajim.nec.push_incoming_event(MamMessageReceivedEvent(None, + conn=self.conn, stanza=forwarded)) return self.enc_tag = self.stanza.getTag('x', namespace=nbxmpp.NS_ENCRYPTED) diff -r 0b2efd97cfed -r 302855b1f881 src/common/message_archiving.py --- a/src/common/message_archiving.py Wed Sep 16 20:43:57 2015 +0200 +++ b/src/common/message_archiving.py Sat Sep 19 13:58:28 2015 +0200 @@ -47,10 +47,18 @@ self._nec_agent_info_error) gajim.ged.register_event_handler('agent-info-received', ged.CORE, self._nec_agent_info) + gajim.ged.register_event_handler('mam-decrypted-message-received', + ged.CORE, self._nec_mam_decrypted_message_received) def cleanup(self): gajim.ged.remove_event_handler('raw-message-received', ged.CORE, self._nec_raw_message_313_received) + gajim.ged.remove_event_handler('agent-info-error-received', ged.CORE, + self._nec_agent_info_error) + gajim.ged.remove_event_handler('agent-info-received', ged.CORE, + self._nec_agent_info) + gajim.ged.remove_event_handler('mam-decrypted-message-received', + ged.CORE, self._nec_mam_decrypted_message_received) def _nec_agent_info_error(self, obj): if obj.jid in self.mam_awaiting_disco_result: @@ -81,7 +89,7 @@ if obj.conn.name != self.name: return - fin_ = obj.stanza.getTag('fin', namespace=nbxmpp.NS_MAM) + fin_ = obj.stanza.getTag('fin', namespace=nbxmpp.NS_MAM) if fin_: queryid_ = fin_.getAttr('queryid') if queryid_ not in self.awaiting_answers: @@ -99,6 +107,14 @@ del self.awaiting_answers[queryid_] + 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) + def request_archive(self, start=None, end=None, with_=None, after=None, max=30): iq_ = nbxmpp.Iq('set')

1 0

gajim: add type='submit' to MAM request data form. Fixes #8149
by Gajim 16 Sep '15

16 Sep '15

changeset 0b2efd97cfed in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=0b2efd97cfed description: add type='submit' to MAM request data form. Fixes #8149 diffstat: src/common/message_archiving.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r cddaf9175a96 -r 0b2efd97cfed src/common/message_archiving.py --- a/src/common/message_archiving.py Sun Sep 13 13:57:04 2015 +0200 +++ b/src/common/message_archiving.py Wed Sep 16 20:43:57 2015 +0200 @@ -103,7 +103,7 @@ max=30): iq_ = nbxmpp.Iq('set') query = iq_.addChild('query', namespace=nbxmpp.NS_MAM) - x = query.addChild('x', namespace=nbxmpp.NS_DATA) + x = query.addChild(node=nbxmpp.DataForm(typ='submit')) x.addChild(node=nbxmpp.DataField(typ='hidden', name='FORM_TYPE', value=nbxmpp.NS_MAM)) if start: x.addChild(node=nbxmpp.DataField(typ='text-single', name='start', value=start))

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2015