Forgot to add some files to previous commit

diff --git a/src/constants.py b/src/constants.py
index 8d1359b..d1bc9a0 100644 (file)
--- a/src/constants.py
+++ b/src/constants.py
@@ -1,9 +1,9 @@
 import os
 
 import os
 

-__pretty_app_name__ = "DialCentral"
-__app_name__ = "dialcentral"
-__version__ = "1.0.6"
-__build__ = 10
+__pretty_app_name__ = "Telepathy-TheOneRing"
+__app_name__ = "telepathy-theonering"
+__version__ = "0.1.0"
+__build__ = 0

 __app_magic__ = 0xdeadbeef
 __app_magic__ = 0xdeadbeef

-_data_path_ = os.path.join(os.path.expanduser("~"), ".dialcentral")
+_data_path_ = os.path.join(os.path.expanduser("~"), ".telepathy-theonering")

 _user_settings_ = "%s/settings.ini" % _data_path_
 _user_settings_ = "%s/settings.ini" % _data_path_

diff --git a/src/telepathy-theonering b/src/telepathy-theonering
index 8f25a85..a32d3db 100755 (executable)
--- a/src/telepathy-theonering
+++ b/src/telepathy-theonering
@@ -31,7 +31,7 @@ import telepathy.utils as telepathy_utils
 import util.linux as linux_utils
 import util.go_utils as gobject_utils
 import constants
 import util.linux as linux_utils
 import util.go_utils as gobject_utils
 import constants

-from butterfly import ButterflyConnectionManager
+import connection_manager

 
 
 IDLE_TIMEOUT = 5000
 
 
 IDLE_TIMEOUT = 5000

@@ -60,7 +60,7 @@ def run_theonering():
        signal.signal(signal.SIGTERM, quit)
 
        try:
        signal.signal(signal.SIGTERM, quit)
 
        try:

-               manager = ButterflyConnectionManager(shutdown_func=shutdown_callback)
+               manager = connection_manager.TheOneRingConnectionManager(shutdown_func=shutdown_callback)

        except dbus.exceptions.NameExistsException:
                logging.warning('Failed to acquire bus name, connection manager already running?')
                sys.exit(1)
        except dbus.exceptions.NameExistsException:
                logging.warning('Failed to acquire bus name, connection manager already running?')
                sys.exit(1)