Philipp Hörist pushed to branch master at gajim / gajim
Commits:
fa710524 by Philipp Hörist at 2019-02-06T19:46:53Z
Remove unused import
- - - - -
fc8c056e by Philipp Hörist at 2019-02-09T20:39:14Z
Detect nbxmpp supported encryptions
- Better handle logging for gnupg
- - - - -
5 changed files:
- gajim/common/const.py
- gajim/common/gpg.py
- gajim/common/logging_helpers.py
- gajim/common/modules/message.py
- gajim/gui_interface.py
Changes:
=====================================
gajim/common/const.py
=====================================
@@ -9,6 +9,8 @@ Option.__new__.__defaults__ = (None,) * len(Option._fields) #
type: ignore
DialogButton = namedtuple('DialogButton', 'text callback action')
DialogButton.__new__.__defaults__ = (None, None) # type: ignore
+EncryptionData = namedtuple('EncryptionData', 'additional_data')
+EncryptionData.__new__.__defaults__ = (None,) # type: ignore
@unique
class OptionKind(IntEnum):
=====================================
gajim/common/gpg.py
=====================================
@@ -25,7 +25,6 @@ from gajim.common import app
if app.is_installed('GPG'):
import gnupg
- gnupg.logger = logging.getLogger('gajim.c.gnupg')
class GnuPG(gnupg.GPG):
def __init__(self):
=====================================
gajim/common/logging_helpers.py
=====================================
@@ -148,18 +148,21 @@ def init():
)
)
- # fake the root logger so we have 'gajim' root name instead of 'root'
root_log = logging.getLogger('gajim')
root_log.setLevel(logging.WARNING)
root_log.addHandler(consoleloghandler)
root_log.propagate = False
- # handle nbxmpp logs too
root_log = logging.getLogger('nbxmpp')
root_log.setLevel(logging.WARNING)
root_log.addHandler(consoleloghandler)
root_log.propagate = False
+ root_log = logging.getLogger('gnupg')
+ root_log.setLevel(logging.WARNING)
+ root_log.addHandler(consoleloghandler)
+ root_log.propagate = False
+
def set_loglevels(loglevels_string):
parseAndSetLogLevels(loglevels_string)
=====================================
gajim/common/modules/message.py
=====================================
@@ -175,13 +175,17 @@ class Message:
event = MessageReceivedEvent(None, **event_attr)
app.nec.push_incoming_event(event)
- app.plugin_manager.extension_point(
- 'decrypt', self._con, event, self._on_message_decrypted)
- if not event.encrypted:
- eme = parse_eme(event.stanza)
- if eme is not None:
- event.msgtxt = eme
+ if properties.is_encrypted:
+ event.additional_data['encrypted'] =
properties.encrypted.additional_data
self._on_message_decrypted(event)
+ else:
+ app.plugin_manager.extension_point(
+ 'decrypt', self._con, event, self._on_message_decrypted)
+ if not event.encrypted:
+ eme = parse_eme(event.stanza)
+ if eme is not None:
+ event.msgtxt = eme
+ self._on_message_decrypted(event)
def _on_message_decrypted(self, event):
try:
=====================================
gajim/gui_interface.py
=====================================
@@ -110,7 +110,6 @@ from gajim.gtk.dialogs import InputDialog
from gajim.gtk.dialogs import YesNoDialog
from gajim.gtk.dialogs import PlainConnectionDialog
from gajim.gtk.dialogs import SSLErrorDialog
-from gajim.gtk.dialogs import ConfirmationDialogDoubleCheck
from gajim.gtk.dialogs import ChangeNickDialog
from gajim.gtk.profile import ProfileWindow
from gajim.gtk.join_groupchat import JoinGroupchatWindow
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/959be5b8ee5de499082be53a7c676fb19a096c51...fc8c056eff2024b2b5c1a25f765406a334cb4337
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/959be5b8ee5de499082be53a7c676fb19a096c51...fc8c056eff2024b2b5c1a25f765406a334cb4337
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
