Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][gajim_0.16] Correctly search for chat_control when message receipts are received (XEP-0184) …
by Thilo Molitor 23 Dec '16

23 Dec '16

Thilo Molitor pushed to branch gajim_0.16 at gajim / gajim Commits: 35b6f3c1 by Thilo Molitor at 2016-12-23T15:33:40+01:00 Correctly search for chat_control when message receipts are received (XEP-0184) and chat_control is not currently bound to a session - - - - - 1 changed file: - src/common/connection_handlers.py Changes: ===================================== src/common/connection_handlers.py ===================================== --- a/src/common/connection_handlers.py +++ b/src/common/connection_handlers.py @@ -1219,11 +1219,12 @@ class ConnectionHandlersBase: self.name, 'request_receipt'): ctrl = obj.session.control if not ctrl: - # Received <message> doesn't have the <thread> element? - # search in all sessions - for s in self.get_sessions(obj.jid): - if s.control: - ctrl = s.control + # Received <message> doesn't have the <thread> element + # or control is not bound to session? + # --> search for it + ctrl = gajim.interface.msg_win_mgr.search_control(obj.jid, + obj.conn.name, obj.resource) + if ctrl: id_ = obj.receipt_received_tag.getAttr('id') if not id_: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/35b6f3c1fdd0940fa5b5ee17f354b8fcd9…

1 0

[Git][gajim/gajim][master] 3 commits: Correctly search for chat_control when message receipts are received (XEP-0184) …
by Thilo Molitor 23 Dec '16

23 Dec '16

Thilo Molitor pushed to branch master at gajim / gajim Commits: 55eaf70f by Thilo Molitor at 2016-12-16T21:53:51+01:00 Correctly search for chat_control when message receipts are received (XEP-0184) and chat_control is not currently bound to a session - - - - - c48f0419 by Thilo Molitor at 2016-12-18T04:22:08+01:00 Merge branch 'master' of dev.gajim.org:gajim/gajim - - - - - f15497b0 by Thilo Molitor at 2016-12-23T15:21:03+01:00 Merge branch 'master' of dev.gajim.org:gajim/gajim - - - - - 1 changed file: - src/common/connection_handlers.py Changes: ===================================== src/common/connection_handlers.py ===================================== --- a/src/common/connection_handlers.py +++ b/src/common/connection_handlers.py @@ -1203,11 +1203,12 @@ class ConnectionHandlersBase: self.name, 'request_receipt'): ctrl = obj.session.control if not ctrl: - # Received <message> doesn't have the <thread> element? - # search in all sessions - for s in self.get_sessions(obj.jid): - if s.control: - ctrl = s.control + # Received <message> doesn't have the <thread> element + # or control is not bound to session? + # --> search for it + ctrl = gajim.interface.msg_win_mgr.search_control(obj.jid, + obj.conn.name, obj.resource) + if ctrl: id_ = obj.receipt_received_tag.getAttr('id') if not id_: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ac4859fb87ef74564e1514a8789031616…

1 0

[Git][gajim/gajim][master] Remove unused imports
by Philipp Hörist 22 Dec '16

22 Dec '16

