From c90ae06d85da723f6629560ede5371107a8155c6 Mon Sep 17 00:00:00 2001
From: Uriziel <urizieli@gmail.com>
Date: Wed, 6 Mar 2013 22:05:34 +0100
Subject: [PATCH] Fixed warning in server enviroment when starting with pygtk
 installed there with no display

---
 syncplay/server.py                 | 19 +++++++++++++++++++
 syncplay/ui/ConfigurationGetter.py | 18 ------------------
 syncplayServer.py                  |  6 +++---
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/syncplay/server.py b/syncplay/server.py
index d3fb4bb..6a09267 100644
--- a/syncplay/server.py
+++ b/syncplay/server.py
@@ -12,6 +12,7 @@ import codecs
 import os
 from string import Template
 from ircBot import Bot as IRCBot
+import argparse
 
 class SyncFactory(Factory):
     def __init__(self, password = '', motdFilePath = None, httpReplyFilePath= None, ircConfig = None, ircVerbose = False):
@@ -396,3 +397,21 @@ class Watcher(object):
         if(self._sendStateTimer):
             self._sendStateTimer.stop()
     
+class ConfigurationGetter(object):
+    def getConfiguration(self):
+        self._prepareArgParser()
+        self._args = self._argparser.parse_args()
+        if(self._args.port == None):
+            self._args.port = constants.DEFAULT_PORT
+        return self._args
+           
+    def _prepareArgParser(self):
+        self._argparser = argparse.ArgumentParser(description=getMessage("en", "server-argument-description"),
+                                         epilog=getMessage("en", "server-argument-epilog"))
+        self._argparser.add_argument('--port', metavar='port', type=str, nargs='?', help=getMessage("en", "server-port-argument"))
+        self._argparser.add_argument('--password', metavar='password', type=str, nargs='?', help=getMessage("en", "server-password-argument"))
+        self._argparser.add_argument('--isolate-rooms', action='store_true', help=getMessage("en", "server-isolate-room-argument"))
+        self._argparser.add_argument('--motd-file', metavar='file', type=str, nargs='?', help=getMessage("en", "server-motd-argument"))
+        self._argparser.add_argument('--http-reply-file', metavar='file', type=str, nargs='?', help=getMessage("en", "server-http-reply-argument"))
+        self._argparser.add_argument('--irc-verbose', action='store_true', help=getMessage("en", "server-irc-verbose"))
+        self._argparser.add_argument('--irc-config-file', metavar='file', type=str, nargs='?', help=getMessage("en", "server-irc-config"))
diff --git a/syncplay/ui/ConfigurationGetter.py b/syncplay/ui/ConfigurationGetter.py
index 40aaf49..9b16cc1 100644
--- a/syncplay/ui/ConfigurationGetter.py
+++ b/syncplay/ui/ConfigurationGetter.py
@@ -215,21 +215,3 @@ class ConfigurationGetter(object):
         self._saveConfig(iniPath)
         return self._config
     
-class ServerConfigurationGetter(object):
-    def getConfiguration(self):
-        self._prepareArgParser()
-        self._args = self._argparser.parse_args()
-        if(self._args.port == None):
-            self._args.port = constants.DEFAULT_PORT
-        return self._args
-           
-    def _prepareArgParser(self):
-        self._argparser = argparse.ArgumentParser(description=getMessage("en", "server-argument-description"),
-                                         epilog=getMessage("en", "server-argument-epilog"))
-        self._argparser.add_argument('--port', metavar='port', type=str, nargs='?', help=getMessage("en", "server-port-argument"))
-        self._argparser.add_argument('--password', metavar='password', type=str, nargs='?', help=getMessage("en", "server-password-argument"))
-        self._argparser.add_argument('--isolate-rooms', action='store_true', help=getMessage("en", "server-isolate-room-argument"))
-        self._argparser.add_argument('--motd-file', metavar='file', type=str, nargs='?', help=getMessage("en", "server-motd-argument"))
-        self._argparser.add_argument('--http-reply-file', metavar='file', type=str, nargs='?', help=getMessage("en", "server-http-reply-argument"))
-        self._argparser.add_argument('--irc-verbose', action='store_true', help=getMessage("en", "server-irc-verbose"))
-        self._argparser.add_argument('--irc-config-file', metavar='file', type=str, nargs='?', help=getMessage("en", "server-irc-config"))
diff --git a/syncplayServer.py b/syncplayServer.py
index b8ecbd0..3944933 100755
--- a/syncplayServer.py
+++ b/syncplayServer.py
@@ -3,11 +3,11 @@
 
 from twisted.internet import reactor
 
-from syncplay.server import SyncFactory, SyncIsolatedFactory
-from syncplay.ui.ConfigurationGetter import ServerConfigurationGetter
+from syncplay.server import SyncFactory, SyncIsolatedFactory, ConfigurationGetter
  
-argsGetter = ServerConfigurationGetter()
+argsGetter = ConfigurationGetter()
 args = argsGetter.getConfiguration()
+
 if(not args.isolate_rooms):
     reactor.listenTCP(int(args.port), SyncFactory(args.password, args.motd_file, args.http_reply_file, args.irc_config_file, args.irc_verbose))
 else: