From 31365c33ab27015fc1c04202e73efe032ff00cbb Mon Sep 17 00:00:00 2001 From: Nikos Kouremenos Date: Tue, 9 Aug 2005 11:34:36 +0000 Subject: [PATCH] 'aplay', 'play', 'esdplay', 'artsplay' detected first time only --- src/common/config.py | 3 ++- src/config.py | 12 +++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/common/config.py b/src/common/config.py index b0e66db98..87c11246d 100644 --- a/src/common/config.py +++ b/src/common/config.py @@ -78,7 +78,8 @@ class Config: 'print_time': [ opt_str, 'always' ], 'useemoticons': [ opt_bool, True ], 'sounds_on': [ opt_bool, True ], - 'soundplayer': [ opt_str, 'play' ], + # 'aplay', 'play', 'esdplay', 'artsplay' detected first time only + 'soundplayer': [ opt_str, '' ], 'openwith': [ opt_str, 'gnome-open' ], 'custombrowser': [ opt_str, 'firefox' ], 'custommailapp': [ opt_str, 'mozilla-thunderbird -compose' ], diff --git a/src/config.py b/src/config.py index dfde014ad..c7845efd6 100644 --- a/src/config.py +++ b/src/config.py @@ -35,6 +35,7 @@ except: pass from gajim import Contact +from common import helpers from common import gajim from common import connection from common import i18n @@ -289,9 +290,14 @@ class PreferencesWindow: self.xml.get_widget('sounds_scrolledwindow').set_sensitive(False) self.xml.get_widget('browse_sounds_hbox').set_sensitive(False) - #sound player - self.xml.get_widget('soundplayer_entry').set_text( - gajim.config.get('soundplayer')) + # sound player + player = gajim.config.get('soundplayer') + if player == '': # only on first time Gajim starts + commands = ('aplay', 'play', 'esdplay', 'artsplay') + for command in commands: + if helpers.is_in_path(command): + self.xml.get_widget('soundplayer_entry').set_text(command) + break #sounds treeview self.sound_tree = self.xml.get_widget('sounds_treeview')