Philipp Hörist pushed to branch master at gajim / gajim Commits: ac4859fb by Philipp Hörist at 2016-12-22T18:19:24+01:00 Remove unused imports - - - - - 28 changed files: - src/chat_control.py - src/common/caps_cache.py - src/common/check_paths.py - src/common/config.py - src/common/dbus_support.py - src/common/fuzzyclock.py - src/common/gajim.py - src/common/helpers.py - src/common/jingle_rtp.py - src/common/logging_helpers.py - src/common/multimedia_helpers.py - src/common/optparser.py - src/common/resolver.py - src/common/sleepy.py - src/config.py - src/conversation_textview.py - src/dialogs.py - src/disco.py - src/features_window.py - src/gtkgui_helpers.py - src/history_manager.py - src/htmltextview.py - src/message_textview.py - src/network_manager_listener.py - src/notify.py - src/roster_window.py - src/statusicon.py - src/tooltips.py Changes: ===================================== src/chat_control.py ===================================== --- a/src/chat_control.py +++ b/src/chat_control.py @@ -29,9 +29,6 @@ import os import time -import gi -gi.require_version('GdkX11', '3.0') -from gi.repository import GdkX11 from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GdkPixbuf @@ -58,7 +55,6 @@ from message_textview import MessageTextView from common.stanza_session import EncryptedStanzaSession, ArchivingStanzaSession from common.contacts import GC_Contact from common.logger import constants -from common.pep import MOODS, ACTIVITIES from nbxmpp.protocol import NS_XHTML, NS_XHTML_IM, NS_FILE, NS_MUC from nbxmpp.protocol import NS_RECEIPTS, NS_ESESSION from nbxmpp.protocol import NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO ===================================== src/common/caps_cache.py ===================================== --- a/src/common/caps_cache.py +++ b/src/common/caps_cache.py @@ -38,7 +38,7 @@ import logging log = logging.getLogger('gajim.c.caps_cache') from nbxmpp import (NS_XHTML_IM, NS_RECEIPTS, NS_ESESSION, NS_CHATSTATES, - NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_CAPS, + NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_JINGLE_FILE_TRANSFER) # Features where we cannot safely assume that the other side supports them FEATURE_BLACKLIST = [NS_CHATSTATES, NS_XHTML_IM, NS_RECEIPTS, NS_ESESSION, ===================================== src/common/check_paths.py ===================================== --- a/src/common/check_paths.py +++ b/src/common/check_paths.py @@ -26,7 +26,6 @@ import os import shutil import sys -import stat from common import gajim from common import logger ===================================== src/common/config.py ===================================== --- a/src/common/config.py +++ b/src/common/config.py @@ -32,9 +32,7 @@ ## -import sys import re -import copy from common import defs from gi.repository import GLib ===================================== src/common/dbus_support.py ===================================== --- a/src/common/dbus_support.py +++ b/src/common/dbus_support.py @@ -24,7 +24,7 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -import os, sys +import os from common import gajim from common import exceptions ===================================== src/common/fuzzyclock.py ===================================== --- a/src/common/fuzzyclock.py +++ b/src/common/fuzzyclock.py @@ -32,7 +32,6 @@ in turn based on the Fuzzy Clock Applet of Frerich Raabe (KDE). So most of the credit goes to this guys, thanks :-) """ -import time class FuzzyClock: HOUR_NAMES = [ _('twelve'), _('one'), _('two'), _('three'), _('four'), ===================================== src/common/gajim.py ===================================== --- a/src/common/gajim.py +++ b/src/common/gajim.py @@ -27,7 +27,6 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -import sys import os import logging import locale @@ -201,10 +200,6 @@ try: from gi.repository import Farstream gi.require_version('Gst', '1.0') from gi.repository import Gst - gi.require_version('GdkX11', '3.0') - from gi.repository import GdkX11 - gi.require_version('GstVideo', '1.0') - from gi.repository import GstVideo from gi.repository import GLib try: Gst.init(None) ===================================== src/common/helpers.py ===================================== --- a/src/common/helpers.py +++ b/src/common/helpers.py @@ -31,7 +31,6 @@ import sys import re -import locale import os import subprocess import urllib ===================================== src/common/jingle_rtp.py ===================================== --- a/src/common/jingle_rtp.py +++ b/src/common/jingle_rtp.py @@ -17,20 +17,13 @@ Handles Jingle RTP sessions (XEP 0167) """ -from collections import deque - -from gi.repository import GLib import socket - import nbxmpp -from gi.repository import Farstream import gi +from gi.repository import Farstream + gi.require_version('Gst', '1.0') from gi.repository import Gst -gi.require_version('GdkX11', '3.0') -from gi.repository import GdkX11 -gi.require_version('GstVideo', '1.0') -from gi.repository import GstVideo from gi.repository import GLib from common import gajim @@ -40,6 +33,7 @@ from common.jingle_content import contents, JingleContent, JingleContentSetupExc from common.connection_handlers_events import InformationEvent from common.jingle_session import FailedApplication +from collections import deque import logging log = logging.getLogger('gajim.c.jingle_rtp') ===================================== src/common/logging_helpers.py ===================================== --- a/src/common/logging_helpers.py +++ b/src/common/logging_helpers.py @@ -19,7 +19,6 @@ ## import logging -from common import i18n def parseLogLevel(arg): """ ===================================== src/common/multimedia_helpers.py ===================================== --- a/src/common/multimedia_helpers.py +++ b/src/common/multimedia_helpers.py @@ -16,10 +16,6 @@ import gi gi.require_version('Gst', '1.0') from gi.repository import Gst -gi.require_version('GdkX11', '3.0') -from gi.repository import GdkX11 -gi.require_version('GstVideo', '1.0') -from gi.repository import GstVideo class DeviceManager(object): ===================================== src/common/optparser.py ===================================== --- a/src/common/optparser.py +++ b/src/common/optparser.py @@ -28,7 +28,6 @@ import os import sys -import locale import re from time import time from common import gajim ===================================== src/common/resolver.py ===================================== --- a/src/common/resolver.py +++ b/src/common/resolver.py @@ -18,8 +18,6 @@ ## import sys -import os -import re import logging import functools log = logging.getLogger('gajim.c.resolver') @@ -30,8 +28,6 @@ if __name__ == '__main__': import common.configpaths common.configpaths.gajimpaths.init(None) -from common import helpers -from nbxmpp.idlequeue import IdleCommand from gi.repository import Gio, GLib @@ -132,7 +128,6 @@ class GioResolver(CommonResolver): # below lines is on how to use API and assist in testing if __name__ == '__main__': - from gi.repository import GLib from gi.repository import Gtk from nbxmpp import idlequeue ===================================== src/common/sleepy.py ===================================== --- a/src/common/sleepy.py +++ b/src/common/sleepy.py @@ -23,7 +23,6 @@ from common import gajim import os -import sys STATE_UNKNOWN = 'OS probably not supported' ===================================== src/config.py ===================================== --- a/src/config.py +++ b/src/config.py @@ -36,7 +36,7 @@ from gi.repository import Gdk from gi.repository import Pango from gi.repository import GObject from gi.repository import GLib -import os, sys +import os import common.config import common.sleepy from common.i18n import Q_ ===================================== src/conversation_textview.py ===================================== --- a/src/conversation_textview.py +++ b/src/conversation_textview.py @@ -39,7 +39,6 @@ import time import os import tooltips import dialogs -import locale import queue import urllib ===================================== src/dialogs.py ===================================== --- a/src/dialogs.py +++ b/src/dialogs.py @@ -42,7 +42,6 @@ import time import gtkgui_helpers import vcard import conversation_textview -import message_control import dataforms_widget from common import defs ===================================== src/disco.py ===================================== --- a/src/disco.py +++ b/src/disco.py @@ -44,7 +44,6 @@ # the functionality) # There are more methods, of course, but this is a basic set. -import os import types import weakref from gi.repository import GLib ===================================== src/features_window.py ===================================== --- a/src/features_window.py +++ b/src/features_window.py @@ -24,7 +24,6 @@ ## import os -import sys import gi from gi.repository import Gtk import gtkgui_helpers ===================================== src/gtkgui_helpers.py ===================================== --- a/src/gtkgui_helpers.py +++ b/src/gtkgui_helpers.py @@ -36,13 +36,11 @@ from gi.repository import GLib from gi.repository import Pango import os import sys -import importlib try: from PIL import Image except: pass from io import BytesIO -import array import logging log = logging.getLogger('gajim.gtkgui_helpers') ===================================== src/history_manager.py ===================================== --- a/src/history_manager.py +++ b/src/history_manager.py @@ -52,7 +52,6 @@ import signal import gi gi.require_version('Gtk', '3.0') from gi.repository import Gtk -gi.require_version('GdkX11', '3.0') from gi.repository import Gdk from gi.repository import GLib import time ===================================== src/htmltextview.py ===================================== --- a/src/htmltextview.py +++ b/src/htmltextview.py @@ -41,11 +41,11 @@ from gi.repository import Pango from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GdkPixbuf -import xml.sax, xml.sax.handler +import xml.sax +import xml.sax.handler import re from io import StringIO import urllib -import operator if __name__ == '__main__': from common import i18n ===================================== src/message_textview.py ===================================== --- a/src/message_textview.py +++ b/src/message_textview.py @@ -24,12 +24,10 @@ import gc from gi.repository import Gtk -from gi.repository import Gdk from gi.repository import GObject from gi.repository import GLib from gi.repository import Pango -import gtkgui_helpers from common import gajim class MessageTextView(Gtk.TextView): ===================================== src/network_manager_listener.py ===================================== --- a/src/network_manager_listener.py +++ b/src/network_manager_listener.py @@ -21,7 +21,6 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -import sys from common import gajim ===================================== src/notify.py ===================================== --- a/src/notify.py +++ b/src/notify.py @@ -33,7 +33,6 @@ from dialogs import PopupNotificationWindow from gi.repository import GObject from gi.repository import GLib import gtkgui_helpers -from gi.repository import Gtk from common import gajim from common import helpers ===================================== src/roster_window.py ===================================== --- a/src/roster_window.py +++ b/src/roster_window.py @@ -74,7 +74,6 @@ if dbus_support.supported: import dbus from nbxmpp.protocol import NS_FILE, NS_ROSTERX, NS_CONFERENCE -from common.pep import MOODS, ACTIVITIES #(icon, name, type, jid, account, editable, second pixbuf) ( ===================================== src/statusicon.py ===================================== --- a/src/statusicon.py +++ b/src/statusicon.py @@ -23,7 +23,6 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -import sys from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GObject @@ -33,7 +32,6 @@ import dialogs import config import tooltips import gtkgui_helpers -import tooltips from common import gajim from common import helpers ===================================== src/tooltips.py ===================================== --- a/src/tooltips.py +++ b/src/tooltips.py @@ -33,7 +33,6 @@ from gi.repository import Gdk from gi.repository import GLib import os import time -import locale from datetime import datetime from datetime import timedelta View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ac4859fb87ef74564e1514a87890316165…

