Yann Leboulanger pushed to branch gajim_1.0 at gajim / gajim
Commits:
cfbb14fe by Philipp Hörist at 2018-04-01T15:49:16+02:00
Decode PGP decrypted messages
- - - - -
967f7a40 by Yann Leboulanger at 2018-04-01T15:49:23+02:00
correctly set process name. Fixes #9034
- - - - -
2 changed files:
- gajim/common/gpg.py
- gajim/gajim.py
Changes:
=====================================
gajim/common/gpg.py
=====================================
--- a/gajim/common/gpg.py
+++ b/gajim/common/gpg.py
@@ -73,7 +73,7 @@ if app.HAVE_GPG:
result = super(GnuPG, self).decrypt(data.encode('utf8'),
passphrase=self.passphrase)
- return str(result)
+ return result.data.decode('utf8')
def sign(self, str_, keyID):
result = super(GnuPG, self).sign(str_.encode('utf8'), keyid=keyID,
detach=True,
=====================================
gajim/gajim.py
=====================================
--- a/gajim/gajim.py
+++ b/gajim/gajim.py
@@ -218,7 +218,7 @@ class GajimApplication(Gtk.Application):
if Gtk.Widget.get_default_direction() == Gtk.TextDirection.RTL:
i18n.direction_mark = '\u200F'
- from ctypes import CDLL
+ from ctypes import CDLL, byref, create_string_buffer
from ctypes.util import find_library
import platform
@@ -231,7 +231,10 @@ class GajimApplication(Gtk.Application):
PR_SET_NAME = 15
if sysname == 'Linux':
- libc.prctl(PR_SET_NAME, 'gajim')
+ proc_name = b'gajim'
+ buff = create_string_buffer(len(proc_name)+1)
+ buff.value = proc_name
+ libc.prctl(PR_SET_NAME, byref(buff), 0, 0, 0)
elif sysname in ('FreeBSD', 'OpenBSD', 'NetBSD'):
libc.setproctitle('gajim')
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/0d2be126c05fcc6e4de27bb0b7b68728b441d249...967f7a403f313fb45062bb9336869a16f3ed2a01
---
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/0d2be126c05fcc6e4de27bb0b7b68728b441d249...967f7a403f313fb45062bb9336869a16f3ed2a01
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
