diff --git a/libsaria/__init__.py b/libsaria/__init__.py index 386c0b21..65578ce8 100644 --- a/libsaria/__init__.py +++ b/libsaria/__init__.py @@ -3,16 +3,17 @@ __all__ = [ "audio", "sources", "event", "map", "path", "plugin"] -__major__ = 1 +__major__ = 4 __minor__ = 4 __bug__ = 0 __dev__ = True -__vers__ = "Libsaria %s.%s" % (__major__, __minor__) +__vstr__ = "%s.%s" % (__major__, __minor__) if __bug__ > 0: - __vers__ = "%s.%s" % (__vers__, __bug__) + __vstr__ = "%s.%s" % (__vstr__, __bug__) if __dev__ == True: - __vers__ += "-dev" + __vstr__ += "-dev" +__vers__ = "Libsaria %s" % __vstr__ import event import path diff --git a/ocarina/__init__.py b/ocarina/__init__.py index 586957d5..ac7699bc 100644 --- a/ocarina/__init__.py +++ b/ocarina/__init__.py @@ -12,16 +12,7 @@ import libsaria gdk = gtk.gdk main = gtk.main -__major__ = 4 -__minor__ = 4 -__bug__ = 0 -__dev__ = True - -__vers__ = "Ocarina %s.%s" % (__major__, __minor__) -if __bug__ > 0: - __vers__ = "%s.%s" % (__vers__, __bug__) -if __dev__ == True: - __vers__ += "-dev" +__vers__ = "Ocarina %s" % libsaria.__vstr__ def uptime(): return now() - __start__ diff --git a/plugins/lyrics.py b/plugins/lyrics.py index d5be0598..9af6ad44 100644 --- a/plugins/lyrics.py +++ b/plugins/lyrics.py @@ -95,8 +95,8 @@ def stop(): footer.remove_page("Lyrics") def check_version(): - if ocarina.__major__ != 4: + if libsaria.__major__ != 4: return False - if ocarina.__minor__ == 3: + if libsaria.__minor__ == 4: return True return False diff --git a/plugins/notify.py b/plugins/notify.py index 06ec2122..5fbd2e63 100644 --- a/plugins/notify.py +++ b/plugins/notify.py @@ -27,8 +27,8 @@ def stop(): pass def check_version(): - if ocarina.__major__ != 4: + if libsaria.__major__ != 4: return False - if ocarina.__minor__ == 3: + if libsaria.__minor__ == 4: return True return True diff --git a/plugins/web_radio.py b/plugins/web_radio.py index a94281f4..eba6a826 100644 --- a/plugins/web_radio.py +++ b/plugins/web_radio.py @@ -4,9 +4,10 @@ import ocarina import webkit from ocarina import body -path = ocarina.libsaria.path -audio = ocarina.libsaria.audio -gtk = ocarina.gtk +libsaria = ocarina.libsaria +path = libsaria.path +audio = libsaria.audio +gtk = ocarina.gtk page = gtk.ScrolledWindow() box = gtk.VBox() @@ -32,8 +33,8 @@ def stop(): body.remove_page("Web Radio") def check_version(): - if ocarina.__major__ != 4: + if libsaria.__major__ != 4: return False - if ocarina.__minor__ == 3: + if libsaria.__minor__ == 4: return True return False diff --git a/plugins/web_server.py b/plugins/web_server.py index 962e78a4..bf9e0425 100644 --- a/plugins/web_server.py +++ b/plugins/web_server.py @@ -1,12 +1,12 @@ # Bryan Schumaker (11/13/2010) -import ocarina +import libsaria import imp from libsaria.sources import library from libsaria import threads from libsaria import lastfm -path = ocarina.libsaria.path +path = libsaria.path exists = path.exists join = path.join sep = path.sep @@ -112,7 +112,7 @@ class HTTPRequest(BaseHTTPRequestHandler): def start_server(): global server - if ocarina.__dev__ == True: + if libsaria.__dev__ == True: server = HTTPServer(('', 4243), HTTPRequest) else: server = HTTPServer(('', 4242), HTTPRequest) @@ -125,9 +125,9 @@ def stop(): server.shutdown() def check_version(): - if ocarina.__major__ != 4: + if libsaria.__major__ != 4: return False - if ocarina.__minor__ == 3: + if libsaria.__minor__ == 4: return True return False diff --git a/plugins/wm_tweaks.py b/plugins/wm_tweaks.py index 63d53a39..ea137579 100644 --- a/plugins/wm_tweaks.py +++ b/plugins/wm_tweaks.py @@ -30,8 +30,8 @@ def stop(): pass def check_version(): - if ocarina.__major__ != 4: + if libsaria.__major__ != 4: return False - if ocarina.__minor__ == 3: + if libsaria.__minor__ == 4: return True return False