1 0

[Git][gajim/gajim][gajim_0.16] Use correct arguments for error_cb() Fixes #8484
by Philipp Hörist 21 Dec '16

21 Dec '16

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: f8122235 by Philipp Hörist at 2016-12-21T18:56:32+01:00 Use correct arguments for error_cb() Fixes #8484 - - - - - 1 changed file: - src/common/protocol/bytestream.py Changes: ===================================== src/common/protocol/bytestream.py ===================================== --- a/src/common/protocol/bytestream.py +++ b/src/common/protocol/bytestream.py @@ -768,7 +768,7 @@ class ConnectionIBBytestream(ConnectionBytestream): elif typ == 'result': self.SendHandler() elif typ == 'error': - gajim.socks5queue.error_cb() + gajim.socks5queue.error_cb('Error', stanza.getErrorMsg()) else: conn.send(nbxmpp.Error(stanza, nbxmpp.ERR_BAD_REQUEST)) raise nbxmpp.NodeProcessed View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f81222353642bf51d482a660545b8591d3…

1 0

[Git][gajim/gajim][gajim_0.16] Fix wrong import for JingleTransportSocks5
by Philipp Hörist 20 Dec '16

20 Dec '16

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: 491d32a2 by Philipp Hörist at 2016-12-20T23:50:32+01:00 Fix wrong import for JingleTransportSocks5 - - - - - 1 changed file: - src/common/jingle_ft.py Changes: ===================================== src/common/jingle_ft.py ===================================== --- a/src/common/jingle_ft.py +++ b/src/common/jingle_ft.py @@ -25,10 +25,10 @@ import gajim import nbxmpp import configpaths import jingle_xtls -from common.jingle_ftstates import StateCandReceived, JingleTransportSocks5, \ +from common.jingle_ftstates import StateCandReceived, \ StateCandSent, StateCandSentAndRecv, StateInitialized, StateTransfering,\ StateTransportReplace -from common.jingle_transport import TransportType +from common.jingle_transport import TransportType, JingleTransportSocks5 from jingle_content import contents, JingleContent from common import helpers from common.connection_handlers_events import FileRequestReceivedEvent, \ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/491d32a2ec13ed3a482e151e0b403eda7b…

