summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2013-08-10 01:50:03 +0200
committermathieui <mathieui@mathieui.net>2013-08-10 01:50:03 +0200
commit518f933fb848848e91456474fb52c153854de95f (patch)
treec3d7557d78bc7831f3a969af913b799ad57117c3
parent64c1a09023298e75eed0b2a0e736d1422f7f46b7 (diff)
downloadpoezio-518f933fb848848e91456474fb52c153854de95f.tar.gz
poezio-518f933fb848848e91456474fb52c153854de95f.tar.bz2
poezio-518f933fb848848e91456474fb52c153854de95f.tar.xz
poezio-518f933fb848848e91456474fb52c153854de95f.zip
Fix #2343
-rw-r--r--CHANGELOG5
-rw-r--r--src/theming.py2
2 files changed, 6 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 569835bc..0a18a7b0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,11 @@ For more detailed changelog, see the roadmap:
http://dev.louiz.org/projects/poezio/roadmap
* Poezio 0.8 - dev
+- /invite in a MUCTab now has the behavior one could expect
+ (inviting a specific JID to this MUC)
+- Themes and plugins are now loaded using a set of paths instead
+ of only a specific directory.
+- The OTR plugin has been completly rewritten
- The completion can now complete the current argument in the input,
instead of only the last one.
- Poezio now periodically pings the server to detect connection loss
diff --git a/src/theming.py b/src/theming.py
index dd42342c..d62b47ae 100644
--- a/src/theming.py
+++ b/src/theming.py
@@ -451,7 +451,7 @@ def reload_theme():
log.error('Failed to load the theme %s', theme_name, exc_info=True)
exc = e
finally:
- if version_info[1] < 3:
+ if version_info[1] < 3 and imp.lock_held():
imp.release_lock()
if not new_theme: