From 4287d26669703d465d810cdcb658b2838a59baf5 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Tue, 23 Feb 2010 19:47:14 +0100
Subject: [PATCH] fix upgrading from 0.12.5. Fixes #5619

---
 src/common/optparser.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/common/optparser.py b/src/common/optparser.py
index b90304b4d..3efc4e2d2 100644
--- a/src/common/optparser.py
+++ b/src/common/optparser.py
@@ -704,7 +704,9 @@ class OptionsParser:
         """
         Remove hardcoded ../data/sounds from config
         """
-        dirs = ('../data', gajim.gajimpaths.root, gajim.DATA_DIR)
+        dirs = ('../data', gajim.gajimpaths.data_root, gajim.DATA_DIR)
+        if os.name != 'nt':
+            dirs += (os.path.expanduser(u'~/.gajim'))
         for evt in gajim.config.get_per('soundevents'):
             path = gajim.config.get_per('soundevents', evt, 'path')
             # absolute and relative passes are necessary