1 0

[Git][gajim/gajim][gajim_0.16] 3 commits: Allow for a no limit option on restore_timeout
by Yann Leboulanger 19 Dec '16

19 Dec '16

Yann Leboulanger pushed to branch gajim_0.16 at gajim / gajim Commits: 8781f5aa by Philipp Hörist at 2016-12-18T23:08:54+01:00 Allow for a no limit option on restore_timeout - - - - - 29861e80 by Philipp Hörist at 2016-12-18T23:15:17+01:00 Change defaults on history restore options - - - - - 9920a2b2 by Yann Leboulanger at 2016-12-19T13:59:46+01:00 Merge branch 'restore' into 'gajim_0.16' Change history restore options - `No limit` option on 'restore_timeout' with `restore_timeout=0` - Change default values on restore values Current values of `restore_lines=4`, `restore_timeout=60` means in most cases no restore at all In recent years through Smartphone use of IM Clients, many people expect to always see at least the last X messages. With the current settings in most cases there is no history shown, and people think the Client is not capable of it. I think changing it to `restore_lines=10`, `restore_timeout=0` is sensible See merge request !7 - - - - - 3 changed files: - src/chat_control.py - src/common/config.py - src/common/logger.py Changes: ===================================== src/chat_control.py ===================================== --- a/src/chat_control.py +++ b/src/chat_control.py @@ -2991,12 +2991,6 @@ class ChatControl(ChatControlBase): if gajim.jid_is_transport(jid): return - # How many lines to restore and when to time them out - restore_how_many = gajim.config.get('restore_lines') - if restore_how_many <= 0: - return - timeout = gajim.config.get('restore_timeout') # in minutes - # number of messages that are in queue and are already logged, we want # to avoid duplication pending_how_many = len(gajim.events.get_events(self.account, jid, @@ -3006,8 +3000,8 @@ class ChatControl(ChatControlBase): self.contact.get_full_jid(), ['chat', 'pm'])) try: - rows = gajim.logger.get_last_conversation_lines(jid, restore_how_many, - pending_how_many, timeout, self.account) + rows = gajim.logger.get_last_conversation_lines( + jid, pending_how_many, self.account) except exceptions.DatabaseMalformed: import common.logger dialogs.ErrorDialog(_('Database Error'), ===================================== src/common/config.py ===================================== --- a/src/common/config.py +++ b/src/common/config.py @@ -175,8 +175,8 @@ class Config: 'notify_on_new_gmail_email_command': [ opt_str, '', _('Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q') ], 'use_gpg_agent': [ opt_bool, False ], 'change_roster_title': [ opt_bool, True, _('Add * and [n] in roster title?')], - 'restore_lines': [opt_int, 4, _('How many lines to remember from previous conversation when a chat tab/window is reopened?')], - 'restore_timeout': [opt_int, 60, _('How many minutes should last lines from previous conversation last.')], + 'restore_lines': [opt_int, 10, _('How many history messages should be restored when a chat tab/window is reopened?')], + 'restore_timeout': [opt_int, 0, _('How far back in time (minutes) history is restored. 0 means no limit.')], 'muc_restore_lines': [opt_int, 20, _('How many lines to request from server when entering a groupchat. -1 means no limit')], 'muc_restore_timeout': [opt_int, 60, _('How many minutes back to request logs when entering a groupchat. -1 means no limit')], 'muc_autorejoin_timeout': [opt_int, 1, _('How many seconds to wait before trying to autorejoin to a conference you are being disconnected from. Set to 0 to disable autorejoining.')], ===================================== src/common/logger.py ===================================== --- a/src/common/logger.py +++ b/src/common/logger.py @@ -579,8 +579,7 @@ class Logger: message_col, subject_col) return self.commit_to_db(values, write_unread) - def get_last_conversation_lines(self, jid, restore_how_many_rows, - pending_how_many, timeout, account): + def get_last_conversation_lines(self, jid, pending_how_many, account): """ Accept how many rows to restore and when to time them out (in minutes) (mark them as too old) and number of messages that are in queue and are @@ -595,8 +594,15 @@ class Logger: return [] where_sql, jid_tuple = self._build_contact_where(account, jid) + # How many lines to restore and when to time them out + restore_how_many = gajim.config.get('restore_lines') + if restore_how_many <= 0: + return + timeout = gajim.config.get('restore_timeout') # in minutes + now = int(float(time.time())) - timed_out = now - (timeout * 60) # before that they are too old + if timeout != 0: + timeout = now - (timeout * 60) # before that they are too old # so if we ask last 5 lines and we have 2 pending we get # 3 - 8 (we avoid the last 2 lines but we still return 5 asked) try: @@ -606,8 +612,8 @@ class Logger: ORDER BY time DESC LIMIT %d OFFSET %d ''' % (where_sql, constants.KIND_SINGLE_MSG_RECV, constants.KIND_CHAT_MSG_RECV, constants.KIND_SINGLE_MSG_SENT, - constants.KIND_CHAT_MSG_SENT, constants.KIND_ERROR, timed_out, - restore_how_many_rows, pending_how_many), jid_tuple) + constants.KIND_CHAT_MSG_SENT, constants.KIND_ERROR, timeout, + restore_how_many, pending_how_many), jid_tuple) results = self.cur.fetchall() except sqlite.DatabaseError: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/50c3e9476c2043bc8be217a8713f869b9…

