Rezzect/syncplay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

made sure gtk is not loaded with --no-gui

Browse Source
This commit is contained in:
Uriziel 2012-09-22 14:33:31 +02:00
parent 56600bcfc7
commit 2676029542
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
syncplay/SyncplayMPC.py
View File

@ -3,7 +3,7 @@ from syncplay.client import SyncplayClientManager
from syncplay.players import mpc from syncplay.players import mpc
from syncplay.ConfigurationGetter import MPCConfigurationGetter from syncplay.ConfigurationGetter import MPCConfigurationGetter
from syncplay.ui.GuiConfiguration import GuiConfigurationForMPC
class SyncplayMPC(SyncplayClient): class SyncplayMPC(SyncplayClient):
def __init__(self): def __init__(self):
@ -18,7 +18,11 @@ class SyncplayMPC(SyncplayClient):
self.args = self.argsGetter.getConfiguration() self.args = self.argsGetter.getConfiguration()
def _guiPromptForMissingArguments(self): def _guiPromptForMissingArguments(self):
self.args = GuiConfigurationForMPC(self.args, self.args.force_gui_prompt).getProcessedConfiguration() try:
from syncplay.ui.GuiConfiguration import GuiConfigurationForMPC
self.args = GuiConfigurationForMPC(self.args, self.args.force_gui_prompt).getProcessedConfiguration()
except:
pass
def _promptForMissingArguments(self): def _promptForMissingArguments(self):
SyncplayClient._promptForMissingArguments(self) SyncplayClient._promptForMissingArguments(self)

10
syncplay/client.py
View File

@ -528,7 +528,7 @@ class SyncplayClientManager(object):
from syncplay import ui from syncplay import ui
from syncplay.ConfigurationGetter import ConfigurationGetter from syncplay.ConfigurationGetter import ConfigurationGetter
from syncplay.ConfigurationGetter import InvalidConfigValue from syncplay.ConfigurationGetter import InvalidConfigValue
from syncplay.ui.GuiConfiguration import GuiConfiguration
import sys import sys
class SyncplayClient(object): class SyncplayClient(object):
@ -543,7 +543,7 @@ class SyncplayClient(object):
self.argsGetter.saveValuesIntoConfigFile() self.argsGetter.saveValuesIntoConfigFile()
except InvalidConfigValue: except InvalidConfigValue:
self._checkAndSaveConfiguration() self._checkAndSaveConfiguration()
except GuiConfiguration.WindowClosed: except:
sys.exit() sys.exit()
def _prepareArguments(self): def _prepareArguments(self):
@ -551,7 +551,11 @@ class SyncplayClient(object):
self.args = self.argsGetter.getConfiguration() self.args = self.argsGetter.getConfiguration()
def _guiPromptForMissingArguments(self): def _guiPromptForMissingArguments(self):
self.args = GuiConfiguration(self.args, self.args.force_gui_prompt).getProcessedConfiguration() try:
from syncplay.ui.GuiConfiguration import GuiConfiguration
self.args = GuiConfiguration(self.args, self.args.force_gui_prompt).getProcessedConfiguration()
except ImportError:
pass
def _promptForMissingArguments(self): def _promptForMissingArguments(self):
if(self.args.no_gui): if(self.args.no_gui):