[f-spot] Switch to dbus-sharp and drop ndesk dbus

[Stephen Shaw <sshaw src gnome org>]

commit b5135872aec0bc1928817e284b3dbf9c35499e66
Author: Stephen Shaw <sshaw decriptor com>
Date:   Fri Sep 16 17:17:45 2011 -0600

    Switch to dbus-sharp and drop ndesk dbus

 build/build.environment.mk                         |    4 ++--
 build/m4/f-spot/dbus.m4                            |    9 +++++++++
 configure.ac                                       |    5 +----
 src/Core/FSpot.Platform/FSpot.Platform.csproj      |    5 ++---
 .../FSpot.Platform/FSpot.Platform/ScreenSaver.cs   |    2 +-
 5 files changed, 15 insertions(+), 10 deletions(-)
---
diff --git a/build/build.environment.mk b/build/build.environment.mk
index e9ef74a..32d49c5 100644
--- a/build/build.environment.mk
+++ b/build/build.environment.mk
@@ -36,8 +36,8 @@ LINK_GTK = $(GTKSHARP_LIBS)
 LINK_GNOME = $(GNOME_SHARP_LIBS)
 LINK_GCONF = $(GCONF_SHARP_LIBS)
 LINK_FLICKRNET = -pkg:flickrnet
-LINK_DBUS = $(NDESK_DBUS_LIBS) $(NDESK_DBUS_GLIB_LIBS)
-LINK_DBUS_NO_GLIB = $(NDESK_DBUS_LIBS)
+LINK_DBUS = $(DBUS_SHARP_LIBS) $(DBUS_SHARP_GLIB_LIBS)
+LINK_DBUS_NO_GLIB = $(DBUS_SHARP_LIBS)
 LINK_MONO_ADDINS_DEPS = $(MONO_ADDINS_LIBS)
 LINK_MONO_ADDINS_SETUP_DEPS = $(MONO_ADDINS_SETUP_LIBS)
 LINK_MONO_ADDINS_GUI_DEPS = $(MONO_ADDINS_GUI_LIBS)
diff --git a/build/m4/f-spot/dbus.m4 b/build/m4/f-spot/dbus.m4
new file mode 100644
index 0000000..c495d55
--- /dev/null
+++ b/build/m4/f-spot/dbus.m4
@@ -0,0 +1,9 @@
+AC_DEFUN([FSPOT_CHECK_DBUS_SHARP],
+[
+        PKG_CHECK_MODULES(DBUS_SHARP_GLIB, dbus-sharp-glib-1.0 >= 0.5)
+        AC_SUBST(DBUS_SHARP_GLIB_LIBS)
+
+        PKG_CHECK_MODULES(DBUS_SHARP, dbus-sharp-1.0 >= 0.7)
+        AC_SUBST(DBUS_SHARP_LIBS)
+])
+
diff --git a/configure.ac b/configure.ac
index e4086a6..4f5a9c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -133,8 +133,6 @@ GIO_REQUIRED=2.22.0
 GTKSHARPBEANS_REQUIRED=2.13.92
 GTKSHARP_REQUIRED=2.12.2
 GTK_REQUIRED=2.14
-NDESK_DBUS_REQUIRED=0.4.2
-NDESK_DBUS_GLIB_REQUIRED=0.3.0
 MONO_CAIRO_REQUIRED=1.2.5
 CAIRO_REQUIRED=1.4.0
 LCMS_REQUIRED=1.12
@@ -178,8 +176,7 @@ dnl Mono.Addins libraries
 FSPOT_CHECK_MONO_ADDINS
 
 dnl -- dbus-sharp
-PKG_CHECK_MODULES(NDESK_DBUS, ndesk-dbus-1.0 >= $NDESK_DBUS_REQUIRED ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQUIRED)
-AC_SUBST(NDESK_DBUS_LIBS)
+FSPOT_CHECK_DBUS_SHARP
 
 dnl --- libjpeg
 
diff --git a/src/Core/FSpot.Platform/FSpot.Platform.csproj b/src/Core/FSpot.Platform/FSpot.Platform.csproj
index 548ef5b..85c7785 100644
--- a/src/Core/FSpot.Platform/FSpot.Platform.csproj
+++ b/src/Core/FSpot.Platform/FSpot.Platform.csproj
@@ -9,7 +9,6 @@
     <OutputType>Library</OutputType>
     <RootNamespace>FSpot.Platform</RootNamespace>
     <AssemblyName>FSpot.Platform</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <ReleaseVersion>0.7.2</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -54,9 +53,9 @@
   </ProjectExtensions>
   <ItemGroup>
     <Reference Include="gconf-sharp, Version=2.24.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <Reference Include="NDesk.DBus, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099" />
-    <Reference Include="NDesk.DBus.GLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099" />
     <Reference Include="System" />
+    <Reference Include="dbus-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5675b0c3093115b5" />
+    <Reference Include="dbus-sharp-glib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5675b0c3093115b5" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\lib\Hyena\Hyena\Hyena.csproj">
diff --git a/src/Core/FSpot.Platform/FSpot.Platform/ScreenSaver.cs b/src/Core/FSpot.Platform/FSpot.Platform/ScreenSaver.cs
index 12335dd..166c18a 100644
--- a/src/Core/FSpot.Platform/FSpot.Platform/ScreenSaver.cs
+++ b/src/Core/FSpot.Platform/FSpot.Platform/ScreenSaver.cs
@@ -30,7 +30,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-using NDesk.DBus;
+using DBus;
 
 using Hyena;