6 files changed, 100 insertions, 89 deletions
diff --git a/plugins/exception.py b/plugins/exception.py
new file mode 100644
index 0000000..e653853
--- /dev/null
+++ b/plugins/exception.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+#
+# File: plugins/exception.py
+# This file is part of the Portato-Project, a graphical portage-frontend.
+#
+# Copyright (C) 2008 René 'Necoro' Neumann
+# This is free software.  You may redistribute copies of it under the terms of
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#
+# Written by René 'Necoro' Neumann <necoro@necoro.net>
+
+def throw (*args, **kwargs):
+	raise Exception, "As requested, Sir!"
+
+p = Plugin()
+p.__name__ = "ExceptionThrower"
+p.__author__ = "René 'Necoro' Neumann"
+p.add_menu("Throw exception", throw)
+register(p)
diff --git a/plugins/exception.xml b/plugins/exception.xml
deleted file mode 100644
index 385e743..0000000
--- a/plugins/exception.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<plugin xmlns="http://portato.sourceforge.net/plugin" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://portato.sourceforge.net/plugin http://portato.sourceforge.net/plugin.xsd">
-
-	<author>René 'Necoro' Neumann</author>
-	<name>Exception Thrower</name>
-
-	<import>portato.plugins.exception</import>
-
-	<menu>
-		<item call="throw">Throw exception</item>
-	</menu>
-
-</plugin>
diff --git a/plugins/new_version.py b/plugins/new_version.py
new file mode 100644
index 0000000..f3479b4
--- /dev/null
+++ b/plugins/new_version.py
@@ -0,0 +1,80 @@
+# -*- coding: utf-8 -*-
+#
+# File: plugins/new_version.py
+# This file is part of the Portato-Project, a graphical portage-frontend.
+#
+# Copyright (C) 2008 René 'Necoro' Neumann
+# This is free software.  You may redistribute copies of it under the terms of
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#
+# Written by René 'Necoro' Neumann <necoro@necoro.net>
+
+try:
+	from bzrlib import plugin, branch
+except ImportError:
+	plugin = branch =  None
+import gobject
+
+from portato.helper import debug, warning
+from portato import get_listener
+from portato.constants import VERSION, APP_ICON, APP
+from portato.gui.utils import GtkThread
+
+class NewVersionFinder(Plugin):
+	"""
+	Checks for a new version of portato every 30 minutes and on startup.
+	"""
+	__author__ = "René 'Necoro' Neumann"
+	__dependency__ = ["dev-util/bzr"]
+
+	def init (self):
+		self.add_call("main", self.run)
+		self.add_menu("Check for new _versions", self.menu)
+
+	def find_version (self, rev):
+		try:
+			b = branch.Branch.open("lp:portato")
+		except Exception, e:
+			warning("NEW_VERSION :: Exception occured while accessing the remote branch: %s", str(e))
+			return
+
+		debug("NEW_VERSION :: Installed rev: %s - Current rev: %s", rev, b.revno())
+		if int(rev) < int(b.revno()):
+			def callback():
+				get_listener().send_notify(base = "New Portato Live Version Found", descr = "You have rev. %s, but the most recent revision is %s." % (rev, b.revno()), icon = APP_ICON)
+				return False
+			
+			gobject.idle_add(callback)
+
+	def start_thread(self, rev):
+		t = GtkThread(target = self.find_version, name = "Version Updater Thread", args = (rev,))
+		t.setDaemon(True)
+		t.start()
+		return True
+
+	def menu (self, *args, **kwargs):
+		"""
+		Run the thread once.
+		"""
+		v = VERSION.split()
+		if len(v) != 3 or v[0] != "9999":
+			return None
+
+		rev = v[-1]
+
+		plugin.load_plugins() # to have lp: addresses parsed
+		
+		self.start_thread(rev)
+		return rev
+
+	def run (self, *args, **kwargs):
+		"""
+		Run the thread once and add a 30 minutes timer.
+		"""
+		rev = self.menu()
+
+		if rev is not None:
+			gobject.timeout_add(30*60*1000, self.start_thread, rev) # call it every 30 minutes
+
+register(NewVersionFinder, (branch is None))
diff --git a/plugins/new_version.xml b/plugins/new_version.xml
deleted file mode 100644
index 2711054..0000000
--- a/plugins/new_version.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<plugin xmlns="http://portato.sourceforge.net/plugin" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://portato.sourceforge.net/plugin http://portato.sourceforge.net/plugin.xsd">
-
-	<author>René 'Necoro' Neumann</author>
-	<name>New Version Reminder</name>
-
-	<import>portato.plugins.new_version</import>
-
-	<hooks>
-		<hook type="main" call="run" />
-	</hooks>
-
-	<menu>
-		<item call="run_menu">Check for new _versions</item>
-	</menu>
-</plugin>
diff --git a/portato/plugins/exception.py b/portato/plugins/exception.py
deleted file mode 100644
index 64bdb77..0000000
--- a/portato/plugins/exception.py
+++ /dev/null
@@ -1,2 +0,0 @@
-def throw (*args, **kwargs):
-	raise Exception, "As requested, Sir!"
diff --git a/portato/plugins/new_version.py b/portato/plugins/new_version.py
deleted file mode 100644
index fe69292..0000000
--- a/portato/plugins/new_version.py
+++ /dev/null
@@ -1,58 +0,0 @@
-try:
-	from bzrlib import plugin, branch
-except ImportError:
-	plugin = branch =  None
-import gobject
-
-from portato.helper import debug, warning
-from portato import get_listener
-from portato.constants import VERSION, APP_ICON, APP
-from portato.gui.utils import GtkThread
-
-def find_version (rev):
-	try:
-		b = branch.Branch.open("lp:portato")
-	except Exception, e:
-		warning("NEW_VERSION :: Exception occured while accessing the remote branch: %s", str(e))
-		return
-
-	debug("NEW_VERSION :: Installed rev: %s - Current rev: %s", rev, b.revno())
-	if int(rev) < int(b.revno()):
-		def callback():
-			get_listener().send_notify(base = "New Portato Live Version Found", descr = "You have rev. %s, but the most recent revision is %s." % (rev, b.revno()), icon = APP_ICON)
-			return False
-		
-		gobject.idle_add(callback)
-
-def start_thread(rev):
-	t = GtkThread(target = find_version, name = "Version Updater Thread", args = (rev,))
-	t.setDaemon(True)
-	t.start()
-	return True
-
-def run_menu (*args, **kwargs):
-	"""
-	Run the thread once.
-	"""
-	if not all((plugin, branch)):
-		return None
-
-	v = VERSION.split()
-	if len(v) != 3 or v[0] != "9999":
-		return None
-
-	rev = v[-1]
-
-	plugin.load_plugins() # to have lp: addresses parsed
-	
-	start_thread(rev)
-	return rev
-
-def run (*args, **kwargs):
-	"""
-	Run the thread once and add a 30 minutes timer.
-	"""
-	rev = run_menu()
-
-	if rev is not None:
-		gobject.timeout_add(30*60*1000, start_thread, rev) # call it every 30 minutes