gajim: do not try to go autoaway or come back from autoaway if w...
changeset fc0e20d9098f in /home/hg/repos/gajim author: Yann Leboulanger aste...@lagaule.org branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=fc0e20d9098f description: do not try to go autoaway or come back from autoaway if we are not connected. See #8062 diffstat: src/gui_interface.py | 5 - 1 files changed, 4 insertions(+), 1 deletions(-) diffs (22 lines): diff -r bf9f8103b375 -r fc0e20d9098f src/gui_interface.py --- a/src/gui_interface.py Mon Jul 27 13:36:49 2015 +0200 +++ b/src/gui_interface.py Mon Jul 27 22:58:47 2015 +0200 @@ -2916,7 +2916,8 @@ def gnome_screensaver_ActiveChanged_cb(active): if not active: for account in gajim.connections: -if gajim.sleeper_state[account] == 'autoaway-forced': +if gajim.account_is_connected(account) and \ +gajim.sleeper_state[account] == 'autoaway-forced': # We came back online ofter gnome-screensaver # autoaway self.roster.send_status(account, 'online', @@ -2932,6 +2933,8 @@ not gajim.sleeper_state[account]: continue if gajim.sleeper_state[account] == 'online': +if not gajim.account_is_connected(account): +continue # we save out online status gajim.status_before_autoaway[account] = \ gajim.connections[account].status ___ Commits mailing list Commits@gajim.org https://lists.gajim.org/cgi-bin/listinfo/commits
gajim: if config file says password is saved with libsecret (wit...
changeset 89fb94925f32 in /home/hg/repos/gajim
author: Yann Leboulanger aste...@lagaule.org
branches:
details:http://hg.gajim.org/gajim?cmd=changeset;node=89fb94925f32
description: if config file says password is saved with libsecret (with py3
branch) we can still get it with gnomekeyring
diffstat:
src/common/passwords.py | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diffs (23 lines):
diff -r f583d7b71314 -r 89fb94925f32 src/common/passwords.py
--- a/src/common/passwords.py Fri Jul 24 21:30:14 2015 +0200
+++ b/src/common/passwords.py Fri Jul 24 21:53:58 2015 +0200
@@ -49,8 +49,8 @@
class SimplePasswordStorage(PasswordStorage):
def get_password(self, account_name):
passwd = gajim.config.get_per('accounts', account_name, 'password')
-if passwd and (passwd.startswith('gnomekeyring:') or \
- passwd == 'kwallet'):
+if passwd and (passwd.startswith('gnomekeyring:') or
passwd.startswith('libsecret:') or \
+passwd == 'kwallet'):
# this is not a real password, it's either a gnome
# keyring token or stored in the KDE wallet
return None
@@ -79,7 +79,7 @@
conf = gajim.config.get_per('accounts', account_name, 'password')
if conf is None or conf == 'kwallet':
return None
-if not conf.startswith('gnomekeyring:'):
+if not (conf.startswith('gnomekeyring:') or
conf.startswith('libsecret')):
password = conf
## migrate the password over to keyring
try:
___
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits
gajim: correctly detect that key is not trusted before encryptin...
changeset 7a48158d56c3 in /home/hg/repos/gajim
author: Yann Leboulanger aste...@lagaule.org
branches:
details:http://hg.gajim.org/gajim?cmd=changeset;node=7a48158d56c3
description: correctly detect that key is not trusted before encrypting. Doc
says: gpg just prints a message to the console, but does not provide a
specific error indication that the Python wrapper can use. Fixes #8040. See
#8041
diffstat:
src/common/gnupg.py | 5 -
src/common/gpg.py | 10 +++---
2 files changed, 11 insertions(+), 4 deletions(-)
diffs (45 lines):
diff -r 1b7cd2956f67 -r 7a48158d56c3 src/common/gnupg.py
--- a/src/common/gnupg.py Tue Jul 28 20:19:19 2015 +0200
+++ b/src/common/gnupg.py Wed Jul 29 22:32:02 2015 +0200
@@ -1094,7 +1094,7 @@
getattr(result, keyword)(L)
return result
-def list_keys(self, secret=False):
+def list_keys(self, secret=False, keys=None):
list the keys currently in the keyring
import shutil
@@ -1116,6 +1116,9 @@
which='secret-keys'
args = [--list-%s % which, --fixed-list-mode, --fingerprint,
--with-colons]
+if keys:
+for key in keys:
+args.append(key)
p = self._open_subprocess(args)
return self._get_list_output(p, 'list')
diff -r 1b7cd2956f67 -r 7a48158d56c3 src/common/gpg.py
--- a/src/common/gpg.py Tue Jul 28 20:19:19 2015 +0200
+++ b/src/common/gpg.py Wed Jul 29 22:32:02 2015 +0200
@@ -54,12 +54,16 @@
for key in recipients:
if key not in self.always_trust:
trust = False
+if not trust:
+# check that we'll be able to encrypt
+result = super(GnuPG, self).list_keys(recipients,
+keys=recipients)
+for key in result:
+if key['trust'] not in ('f', 'u'):
+return '', 'NOT_TRUSTED'
result = super(GnuPG, self).encrypt(str_, recipients,
always_trust=trust, passphrase=self.passphrase)
-if result.status == 'invalid recipient':
-return '', 'NOT_TRUSTED'
-
if result.ok:
error = ''
else:
___
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits
gajim: prepare 0.16.2 release
changeset adbad0aca894 in /home/hg/repos/gajim
author: Yann Leboulanger aste...@lagaule.org
branches:
details:http://hg.gajim.org/gajim?cmd=changeset;node=adbad0aca894
description: prepare 0.16.2 release
diffstat:
ChangeLog | 6 ++
autogen.sh | 2 +-
debian/changelog | 6 ++
src/common/defs.py | 2 +-
4 files changed, 14 insertions(+), 2 deletions(-)
diffs (48 lines):
diff -r 89fb94925f32 -r adbad0aca894 ChangeLog
--- a/ChangeLog Fri Jul 24 21:53:58 2015 +0200
+++ b/ChangeLog Fri Jul 24 21:56:22 2015 +0200
@@ -1,3 +1,9 @@
+Gajim 0.16.2 (20 July 2015)
+
+ * improve Zeroconf under windows and with IPv6
+ * Fix errors with GnuPG
+ * Minor fixes and improvements
+
Gajim 0.16.1 (28 February 2015)
* Fix sending Zeroconf messages
diff -r 89fb94925f32 -r adbad0aca894 autogen.sh
--- a/autogen.shFri Jul 24 21:53:58 2015 +0200
+++ b/autogen.shFri Jul 24 21:56:22 2015 +0200
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
- gajimversion=0.16.1
+ gajimversion=0.16.2
if [ -d .hg ]; then
node=$(hg tip --template {node})
hgversion=-${node:0:12}
diff -r 89fb94925f32 -r adbad0aca894 debian/changelog
--- a/debian/changelog Fri Jul 24 21:53:58 2015 +0200
+++ b/debian/changelog Fri Jul 24 21:56:22 2015 +0200
@@ -1,3 +1,9 @@
+gajim (0.16.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Yann Leboulanger y...@leboulanger.org Sat, 20 Jul 2014 22:30:10 +0200
+
gajim (0.16.1-1) unstable; urgency=low
* New upstream release
diff -r 89fb94925f32 -r adbad0aca894 src/common/defs.py
--- a/src/common/defs.pyFri Jul 24 21:53:58 2015 +0200
+++ b/src/common/defs.pyFri Jul 24 21:56:22 2015 +0200
@@ -27,7 +27,7 @@
basedir = '../'
localedir = '../po'
-version = '0.16.1'
+version = '0.16.2'
import subprocess
try:
node = subprocess.Popen('hg tip --template {node|short}', shell=True,
___
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits
gajim: set urgency_hint when notify_on_all_muc_messages is True....
changeset 8c5aff636fb7 in /home/hg/repos/gajim
author: Yann Leboulanger aste...@lagaule.org
branches:
details:http://hg.gajim.org/gajim?cmd=changeset;node=8c5aff636fb7
description: set urgency_hint when notify_on_all_muc_messages is True. Fixes
#8110
diffstat:
src/message_window.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diffs (13 lines):
diff -r ebd4642babcd -r 8c5aff636fb7 src/message_window.py
--- a/src/message_window.py Sun Jul 26 14:05:47 2015 +0200
+++ b/src/message_window.py Sun Jul 26 14:25:21 2015 +0200
@@ -502,7 +502,8 @@
if control.type_id == message_control.TYPE_GC:
name = control.room_jid.split('@')[0]
-urgent = control.attention_flag
+urgent = control.attention_flag or \
+gajim.config.get('notify_on_all_muc_messages')
else:
name = control.contact.get_shown_name()
if control.resource:
___
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits
gajim: require python-nbxmpp 0.5.3
changeset 8d23ebbee93b in /home/hg/repos/gajim author: Yann Leboulanger aste...@lagaule.org branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=8d23ebbee93b description: require python-nbxmpp 0.5.3 diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 49d45a97f789 -r 8d23ebbee93b src/gajim.py --- a/src/gajim.py Sun Jul 19 00:03:32 2015 +0200 +++ b/src/gajim.py Mon Jul 20 19:47:30 2015 +0200 @@ -69,7 +69,7 @@ pass HAS_NBXMPP=True -MIN_NBXMPP_VER = 0.5.2 +MIN_NBXMPP_VER = 0.5.3 try: import nbxmpp except ImportError: ___ Commits mailing list Commits@gajim.org https://lists.gajim.org/cgi-bin/listinfo/commits
gajim: Correctly register gajim-remote with xmpp: URIs
changeset 437c32ee7d03 in /home/hg/repos/gajim
author: Yann Leboulanger aste...@lagaule.org
branches:
details:http://hg.gajim.org/gajim?cmd=changeset;node=437c32ee7d03
description: Correctly register gajim-remote with xmpp: URIs
diffstat:
data/gajim-remote.desktop.in.in | 11 +
data/gui/preferences_window.ui | 17 ---
po/el.po| 2 +-
po/he.po| 2 +-
po/pl.po| 2 +-
po/tr.po| 2 +-
src/common/config.py| 1 -
src/common/gnupg.py | 1 +
src/config.py | 7 ---
src/gtkgui_helpers.py | 88 -
src/gui_interface.py| 6 +-
11 files changed, 18 insertions(+), 121 deletions(-)
diffs (257 lines):
diff -r 63e385c0e2c3 -r 437c32ee7d03 data/gajim-remote.desktop.in.in
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/data/gajim-remote.desktop.in.in Fri Jul 17 22:19:16 2015 +0200
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Categories=Network;InstantMessaging;RemoteAccess;ConsoleOnly;
+_Name=Gajim Remote
+_Keywords=chat;messaging;im;jabber;xmpp;bonjour;voip
+Version=1.0
+Exec=gajim-remote handle_uri %u
+TryExec=gajim-remote
+StartupNotify=false
+Terminal=false
+Type=Application
+MimeType=x-scheme-handler/xmpp
diff -r 63e385c0e2c3 -r 437c32ee7d03 data/gui/preferences_window.ui
--- a/data/gui/preferences_window.uiFri Jul 31 22:08:00 2015 +0200
+++ b/data/gui/preferences_window.uiFri Jul 17 22:19:16 2015 +0200
@@ -3049,23 +3049,6 @@
property name=position0/property
/packing
/child
-child
- object class=GtkCheckButton
id=check_default_client_checkbutton
-property name=label
translatable=yesCheck on startup if Gajim is the _default Jabber
client/property
-property name=visibleTrue/property
-property name=can_focusTrue/property
-property
name=receives_defaultFalse/property
-property name=use_underlineTrue/property
-property name=xalign0/property
-property name=draw_indicatorTrue/property
-signal name=toggled
handler=on_check_default_client_checkbutton_toggled swapped=no/
- /object
- packing
-property name=expandFalse/property
-property name=fillTrue/property
-property name=position1/property
- /packing
-/child
/object
/child
/object
diff -r 63e385c0e2c3 -r 437c32ee7d03 po/el.po
--- a/po/el.po Fri Jul 31 22:08:00 2015 +0200
+++ b/po/el.po Fri Jul 17 22:19:16 2015 +0200
@@ -8859,7 +8859,7 @@
#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
#, fuzzy
-msgid Handle a xmpp:/ uri
+msgid Handle a xmpp: uri
msgstr Το URI \%s\ δεν είναι έγκυρο.
#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
diff -r 63e385c0e2c3 -r 437c32ee7d03 po/he.po
--- a/po/he.po Fri Jul 31 22:08:00 2015 +0200
+++ b/po/he.po Fri Jul 17 22:19:16 2015 +0200
@@ -9628,7 +9628,7 @@
#: ../src/gajim-remote.py:277
#, fuzzy
-msgid Handle a xmpp:/ uri
+msgid Handle a xmpp: uri
msgstr cli
#: ../src/gajim-remote.py:279
diff -r 63e385c0e2c3 -r 437c32ee7d03 po/pl.po
--- a/po/pl.po Fri Jul 31 22:08:00 2015 +0200
+++ b/po/pl.po Fri Jul 17 22:19:16 2015 +0200
@@ -8979,7 +8979,7 @@
msgstr Konto, dla którego ma być ustawiony awatar; jeżeli nie jest określone,
awatar zostanie ustawiony dla wszystkich kont
#: ../src/gajim-remote.py:278
-msgid Handle a xmpp:/ uri
+msgid Handle a xmpp: uri
msgstr Obsługuj URI xmpp:/
#: ../src/gajim-remote.py:280
diff -r 63e385c0e2c3 -r 437c32ee7d03 po/tr.po
--- a/po/tr.po Fri Jul 31 22:08:00 2015 +0200
+++ b/po/tr.po Fri Jul 17 22:19:16 2015 +0200
@@ -7786,7 +7786,7 @@
#: ../src/gajim-remote.py:277
#, fuzzy
-msgid Handle a xmpp:/ uri
+msgid Handle a xmpp: uri
msgstr Adres verilmedi
#: ../src/gajim-remote.py:279
diff -r 63e385c0e2c3 -r 437c32ee7d03 src/common/config.py
--- a/src/common/config.py Fri Jul 31 22:08:00 2015 +0200
+++ b/src/common/config.py Fri Jul 17 22:19:16 2015 +0200
@@ -245,7 +245,6 @@
'notification_avatar_height': [opt_int, 48],
'muc_highlight_words': [opt_str, '', _('A semicolon-separated list
of words that will be highlighted in group chats.')],
'quit_on_roster_x_button': [opt_bool, False, _('If True, quits
Gajim when X button of Window Manager is clicked. This setting is taken into
account only if
gajim: don't try to reconnect when network goes down. See #8062
changeset 86931b5d08f5 in /home/hg/repos/gajim
author: Yann Leboulanger aste...@lagaule.org
branches:
details:http://hg.gajim.org/gajim?cmd=changeset;node=86931b5d08f5
description: don't try to reconnect when network goes down. See #8062
diffstat:
src/network_manager_listener.py | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diffs (22 lines):
diff -r 8d23ebbee93b -r 86931b5d08f5 src/network_manager_listener.py
--- a/src/network_manager_listener.py Mon Jul 20 19:47:30 2015 +0200
+++ b/src/network_manager_listener.py Fri Jul 24 20:49:14 2015 +0200
@@ -47,8 +47,7 @@
For Network Manager 0.7 - 0.9
-nm_state = props.Get(org.freedesktop.NetworkManager, State)
-if nm_state == 3 or nm_state == 70:
+if state == 70:
for connection in gajim.connections.values():
if gajim.config.get_per('accounts', connection.name,
'listen_to_network_manager') and connection.time_to_reconnect:
@@ -57,7 +56,7 @@
for connection in gajim.connections.values():
if gajim.config.get_per('accounts', connection.name,
'listen_to_network_manager') and connection.connected 1:
-connection._disconnectedReconnCB()
+connection._on_disconnected()
supported = False
___
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits
gajim: prepare 0.16.3 release
changeset 25e0fff8cf51 in /home/hg/repos/gajim
author: Yann Leboulanger aste...@lagaule.org
branches:
details:http://hg.gajim.org/gajim?cmd=changeset;node=25e0fff8cf51
description: prepare 0.16.3 release
diffstat:
ChangeLog | 6 ++
autogen.sh | 2 +-
debian/changelog | 6 ++
gajim.nsi | 2 +-
setup_win32.py | 2 +-
src/common/defs.py | 2 +-
6 files changed, 16 insertions(+), 4 deletions(-)
diffs (72 lines):
diff -r 6d283cb66ffe -r 25e0fff8cf51 ChangeLog
--- a/ChangeLog Wed Jul 29 22:35:51 2015 +0200
+++ b/ChangeLog Fri Jul 31 14:27:15 2015 +0200
@@ -1,3 +1,9 @@
+Gajim 0.16.3 (31 July 2015)
+
+ * Fix reading secret file
+ * Fix reconnection after suspend
+ * Fix sending GPG-encrypted file to non-trusted key
+
Gajim 0.16.2 (24 July 2015)
* improve Zeroconf under windows and with IPv6
diff -r 6d283cb66ffe -r 25e0fff8cf51 autogen.sh
--- a/autogen.shWed Jul 29 22:35:51 2015 +0200
+++ b/autogen.shFri Jul 31 14:27:15 2015 +0200
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
- gajimversion=0.16.2
+ gajimversion=0.16.3
if [ -d .hg ]; then
node=$(hg tip --template {node})
hgversion=-${node:0:12}
diff -r 6d283cb66ffe -r 25e0fff8cf51 debian/changelog
--- a/debian/changelog Wed Jul 29 22:35:51 2015 +0200
+++ b/debian/changelog Fri Jul 31 14:27:15 2015 +0200
@@ -1,3 +1,9 @@
+gajim (0.16.3-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Yann Leboulanger y...@leboulanger.org Sat, 31 Jul 2014 23:12:04 +0200
+
gajim (0.16.2-1) unstable; urgency=low
* New upstream release
diff -r 6d283cb66ffe -r 25e0fff8cf51 gajim.nsi
--- a/gajim.nsi Wed Jul 29 22:35:51 2015 +0200
+++ b/gajim.nsi Fri Jul 31 14:27:15 2015 +0200
@@ -212,7 +212,7 @@
WriteRegStr HKLM
Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim DisplayName
Gajim
WriteRegStr HKLM
Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim UninstallString
$INSTDIR\Uninstall.exe
WriteRegStr HKLM
Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim DisplayIcon
$INSTDIR\bin\Gajim.exe
- WriteRegStr HKLM
Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim DisplayVersion
0.16.2
+ WriteRegStr HKLM
Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim DisplayVersion
0.16.3
WriteRegStr HKLM
Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim URLInfoAbout
http://www.gajim.org/;
WriteUninstaller $INSTDIR\Uninstall.exe
diff -r 6d283cb66ffe -r 25e0fff8cf51 setup_win32.py
--- a/setup_win32.pyWed Jul 29 22:35:51 2015 +0200
+++ b/setup_win32.pyFri Jul 31 14:27:15 2015 +0200
@@ -56,7 +56,7 @@
setup(
name='Gajim',
-version='0.16.2',
+version='0.16.3',
description='A full featured Jabber client',
author='Gajim Development Team',
url='http://gajim.org/',
diff -r 6d283cb66ffe -r 25e0fff8cf51 src/common/defs.py
--- a/src/common/defs.pyWed Jul 29 22:35:51 2015 +0200
+++ b/src/common/defs.pyFri Jul 31 14:27:15 2015 +0200
@@ -27,7 +27,7 @@
basedir = '../'
localedir = '../po'
-version = '0.16.2'
+version = '0.16.3'
import subprocess
try:
node = subprocess.Popen('hg tip --template {node|short}', shell=True,
___
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits
gajim: Handle PINENTRY_LAUNCHED when signing. Fixes #8099
changeset 6d283cb66ffe in /home/hg/repos/gajim author: Yann Leboulanger aste...@lagaule.org branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=6d283cb66ffe description: Handle PINENTRY_LAUNCHED when signing. Fixes #8099 diffstat: src/common/gnupg.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 7a48158d56c3 -r 6d283cb66ffe src/common/gnupg.py --- a/src/common/gnupg.py Wed Jul 29 22:32:02 2015 +0200 +++ b/src/common/gnupg.py Wed Jul 29 22:35:51 2015 +0200 @@ -612,7 +612,8 @@ if key in (USERID_HINT, NEED_PASSPHRASE, BAD_PASSPHRASE, GOOD_PASSPHRASE, BEGIN_SIGNING, CARDCTRL, INV_SGNR, NO_SGNR, MISSING_PASSPHRASE, NEED_PASSPHRASE_PIN, - SC_OP_FAILURE, SC_OP_SUCCESS, PROGRESS): + SC_OP_FAILURE, SC_OP_SUCCESS, PROGRESS, + PINENTRY_LAUNCHED): pass elif key in (KEYEXPIRED, SIGEXPIRED): self.status = 'key expired' ___ Commits mailing list Commits@gajim.org https://lists.gajim.org/cgi-bin/listinfo/commits
gajim: Added tag gajim-0.16.2 for changeset d96858fee8db
changeset fbffefe7eb56 in /home/hg/repos/gajim author: Yann Leboulanger aste...@lagaule.org branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=fbffefe7eb56 description: Added tag gajim-0.16.2 for changeset d96858fee8db diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r adbad0aca894 -r fbffefe7eb56 .hgtags --- a/.hgtags Fri Jul 24 21:56:22 2015 +0200 +++ b/.hgtags Fri Jul 24 22:07:38 2015 +0200 @@ -14,3 +14,4 @@ 129d3cce62cb497e490fef80e56bf97f57dc098b gajim-0.16-rc2 f33618265c92e3c591ebc8d4767363d5cea2cf71 gajim-0.16 33a5521fed877568ae1de04a76cc9031fdabacbf gajim-0.16.1 +d96858fee8dbe03f4e990a7c822e9bf12f42b0a3 gajim-0.16.2 ___ Commits mailing list Commits@gajim.org https://lists.gajim.org/cgi-bin/listinfo/commits
gajim: never duplicate gnome keyring entries
changeset f583d7b71314 in /home/hg/repos/gajim author: Yann Leboulanger aste...@lagaule.org branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=f583d7b71314 description: never duplicate gnome keyring entries diffstat: src/common/passwords.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r ac0921228c80 -r f583d7b71314 src/common/passwords.py --- a/src/common/passwords.py Fri Jul 24 21:14:56 2015 +0200 +++ b/src/common/passwords.py Fri Jul 24 21:30:14 2015 +0200 @@ -83,7 +83,7 @@ password = conf ## migrate the password over to keyring try: -self.save_password(account_name, password, update=False) +self.save_password(account_name, password) except GnomeKeyringError as e: if e.error == GnomeKeyring.Result.NO_KEYRING_DAEMON: ## no keyring daemon: in the future, stop using it ___ Commits mailing list Commits@gajim.org https://lists.gajim.org/cgi-bin/listinfo/commits
gajim: prevent traceback
changeset 1b7cd2956f67 in /home/hg/repos/gajim
author: Yann Leboulanger aste...@lagaule.org
branches:
details:http://hg.gajim.org/gajim?cmd=changeset;node=1b7cd2956f67
description: prevent traceback
diffstat:
src/common/connection.py | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diffs (14 lines):
diff -r fc0e20d9098f -r 1b7cd2956f67 src/common/connection.py
--- a/src/common/connection.py Mon Jul 27 22:58:47 2015 +0200
+++ b/src/common/connection.py Tue Jul 28 20:19:19 2015 +0200
@@ -914,7 +914,9 @@
self.sm.enabled = False
gajim.nec.push_incoming_event(OurShowEvent(None, conn=self,
show='error'))
-
self.connection.UnregisterDisconnectHandler(self._disconnectedReconnCB)
+if self.connection:
+self.connection.UnregisterDisconnectHandler(
+self._disconnectedReconnCB)
self.disconnect()
if gajim.config.get_per('accounts', self.name, 'autoreconnect'):
self.connected = -1
___
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits
gajim: specify module version before importing
changeset f98c7a3df18a in /home/hg/repos/gajim
author: Yann Leboulanger aste...@lagaule.org
branches:
details:http://hg.gajim.org/gajim?cmd=changeset;node=f98c7a3df18a
description: specify module version before importing
diffstat:
src/features_window.py | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diffs (19 lines):
diff -r 29d066279e93 -r f98c7a3df18a src/features_window.py
--- a/src/features_window.pyFri Jul 31 14:27:30 2015 +0200
+++ b/src/features_window.pyTue Aug 04 16:42:59 2015 +0200
@@ -25,6 +25,7 @@
import os
import sys
+import gi
from gi.repository import Gtk
import gtkgui_helpers
@@ -194,6 +195,7 @@
if kwalletbinding.kwallet_available():
return True
try:
+gi.require_version('GnomeKeyring', '1.0')
from gi.repository import GnomeKeyring
except Exception:
return False
___
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits
