Commits

commits@gajim.org

17632 discussions

gajim: Refactor GC Roster tooltip
by Gajim 16 Nov '16

16 Nov '16

changeset c44805f8d96b in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=c44805f8d96b description: Refactor GC Roster tooltip diffstat: data/gui/tooltip_gc_contact.ui | 145 +++++++++++++++++++++++++++ src/groupchat_control.py | 107 ++++++++----------- src/tooltips.py | 220 ++++++++++++++++++---------------------- 3 files changed, 290 insertions(+), 182 deletions(-) diffs (truncated from 576 to 300 lines): diff -r bf2bfc1be419 -r c44805f8d96b data/gui/tooltip_gc_contact.ui --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/gui/tooltip_gc_contact.ui Sun Nov 13 21:06:37 2016 +0100 @@ -0,0 +1,145 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.12"/> + <object class="GtkGrid" id="tooltip_grid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="column_spacing">5</property> + <child> + <object class="GtkLabel" id="nick"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="xalign">0</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="status"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="wrap">True</property> + <property name="max_width_chars">40</property> + <property name="xalign">0</property> + <attributes> + <attribute name="style" value="italic"/> + </attributes> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="jid_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="label" translatable="yes">Jabber ID:</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkImage" id="avatar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-missing-image</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + <property name="height">7</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="resource_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="label" translatable="yes">Resource:</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="affiliation"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">5</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="user_show"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">start</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="fillelement"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="vexpand">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">6</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="resource"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="jid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + </object> +</interface> diff -r bf2bfc1be419 -r c44805f8d96b src/groupchat_control.py --- a/src/groupchat_control.py Sat Nov 12 23:54:33 2016 +0000 +++ b/src/groupchat_control.py Sun Nov 13 21:06:37 2016 +0100 @@ -360,6 +360,12 @@ img = self.xml.get_object('history_image') img.set_from_icon_name('document-open-recent', Gtk.IconSize.MENU) widget = self.xml.get_object('list_treeview') + widget.set_has_tooltip(True) + widget.set_tooltip_window(tooltips.GCTooltip(self.parent_win.window)) + self.current_tooltip = None + id_ = widget.connect('query-tooltip', self.query_tooltip) + self.handlers[id_] = widget + id_ = widget.connect('row_expanded', self.on_list_treeview_row_expanded) self.handlers[id_] = widget @@ -379,14 +385,6 @@ self.on_list_treeview_key_press_event) self.handlers[id_] = widget - id_ = widget.connect('motion_notify_event', - self.on_list_treeview_motion_notify_event) - self.handlers[id_] = widget - - id_ = widget.connect('leave_notify_event', - self.on_list_treeview_leave_notify_event) - self.handlers[id_] = widget - self.room_jid = self.contact.jid self.nick = contact.name self.new_nick = '' @@ -419,8 +417,6 @@ self.subject = '' - self.tooltip = tooltips.GCTooltip() - # nickname coloring self.gc_count_nicknames_colors = -1 self.gc_custom_colors = {} @@ -530,6 +526,46 @@ # instance object gajim.plugin_manager.gui_extension_point('groupchat_control', self) + def query_tooltip(self, widget, x_pos, y_pos, keyboard_mode, tooltip): + try: + row = self.list_treeview.get_path_at_pos(x_pos, y_pos)[0] + except TypeError: + return False + if not row: + return False + + iter_ = None + try: + iter_ = self.model.get_iter(row) + except Exception: + return False + + typ = self.model[iter_][C_TYPE] + nick = self.model[iter_][C_NICK] + + if typ != 'contact': + return False + + if self.current_tooltip != row: + # If the row changes we hide the current tooltip + self.current_tooltip = row + return False + + tooltip = widget.get_tooltip_window() + + if tooltip.row == row: + # We already populated the window with the row data + return True + tooltip.row = row + + contact = gajim.contacts.get_gc_contact( + self.account, self.room_jid, nick) + if not contact: + return False + + tooltip.populate(contact) + return True + def fill_column(self, col): for rend in self.renderers_list: col.pack_start(rend[1], rend[2]) @@ -2638,8 +2674,6 @@ """ Popup user's group's or agent menu """ - # hide tooltip, no matter the button is pressed - self.tooltip.hide_tooltip() try: pos = widget.get_path_at_pos(int(event.x), int(event.y)) path, x = pos[0], pos[2] @@ -2697,55 +2731,6 @@ add = gc_refer_to_nick_char + ' ' message_buffer.insert_at_cursor(start + nick + add) - def on_list_treeview_motion_notify_event(self, widget, event): - props = widget.get_path_at_pos(int(event.x), int(event.y)) - if self.tooltip.timeout > 0 or self.tooltip.shown: - if not props or self.tooltip.id != props[0]: - self.tooltip.hide_tooltip() - if props: - [row, col, x, y] = props - iter_ = None - try: - iter_ = self.model.get_iter(row) - except Exception: - self.tooltip.hide_tooltip() - return - typ = self.model[iter_][C_TYPE] - if typ == 'contact': - account = self.account - - if self.tooltip.timeout == 0 or self.tooltip.id != props[0]: - self.tooltip.id = row - nick = self.model[iter_][C_NICK] - self.tooltip.timeout = GLib.timeout_add(500, - self.show_tooltip, gajim.contacts.get_gc_contact( - account, self.room_jid, nick)) - - def on_list_treeview_leave_notify_event(self, widget, event): - props = widget.get_path_at_pos(int(event.x), int(event.y)) - if self.tooltip.timeout > 0 or self.tooltip.shown: - if not props or self.tooltip.id == props[0]: - self.tooltip.hide_tooltip() - - def show_tooltip(self, contact): - self.tooltip.timeout = 0 - if not self.list_treeview.get_window(): - # control has been destroyed since tooltip was requested - return - w = self.list_treeview.get_window() - device = w.get_display().get_device_manager().get_client_pointer() - pointer = w.get_device_position(device) - props = self.list_treeview.get_path_at_pos(pointer[1], pointer[2]) - # check if the current pointer is at the same path - # as it was before setting the timeout - if props and self.tooltip.id == props[0]: - rect = self.list_treeview.get_cell_area(props[0], props[1]) - position = w.get_origin()[1:] - self.tooltip.show_tooltip(contact, rect.height, - position[1] + rect.y) - else: - self.tooltip.hide_tooltip() - def grant_voice(self, widget, nick): """

