=== modified file 'Docky.DBus/Docky.DBus/DBusManager.cs'
--- Docky.DBus/Docky.DBus/DBusManager.cs	2010-10-15 15:32:36 +0000
+++ Docky.DBus/Docky.DBus/DBusManager.cs	2010-10-21 09:22:37 +0000
@@ -169,8 +169,6 @@
 		
 		public bool Initialize ()
 		{
-			BusG.Init ();
-			
 			Bus bus = Bus.Session;
 			
 			if (!InitializePrivateBus (bus))

=== modified file 'Docky.Services/Docky.Services/SystemService.cs'
--- Docky.Services/Docky.Services/SystemService.cs	2010-10-09 12:54:14 +0000
+++ Docky.Services/Docky.Services/SystemService.cs	2010-10-21 09:22:52 +0000
@@ -77,7 +77,6 @@
 		{
 			NetworkConnected = true;
 			try {
-				BusG.Init ();
 				if (Bus.System.NameHasOwner (NetworkManagerName)) {
 					network = Bus.System.GetObject<INetworkManager> (NetworkManagerName, new ObjectPath (NetworkManagerPath));
 					network.StateChanged += OnConnectionStatusChanged;
@@ -257,7 +256,6 @@
 			// we assume we're not on battery.
 			on_battery = false;
 			try {
-				BusG.Init ();
 				if (Bus.System.NameHasOwner (UPowerName)) {
 					upower = Bus.System.GetObject<IUPower> (UPowerName, new ObjectPath (UPowerPath));
 					upower.Changed += HandleUPowerChanged;

=== modified file 'Docky/Docky.csproj'
--- Docky/Docky.csproj	2010-09-15 06:09:30 +0000
+++ Docky/Docky.csproj	2010-10-21 09:26:57 +0000
@@ -129,6 +129,12 @@
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib" />
     <Reference Include="System.Xml" />
+    <Reference Include="dbus-sharp-glib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5675b0c3093115b5">
+      <Package>dbus-sharp-glib-1.0</Package>
+    </Reference>
+    <Reference Include="dbus-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5675b0c3093115b5">
+      <Package>dbus-sharp-1.0</Package>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Docky.Services\Docky.Services.csproj">

=== modified file 'Docky/Docky/Docky.cs'
--- Docky/Docky/Docky.cs	2010-08-02 01:40:22 +0000
+++ Docky/Docky/Docky.cs	2010-10-21 09:24:08 +0000
@@ -21,6 +21,7 @@
 
 using Gtk;
 
+using DBus;
 using Docky.DBus;
 using Docky.Services;
 
@@ -54,6 +55,7 @@
 			Gdk.Threads.Init ();
 			Gtk.Application.Init ("Docky", ref args);
 			GLib.GType.Init ();
+			BusG.Init ();
 			
 			// process the command line args
 			if (!UserArgs.Parse (args))

=== modified file 'Docky/Makefile.am'
--- Docky/Makefile.am	2010-09-14 13:08:07 +0000
+++ Docky/Makefile.am	2010-10-21 09:28:17 +0000
@@ -74,7 +74,9 @@
 	$(LIBRSVG_SHARP_LIBS) \
 	$(MONO_ADDINS_LIBS) \
 	$(MONO_ADDINS_GUI_LIBS) \
-	$(MONO_ADDINS_SETUP_LIBS)
+	$(MONO_ADDINS_SETUP_LIBS) \
+	$(DBUS_SHARP_10_LIBS) \
+	$(DBUS_SHARP_GLIB_10_LIBS)
 
 #
 # Extra rules for our binary, not worth factoring out