1 0

[Git][gajim/gajim][gajim_0.16] Add .gitignore
by Philipp Hörist 17 Dec '16

17 Dec '16

Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim Commits: 50c3e947 by Philipp Hörist at 2016-12-18T00:35:41+01:00 Add .gitignore - - - - - 1 changed file: - .hgignore → .gitignore Changes: ===================================== .hgignore → .gitignore ===================================== --- a/.hgignore +++ b/.gitignore @@ -1,5 +1,6 @@ syntax: glob *.orig +*.swp *.gmo *.in *.m4 @@ -15,6 +16,7 @@ po/POTFILES po/stamp-it stamp-h1 Makefile +__pycache__/ syntax: regexp ^config\.* View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/50c3e9476c2043bc8be217a8713f869b94…

1 0

[Git][gajim/gajim][gajim_0.16] do not list all keys when we want to know if we have a key. Fixes #8477
by Yann Leboulanger 17 Dec '16

17 Dec '16

Yann Leboulanger pushed to branch gajim_0.16 at gajim / gajim Commits: ed7a40cb by Yann Leboulanger at 2016-12-17T14:23:20+01:00 do not list all keys when we want to know if we have a key. Fixes #8477 Conflicts: src/common/connection.py - - - - - 3 changed files: - src/common/connection.py - src/common/gpg.py - src/common/helpers.py Changes: ===================================== src/common/connection.py ===================================== --- a/src/common/connection.py +++ b/src/common/connection.py @@ -692,8 +692,10 @@ class CommonConnection: else: self.gpg.passphrase = passphrase - def ask_gpg_keys(self): + def ask_gpg_keys(self, keyID=None): if self.gpg: + if keyID: + return self.gpg.get_key(keyID) return self.gpg.get_keys() return None @@ -2153,7 +2155,7 @@ class Connection(CommonConnection, ConnectionHandlers): _cb_parameters={"jid":jid, "msg":msg, "keyID":keyID, "forward_from":forward_from, "session":session, "original_message":original_message, "subject":subject, "type_":type_, "msg_iq":msg_iq, "xhtml":xhtml, "obj":obj})) - + self._prepare_message(obj.jid, obj.message, obj.keyID, type_=obj.type_, subject=obj.subject, chatstate=obj.chatstate, msg_id=obj.msg_id, resource=obj.resource, user_nick=obj.user_nick, xhtml=obj.xhtml, @@ -2166,7 +2168,7 @@ class Connection(CommonConnection, ConnectionHandlers): if obj.conn.name != self.name: return obj.msg_id = self.connection.send(obj.msg_iq, now=obj.now) - + # obj in this function is the obj as seen in _nec_message_outgoing() def cb(obj, jid, msg, keyID, forward_from, session, original_message, subject, type_, msg_iq, xhtml, msg_id): @@ -2187,7 +2189,7 @@ class Connection(CommonConnection, ConnectionHandlers): else: self.log_message(jid, msg, forward_from, session, original_message, subject, type_, xhtml) - + cb(msg_id=obj.msg_id, **obj._cb_parameters) def send_contacts(self, contacts, fjid, type_='message'): ===================================== src/common/gpg.py ===================================== --- a/src/common/gpg.py +++ b/src/common/gpg.py @@ -114,6 +114,9 @@ if HAVE_GPG: return '' + def get_key(self, keyID): + return super(GnuPG, self).list_keys(keys=[keyID]) + def get_keys(self, secret=False): keys = {} result = super(GnuPG, self).list_keys(secret=secret) ===================================== src/common/helpers.py ===================================== --- a/src/common/helpers.py +++ b/src/common/helpers.py @@ -1314,9 +1314,9 @@ def prepare_and_validate_gpg_keyID(account, jid, keyID): # An unsigned presence, just use the assigned key keyID = attached_keys[attached_keys.index(jid) + 1] elif keyID: - public_keys = gajim.connections[account].ask_gpg_keys() + full_key = gajim.connections[account].ask_gpg_keys(keyID=keyID) # Assign the corresponding key, if we have it in our keyring - if keyID in public_keys: + if full_key: for u in gajim.contacts.get_contacts(account, jid): u.keyID = keyID keys_str = gajim.config.get_per('accounts', account, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ed7a40cb47a9ddb8e21b91cc9707820e8c…