1 0

gajim: Replace ServiceDiscoveryTooltip with gtk_tree_view.set_to...
by Gajim 13 Nov '16

13 Nov '16

changeset bf2bfc1be419 in /home/hg/repos/gajim author: Emmanuel Gil Peyrot <linkmauve(a)linkmauve.fr> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=bf2bfc1be419 description: Replace ServiceDiscoveryTooltip with gtk_tree_view.set_tooltip_column(). diffstat: src/disco.py | 127 ++++++++++++++----------------------------------------- src/tooltips.py | 21 --------- 2 files changed, 33 insertions(+), 115 deletions(-) diffs (295 lines): diff -r 97bd4027f912 -r bf2bfc1be419 src/disco.py --- a/src/disco.py Sun Nov 13 12:51:29 2016 +0100 +++ b/src/disco.py Sat Nov 12 23:54:33 2016 +0000 @@ -54,7 +54,6 @@ from gi.repository import Pango import dialogs -import tooltips import gtkgui_helpers import groups import adhoc_commands @@ -66,6 +65,12 @@ from common import helpers from common import ged +LABELS = { + 1: _('This service has not yet responded with detailed information'), + 2: _('This service could not respond with detailed information.\n' + 'It is most likely legacy or broken'), +} + # Dictionary mapping category, type pairs to browser class, image pairs. # This is a function, so we can call it after the classes are declared. # For the browser class, None means that the service will only be browsable @@ -119,13 +124,13 @@ ('gateway', 'twitter'): (False, 'twitter'), } -# Category type to "human-readable" description string, and sort priority +# Category type to "human-readable" description string _cat_to_descr = { - 'other': (_('Others'), 2), - 'gateway': (_('Transports'), 0), - '_jid': (_('Transports'), 0), + 'other': _('Others'), + 'gateway': _('Transports'), + '_jid': _('Transports'), #conference is a category for listing mostly groupchats in service discovery - 'conference': (_('Conference'), 1), + 'conference': _('Conference'), } @@ -1217,7 +1222,6 @@ self._progressbar_sourceid = None self._renderer = None self._progress = 0 - self.tooltip = tooltips.ServiceDiscoveryTooltip() self.register_button = None self.join_button = None self.execute_button = None @@ -1238,7 +1242,7 @@ identities.append(identity) # Set the pixmap for the row pix = self.cache.get_icon(identities, addr=addr) - self.model.append(None, (self.jid, self.node, pix, descr, 1)) + self.model.append(None, (self.jid, self.node, pix, descr, LABELS[1])) # Grab info on the service self.cache.get_info(self.jid, self.node, self._agent_info, force=False) @@ -1264,8 +1268,8 @@ cell.set_property('markup', markup) if jid: cell.set_property('cell_background_set', False) - if state > 0: - # 1 = fetching, 2 = error + if state is not None: + # fetching or error cell.set_property('foreground_set', True) else: # Normal/succes @@ -1284,9 +1288,9 @@ # Compare state state1 = model.get_value(iter1, 4) state2 = model.get_value(iter2, 4) - if state1 > state2: + if state1 is not None: return 1 - if state1 < state2: + if state2 is not None: return -1 descr1 = model.get_value(iter1, 3) descr2 = model.get_value(iter2, 3) @@ -1297,64 +1301,12 @@ return -1 return 0 - def _show_tooltip(self, state): - self.tooltip.timeout = 0 - view = self.window.services_treeview - w = view.get_window() - device = w.get_display().get_device_manager().get_client_pointer() - pointer = w.get_device_position(device) - props = view.get_path_at_pos(pointer[1], pointer[2]) - # check if the current pointer is at the same path - # as it was before setting the timeout - if props and self.tooltip.id == props[0]: - # bounding rectangle of coordinates for the cell within the treeview - rect = view.get_cell_area(props[0], props[1]) - # position of the treeview on the screen - position = w.get_origin()[1:] - self.tooltip.show_tooltip(state, rect.height, position[1] + rect.y) - else: - self.tooltip.hide_tooltip() - - # These are all callbacks to make tooltips work - def on_treeview_leave_notify_event(self, widget, event): - props = widget.get_path_at_pos(int(event.x), int(event.y)) - if self.tooltip.timeout > 0 or self.tooltip.shown: - if not props or self.tooltip.id == props[0]: - self.tooltip.hide_tooltip() - - def on_treeview_motion_notify_event(self, widget, event): - props = widget.get_path_at_pos(int(event.x), int(event.y)) - if self.tooltip.timeout > 0 or self.tooltip.shown: - if not props or self.tooltip.id != props[0]: - self.tooltip.hide_tooltip() - if props: - row = props[0] - iter_ = None - try: - iter_ = self.model.get_iter(row) - except Exception: - self.tooltip.hide_tooltip() - return - jid = self.model[iter_][0] - state = self.model[iter_][4] - # Not a category, and we have something to say about state - if jid and state > 0 and \ - (self.tooltip.timeout == 0 or self.tooltip.id != props[0]): - self.tooltip.id = row - self.tooltip.timeout = GLib.timeout_add(500, self._show_tooltip, - state) - - def on_treeview_event_hide_tooltip(self, widget, event): - """ - This happens on scroll_event, key_press_event and button_press_event - """ - self.tooltip.hide_tooltip() - def _create_treemodel(self): # JID, node, icon, description, state - # State means 2 when error, 1 when fetching, 0 when succes. + # state is None on sucess or has a string + # from LABELS on error or while fetching view = self.window.services_treeview - self.model = Gtk.TreeStore(str, str, GdkPixbuf.Pixbuf, str, int) + self.model = Gtk.TreeStore(str, str, GdkPixbuf.Pixbuf, str, str) self.model.set_sort_func(4, self._treemodel_sort_func) self.model.set_sort_column_id(4, Gtk.SortType.ASCENDING) view.set_model(self.model) @@ -1374,22 +1326,10 @@ self._renderer = renderer self.update_theme() + view.set_tooltip_column(4) view.insert_column(col, -1) col.set_resizable(True) - # Connect signals - scrollwin = self.window.services_scrollwin - self._view_signals.append(view.connect('leave-notify-event', - self.on_treeview_leave_notify_event)) - self._view_signals.append(view.connect('motion-notify-event', - self.on_treeview_motion_notify_event)) - self._view_signals.append(view.connect('key-press-event', - self.on_treeview_event_hide_tooltip)) - self._view_signals.append(view.connect('button-press-event', - self.on_treeview_event_hide_tooltip)) - self._scroll_signal = scrollwin.connect('scroll-event', - self.on_treeview_event_hide_tooltip) - def _clean_treemodel(self): # Disconnect signals view = self.window.services_treeview @@ -1468,7 +1408,6 @@ search_window.SearchWindow(self.account, service) def cleanup(self): - self.tooltip.hide_tooltip() AgentBrowser.cleanup(self) def update_theme(self): @@ -1536,7 +1475,7 @@ if not model[iter_][0]: # We're on a category row return - if model[iter_][4] != 0: + if model[iter_][4] is not None: # We don't have the info (yet) # It's either unknown or a transport, register button should be active if self.register_button: @@ -1644,34 +1583,34 @@ def _friendly_category(self, category, type_=None): """ - Get the friendly category name and priority + Get the friendly category name """ cat = None if type_: # Try type-specific override try: - cat, prio = _cat_to_descr[(category, type_)] + cat = _cat_to_descr[(category, type_)] except KeyError: pass if not cat: try: - cat, prio = _cat_to_descr[category] + cat = _cat_to_descr[category] except KeyError: - cat, prio = _cat_to_descr['other'] - return cat, prio + cat = _cat_to_descr['other'] + return cat def _create_category(self, cat, type_=None): """ Creates a category row """ - cat, prio = self._friendly_category(cat, type_) - return self.model.append(None, ('', '', None, cat, prio)) + cat = self._friendly_category(cat, type_) + return self.model.append(None, ('', '', None, cat, None)) def _find_category(self, cat, type_=None): """ Looks up a category row and returns the iterator to it, or None """ - cat = self._friendly_category(cat, type_)[0] + cat = self._friendly_category(cat, type_) iter_ = self.model.get_iter_first() while iter_: if self.model.get_value(iter_, 3) == cat: @@ -1726,7 +1665,7 @@ cat = self._find_category(*cat_args) if not cat: cat = self._create_category(*cat_args) - self.model.append(cat, (jid, node, pix, descr, 1)) + self.model.append(cat, (jid, node, pix, descr, LABELS[1])) GLib.idle_add(self._expand_all) # Grab info on the service self.cache.get_info(jid, node, self._agent_info, force=force) @@ -1768,7 +1707,7 @@ # Already in the right category, just update self.model[iter_][2] = pix self.model[iter_][3] = descr - self.model[iter_][4] = 0 + self.model[iter_][4] = None return # Not in the right category, move it. self.model.remove(iter_) @@ -1783,11 +1722,11 @@ cat_iter = self._find_category(cat, type_) if not cat_iter: cat_iter = self._create_category(cat, type_) - self.model.append(cat_iter, (jid, node, pix, descr, 0)) + self.model.append(cat_iter, (jid, node, pix, descr, None)) self._expand_all() def _update_error(self, iter_, jid, node): - self.model[iter_][4] = 2 + self.model[iter_][4] = LABELS[2] self._progress += 1 self._update_progressbar() diff -r 97bd4027f912 -r bf2bfc1be419 src/tooltips.py --- a/src/tooltips.py Sun Nov 13 12:51:29 2016 +0100 +++ b/src/tooltips.py Sat Nov 12 23:54:33 2016 +0000 @@ -816,24 +816,3 @@ Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.FILL, 0, 0) self.win.add(ft_table) - - -class ServiceDiscoveryTooltip(BaseTooltip): - """ - Tooltip that is shown when hovering over a service discovery row - """ - def populate(self, status): - self.create_window() - label = Gtk.Label() - label.set_line_wrap(True) - label.set_halign(Gtk.Align.START) - label.set_valign(Gtk.Align.START) - label.set_selectable(False) - if status == 1: - label.set_text( - _('This service has not yet responded with detailed information')) - elif status == 2: - label.set_text( - _('This service could not respond with detailed information.\n' - 'It is most likely legacy or broken')) - self.win.add(label)

