Philipp Hörist pushed to branch gajim_0.16 at gajim / gajim
Commits:
13d86057 by Philipp Hörist at 2017-04-21T18:34:54+02:00
Start HistoryManager with config path argument
HistoryManager was not finding the Logs.db when Gajim was used
with the -c config path argument
- - - - -
2 changed files:
- src/common/helpers.py
- src/roster_window.py
Changes:
=====================================
src/common/helpers.py
=====================================
--- a/src/common/helpers.py
+++ b/src/common/helpers.py
@@ -405,7 +405,7 @@ def is_in_path(command, return_abs_path=False):
pass
return False
-def exec_command(command, use_shell=False):
+def exec_command(command, use_shell=False, posix=True):
"""
execute a command. if use_shell is True, we run the command as is it was
typed in a console. So it may be dangerous if you are not sure about what
@@ -414,7 +414,7 @@ def exec_command(command, use_shell=False):
if use_shell:
subprocess.Popen('%s &' % command, shell=True).wait()
else:
- args = shlex.split(command.encode('utf-8'))
+ args = shlex.split(command.encode('utf-8'), posix=posix)
p = subprocess.Popen(args)
gajim.thread_interface(p.wait)
=====================================
src/roster_window.py
=====================================
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -2856,13 +2856,15 @@ class RosterWindow:
gajim.connections[account].send_motd(server)
def on_history_manager_menuitem_activate(self, widget):
- if os.name == 'nt':
- if os.path.exists('history_manager.exe'): # user is running stable
- helpers.exec_command('history_manager.exe')
- else: # user is running svn
- helpers.exec_command('%s history_manager.py' % sys.executable)
- else: # Unix user
- helpers.exec_command('%s history_manager.py' % sys.executable)
+ config_path = '-c %s' % gajim.gajimpaths.config_root
+ posix = os.name != 'nt'
+ if os.path.exists('history_manager.exe'): # Windows
+ helpers.exec_command('history_manager.exe %s' % config_path,
+ posix=posix)
+ else: # Linux or running from Git
+ helpers.exec_command(
+ '%s history_manager.py %s' % (sys.executable, config_path),
+ posix=posix)
def on_info(self, widget, contact, account):
"""
View it on GitLab:
https://dev.gajim.org/gajim/gajim/commit/13d86057c7d2208a2cb8bf06fb738df93a90d018
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
