diff -Naur democracy_old/coverage.py democracy/coverage.py
--- democracy_old/coverage.py	2007-03-29 04:07:42.000000000 +0100
+++ democracy/coverage.py	2007-03-29 04:06:42.000000000 +0100
@@ -355,8 +355,8 @@
         else:
             omit = []
 
-        self.relative_dir = 'dist/usr/lib/python2.4/site-packages/democracy/'
-        democracyRoot = 'dist/usr/lib/python2.4/site-packages/democracy/'
+        self.relative_dir = 'dist/usr/lib/python2.5/site-packages/democracy/'
+        democracyRoot = 'dist/usr/lib/python2.5/site-packages/democracy/'
         if settings.get('report'):
             args = [os.path.join(democracyRoot, arg) for arg in args]
             self.report(args, show_missing, ignore_errors, omit_prefixes=omit)
@@ -792,10 +792,10 @@
     sys.exitfunc = the_coverage.save
 
 def runSetupDotPy():
-    if os.system('python2.4 setup.py install --root=./dist') != 0:
+    if os.system('python2.5 setup.py install --root=./dist') != 0:
         print "error running setup.py"
         sys.exit(-1)
-    sys.path.append('dist/usr/lib/python2.4/site-packages/')
+    sys.path.append('dist/usr/lib/python2.5/site-packages/')
     os.environ['DEMOCRACY_RESOURCE_ROOT']='dist/usr/share/democracy/resources/'
 
 # Command-line interface.
diff -Naur democracy_old/frontend_implementation/Application.py democracy/frontend_implementation/Application.py
--- democracy_old/frontend_implementation/Application.py	2007-03-29 04:07:42.000000000 +0100
+++ democracy/frontend_implementation/Application.py	2007-03-29 04:10:30.000000000 +0100
@@ -23,7 +23,7 @@
 
         queue.main_thread = threading.currentThread()
         platformutils.setMainThread()
-        gtk.threads_init()
+        gtk.gdk.threads_init()
         self.onStartup()
         gtk.main()
         self.onShutdown()
diff -Naur democracy_old/frontend_implementation/gtk_queue.py democracy/frontend_implementation/gtk_queue.py
--- democracy_old/frontend_implementation/gtk_queue.py	2007-03-29 04:07:42.000000000 +0100
+++ democracy/frontend_implementation/gtk_queue.py	2007-03-29 04:10:00.000000000 +0100
@@ -106,14 +106,14 @@
             return retval
 
     def _idle(self):
-        gtk.threads_enter()
+        gtk.gdk.threads_enter()
         self.idle_running_lock.acquire()
         try:
             (callback, args, kwargs) = self.queue.get_nowait()
         except Queue.Empty:
             self.idle_running = 0
             self.idle_running_lock.release()
-            gtk.threads_leave()
+            gtk.gdk.threads_leave()
             return 0
         else:
             self.idle_running_lock.release()
@@ -126,7 +126,7 @@
             except:
                 print "Exception in a gtkAsyncMethod:"
                 traceback.print_exc()
-            gtk.threads_leave()
+            gtk.gdk.threads_leave()
             return 1
 
 queue = MainloopQueue()
diff -Naur democracy_old/frontend_implementation/UIBackendDelegate.py democracy/frontend_implementation/UIBackendDelegate.py
--- democracy_old/frontend_implementation/UIBackendDelegate.py	2007-03-29 04:07:42.000000000 +0100
+++ democracy/frontend_implementation/UIBackendDelegate.py	2007-03-29 04:05:49.000000000 +0100
@@ -502,4 +502,4 @@
         # run the Democracy_Downloader script
         script = os.path.join(dlDaemonPath,  'Democracy_Downloader.py')
 
-        os.spawnlpe(os.P_NOWAIT, "python2.4", "python2.4", script, environ)
+        os.spawnlpe(os.P_NOWAIT, "python2.5", "python2.5", script, environ)
diff -Naur democracy_old/onetime.py democracy/onetime.py
--- democracy_old/onetime.py	2007-03-29 04:07:42.000000000 +0100
+++ democracy/onetime.py	2007-03-29 04:09:06.000000000 +0100
@@ -50,7 +50,8 @@
             bus = dbus.Bus()
 
         # otherwise register the name
-        retval = dbus.dbus_bindings.bus_request_name(bus.get_connection(), name, flags=flags)
+        conn = bus.get_connection()
+        retval = dbus.dbus_bindings.bus_request_name(conn, name, flags)
 
         # TODO: more intelligent tracking of bus name states?
         if retval == dbus.dbus_bindings.REQUEST_NAME_REPLY_PRIMARY_OWNER:
@@ -73,6 +74,7 @@
         bus_name = object.__new__(cls)
         bus_name._bus = bus
         bus_name._name = name
+        bus_name._conn = conn 
 
         return bus_name
 
@@ -94,6 +96,10 @@
     def get_name(self):
         """Get the name of this service"""
         return self._name
+    
+    def get_connection(self): 
+        """Get the connection for this service""" 
+        return self._conn 
 
     def __repr__(self):
         return '<dbus.service.BusName %s on %r at %#x>' % (self._name, self._bus, id(self))
diff -Naur democracy_old/timetemplates.py democracy/timetemplates.py
--- democracy_old/timetemplates.py	2007-03-29 04:07:42.000000000 +0100
+++ democracy/timetemplates.py	2007-03-29 04:06:00.000000000 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2.4
+#!/usr/bin/env python2.5
 import os
 import sys