1 0

gajim: Dont use translated strings for MAM Preference command
by Gajim 13 Nov '16

13 Nov '16

changeset 97bd4027f912 in /home/hg/repos/gajim author: lovetox <forenjunkie(a)chelo.at> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=97bd4027f912 description: Dont use translated strings for MAM Preference command diffstat: src/dialogs.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (27 lines): diff -r 6068cd819e0b -r 97bd4027f912 src/dialogs.py --- a/src/dialogs.py Sat Nov 05 14:49:38 2016 +0000 +++ b/src/dialogs.py Sun Nov 13 12:51:29 2016 +0100 @@ -4114,6 +4114,7 @@ class Archiving313PreferencesWindow: default_dict = {'always': 0, 'roster': 1, 'never': 2} + default_dict_cb = {0: 'always', 1: 'roster', 2: 'never'} def __init__(self, account): self.account = account @@ -4208,13 +4209,12 @@ def on_save_button_clicked(self, widget): self.set_widget_state(False) items = [] - iter_ = self.default_cb.get_active_iter() - default = self.default_cb.get_model().get_value(iter_, 0) + default = self.default_dict_cb[self.default_cb.get_active()] for item in self.archive_items_liststore: items.append((item[0].lower(), item[1].lower())) self.idle_id = GLib.timeout_add_seconds(3, self._nec_archiving_error) gajim.connections[self.account]. \ - set_archive_preferences(items, default.lower()) + set_archive_preferences(items, default) def on_close_button_clicked(self, widget): self.window.destroy()