1 0

[Git][gajim/gajim][master] do not list all keys when we want to know if we have a key. Fixes #8477
by Yann Leboulanger 17 Dec '16

17 Dec '16

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 458d1083 by Yann Leboulanger at 2016-12-17T14:06:36+01:00 do not list all keys when we want to know if we have a key. Fixes #8477 - - - - - 3 changed files: - src/common/connection.py - src/common/gpg.py - src/common/helpers.py Changes: ===================================== src/common/connection.py ===================================== --- a/src/common/connection.py +++ b/src/common/connection.py @@ -684,8 +684,10 @@ class CommonConnection: else: self.gpg.passphrase = passphrase - def ask_gpg_keys(self): + def ask_gpg_keys(self, keyID=None): if self.gpg: + if keyID: + return self.gpg.get_key(keyID) return self.gpg.get_keys() return None @@ -2163,7 +2165,7 @@ class Connection(CommonConnection, ConnectionHandlers): _cb_parameters={"jid":jid, "msg":msg, "keyID":keyID, "forward_from":forward_from, "session":session, "original_message":original_message, "subject":subject, "type_":type_, "msg_iq":msg_iq, "xhtml":xhtml, "obj":obj})) - + self._prepare_message(obj.jid, obj.message, obj.keyID, type_=obj.type_, subject=obj.subject, chatstate=obj.chatstate, msg_id=obj.msg_id, resource=obj.resource, user_nick=obj.user_nick, xhtml=obj.xhtml, @@ -2176,7 +2178,7 @@ class Connection(CommonConnection, ConnectionHandlers): if obj.conn.name != self.name: return obj.msg_id = self.connection.send(obj.msg_iq, now=obj.now) - + # obj in this function is the obj as seen in _nec_message_outgoing() def cb(obj, jid, msg, keyID, forward_from, session, original_message, subject, type_, msg_iq, xhtml, msg_id): @@ -2197,7 +2199,7 @@ class Connection(CommonConnection, ConnectionHandlers): else: self.log_message(jid, msg, forward_from, session, original_message, subject, type_, xhtml, obj.additional_data) - + cb(msg_id=obj.msg_id, **obj._cb_parameters) def send_contacts(self, contacts, fjid, type_='message'): ===================================== src/common/gpg.py ===================================== --- a/src/common/gpg.py +++ b/src/common/gpg.py @@ -113,6 +113,9 @@ if HAVE_GPG: return '' + def get_key(self, keyID): + return super(GnuPG, self).list_keys(keys=[keyID]) + def get_keys(self, secret=False): keys = {} result = super(GnuPG, self).list_keys(secret=secret) ===================================== src/common/helpers.py ===================================== --- a/src/common/helpers.py +++ b/src/common/helpers.py @@ -1285,9 +1285,9 @@ def prepare_and_validate_gpg_keyID(account, jid, keyID): # An unsigned presence, just use the assigned key keyID = attached_keys[attached_keys.index(jid) + 1] elif keyID: - public_keys = gajim.connections[account].ask_gpg_keys() + full_key = gajim.connections[account].ask_gpg_keys(keyID=keyID) # Assign the corresponding key, if we have it in our keyring - if keyID in public_keys: + if full_key: for u in gajim.contacts.get_contacts(account, jid): u.keyID = keyID keys_str = gajim.config.get_per('accounts', account, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/458d1083bc34c76ff30ee9037041d26fd9…

1 0

[Git][gajim/gajim][master] don't crash when gnupg doesn't have a status attribute.
by Yann Leboulanger 17 Dec '16

17 Dec '16

Yann Leboulanger pushed to branch master at gajim / gajim Commits: d9efb31b by Yann Leboulanger at 2016-12-17T13:32:35+01:00 don't crash when gnupg doesn't have a status attribute. - - - - - 1 changed file: - src/common/gpg.py Changes: ===================================== src/common/gpg.py ===================================== --- a/src/common/gpg.py +++ b/src/common/gpg.py @@ -89,7 +89,7 @@ if HAVE_GPG: if result.fingerprint: return self._stripHeaderFooter(str(result)) - if result.status == 'key expired': + if hasattr(result, 'status') and result.status == 'key expired': return 'KEYEXPIRED' return 'BAD_PASSPHRASE' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/d9efb31b2ec7b821a8636925b20db77255…

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