1 0

gajim-plugins: Update README.md
by Gajim Plugins 12 Nov '16

12 Nov '16

changeset 8457659b652f in /home/hg/repos/gajim-plugins author: lovetox <lovetox(a)users.noreply.github.com> branches: details:gajim-plugins?cmd=changeset;node=8457659b652f description: Update README.md diffstat: omemo/README.md | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diffs (17 lines): diff -r 2a857b271972 -r 8457659b652f omemo/README.md --- a/omemo/README.md Fri Oct 21 19:07:39 2016 +0200 +++ b/omemo/README.md Sun Oct 23 19:14:30 2016 +0200 @@ -57,6 +57,13 @@ you can receive messages from fingerprints where you didnt made a trust decision, but you cant receive Messages from *not trusted* fingerprints +## Groupchat + +Groupchat works only in rooms that are +- non-anonymous +- members-only +- works only with contacts that you have in your roster + ## Filetransfer For Filetransfer use the **httpupload** plugin.

1 0

gajim-plugins: Catch import error
by Gajim Plugins 12 Nov '16

12 Nov '16

changeset 08fdd45011d4 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=08fdd45011d4 description: Catch import error diffstat: omemo/__init__.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (37 lines): diff -r 8457659b652f -r 08fdd45011d4 omemo/__init__.py --- a/omemo/__init__.py Sun Oct 23 19:14:30 2016 +0200 +++ b/omemo/__init__.py Wed Oct 26 22:36:06 2016 +0200 @@ -31,8 +31,6 @@ from nbxmpp.simplexml import Node from nbxmpp import NS_CORRECT, NS_ADDRESS -from . import ui -from .ui import Ui from .xmpp import ( NS_NOTIFY, NS_OMEMO, NS_EME, BundleInformationAnnouncement, BundleInformationQuery, DeviceListAnnouncement, DevicelistQuery, @@ -75,6 +73,7 @@ if not ERROR_MSG: try: from .omemo.state import OmemoState + from .ui import Ui, OMEMOConfigDialog except Exception as e: log.error(e) ERROR_MSG = 'Error: ' + str(e) @@ -118,6 +117,7 @@ if ERROR_MSG: self.activatable = False self.available_text = ERROR_MSG + self.config_dialog = None return self.events_handlers = { 'mam-message-received': (ged.PRECORE, self.mam_message_received), @@ -139,7 +139,7 @@ self.events_handlers['muc-admin-received'] =\ (ged.PRECORE, self.room_memberlist_received) - self.config_dialog = ui.OMEMOConfigDialog(self) + self.config_dialog = OMEMOConfigDialog(self) self.gui_extension_points = {'chat_control': (self.connect_ui, self.disconnect_ui), 'groupchat_control': (self.connect_ui,

1 0

gajim-plugins: Fix message correction in MUCs
by Gajim Plugins 12 Nov '16

12 Nov '16

changeset fba936c92042 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=fba936c92042 description: Fix message correction in MUCs diffstat: omemo/__init__.py | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diffs (28 lines): diff -r 08fdd45011d4 -r fba936c92042 omemo/__init__.py --- a/omemo/__init__.py Wed Oct 26 22:36:06 2016 +0200 +++ b/omemo/__init__.py Tue Nov 01 23:00:35 2016 +0100 @@ -547,6 +547,10 @@ if account in self.disabled_accounts: return try: + # If we send a correction msg, the stanza is saved + # in correction_msg + if event.correction_msg: + event.msg_iq = event.correction_msg if not event.msg_iq.getTag('body'): return state = self.get_omemo_state(account) @@ -588,7 +592,12 @@ # Store Hint for MAM store = Node('store', attrs={'xmlns': NS_HINTS}) event.msg_iq.addChild(node=store) - self.print_msg_to_log(event.msg_iq) + if event.correction_msg: + event.correction_msg = event.msg_iq + event.msg_iq = None + self.print_msg_to_log(event.correction_msg) + else: + self.print_msg_to_log(event.msg_iq) except Exception as e: log.debug(e) return True

1 0

gajim-plugins: Update manifest.ini and CHANGELOG
by Gajim Plugins 12 Nov '16

12 Nov '16

changeset 08658cc12dc5 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=08658cc12dc5 description: Update manifest.ini and CHANGELOG diffstat: omemo/CHANGELOG | 3 +++ omemo/manifest.ini | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diffs (22 lines): diff -r fba936c92042 -r 08658cc12dc5 omemo/CHANGELOG --- a/omemo/CHANGELOG Tue Nov 01 23:00:35 2016 +0100 +++ b/omemo/CHANGELOG Tue Nov 01 23:05:44 2016 +0100 @@ -1,3 +1,6 @@ +0.9.6 / 2016-11-01 +- Bugfixes + 0.9.5 / 2016-10-10 - Add GroupChat BETA - Add Option to delete Fingerprints diff -r fba936c92042 -r 08658cc12dc5 omemo/manifest.ini --- a/omemo/manifest.ini Tue Nov 01 23:00:35 2016 +0100 +++ b/omemo/manifest.ini Tue Nov 01 23:05:44 2016 +0100 @@ -1,7 +1,7 @@ [info] name: OMEMO short_name: omemo -version: 0.9.5 +version: 0.9.6 description: OMEMO is an XMPP Extension Protocol (XEP) for secure multi-client end-to-end encryption based on Axolotl and PEP. You need to install some dependencys, you can find install instructions for your system in the Github Wiki. authors: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> Daniel Gultsch <daniel(a)gultsch.de>

1 0

gajim-plugins: Optimize write operations to DB
by Gajim Plugins 12 Nov '16

12 Nov '16

changeset 826a1e7c7b63 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=826a1e7c7b63 description: Optimize write operations to DB diffstat: omemo/omemo/sql.py | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diffs (17 lines): diff -r 08658cc12dc5 -r 826a1e7c7b63 omemo/omemo/sql.py --- a/omemo/omemo/sql.py Tue Nov 01 23:05:44 2016 +0100 +++ b/omemo/omemo/sql.py Wed Nov 02 19:23:24 2016 +0100 @@ -27,6 +27,13 @@ :type dbConn: Connection """ self.dbConn = dbConn + c = self.dbConn.cursor() + c.execute("PRAGMA synchronous=NORMAL;") + c.execute("PRAGMA journal_mode;") + mode = c.fetchone()[0] + # WAL is a persistent DB mode, dont override it if user has set it + if mode != 'wal': + c.execute("PRAGMA journal_mode=MEMORY;") self.createDb() self.migrateDb()

1 0

gajim-plugins: Update README.md
by Gajim Plugins 12 Nov '16

12 Nov '16

changeset e3f514127f2e in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=e3f514127f2e description: Update README.md diffstat: omemo/README.md | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diffs (52 lines): diff -r 826a1e7c7b63 -r e3f514127f2e omemo/README.md --- a/omemo/README.md Wed Nov 02 19:23:24 2016 +0100 +++ b/omemo/README.md Wed Nov 02 20:07:24 2016 +0100 @@ -20,24 +20,20 @@ #### Arch See [Arch Wiki](https://wiki.archlinux.org/index.php/Gajim#OMEMO_Support) +#### Debian +Packagename `gajim-omemo` available in backports and testing + #### Gentoo `layman -a flow && emerge gajim-omemo` -### Via PluginInstallerPlugin +### Via Gajim PluginManager Install the current stable version via the Gajim PluginManager. You *need* Gajim -version *0.16.5*. If your package manager does not provide an up to date version -you can install it from the official Mercurial repository. *DO NOT USE* gajim -0.16.4 it contains a vulnerability, which is fixed in 0.16.5. -```shell -hg clone https://hg.gajim.org/gajim -cd gajim -hg update gajim-0.16.5 --clean -``` +version *0.16.5* or higher. If your package manager does not provide an up to date version +you can visit gajim.org for further install instructions. -**NOTE:** You *have* to install `python-axolotl` via `pip`. Depending on your setup you might -want to use `pip2` as Gajim is using python2.7. If you are using the official repository, -do not forget to install the `nbxmpp` dependency via pip or you package manager. +**NOTE:** You *have* to install `python-axolotl` via PackageManager or depending on your setup you might +want to use `pip2` as Gajim is using python2.7. if you still have problems, we have written down the most common problems [here](https://github.com/omemo/gajim-omemo/wiki/It-doesnt-work,-what-should… @@ -72,6 +68,15 @@ If you want to use these plugins together with *OMEMO* you have to install the `python-cryptography` package +## Performance +If you experience lag when sending a message, install `python-cryptography` +If that doesnt help, you can convert your database to WAL mode with +``` +sqlite3 omemo_your(a)jid.com.db +PRAGMA journal_mode=WAL +``` +Warning: This mode could lead to data loss if Gajim crashes + ## Debugging To see OMEMO related debug output start Gajim with the parameter `-l gajim.plugin_system.omemo=DEBUG`.

1 0

gajim-plugins: Improve handling of empty/invalid devicelists
by Gajim Plugins 12 Nov '16

12 Nov '16

changeset cdc8a9c02eb4 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=cdc8a9c02eb4 description: Improve handling of empty/invalid devicelists diffstat: omemo/__init__.py | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diffs (37 lines): diff -r e3f514127f2e -r cdc8a9c02eb4 omemo/__init__.py --- a/omemo/__init__.py Wed Nov 02 20:07:24 2016 +0100 +++ b/omemo/__init__.py Tue Nov 08 23:53:09 2016 +0100 @@ -732,9 +732,13 @@ devices_list = list(set(unpack_device_list_update(event.stanza, event.conn.name))) + contact_jid = gajim.get_jid_without_resource(event.fjid) if len(devices_list) == 0: + log.error(account + + ' => Received empty or invalid Devicelist from: ' + + contact_jid) return False - contact_jid = gajim.get_jid_without_resource(event.fjid) + state = self.get_omemo_state(account) my_jid = gajim.get_jid_from_account(account) @@ -1068,15 +1072,16 @@ state = self.get_omemo_state(account) if successful(stanza): - log.info(account + ' => Devicelistquery was successful') devices_list = list(set(unpack_device_list_update(stanza, account))) if len(devices_list) == 0: + log.error(account + ' => Devicelistquery was NOT successful') + self.publish_own_devices_list(account) return False contact_jid = stanza.getAttr('from') if contact_jid == my_jid: state.set_own_devices(devices_list) state.store.sessionStore.setActiveState(devices_list, my_jid) - + log.info(account + ' => Devicelistquery was successful') # remove contact from list, so on send button pressed # we query for bundle and build a session if contact_jid in self.query_for_bundles:

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