[tomboy] Remove panel applet in tree code

[Javier Jardón <jjardon src gnome org>]

commit dcbbcbb6acade19853d190b7edf736c5a27d9fb8
Author: Javier Jardón <jjardon gnome org>
Date:   Fri Jun 18 07:41:26 2010 +0200

    Remove panel applet in tree code
    
    Use always the gnome-sharp system version.
    Bump gnome-sharp required version to 2.24.

 Tomboy/Applet.cs                                   |    4 -
 Tomboy/Makefile.am                                 |   11 -
 Tomboy/Tomboy.cs                                   |    4 +-
 Tomboy/panelapplet/BonoboUIVerb.cs                 |   28 --
 Tomboy/panelapplet/ChangeBackgroundHandler.cs      |   30 --
 Tomboy/panelapplet/ChangeSizeHandler.cs            |   18 -
 .../GnomeSharp.PanelAppletFactoryCallbackNative.cs |   42 --
 Tomboy/panelapplet/MoveFocusOutOfAppletHandler.cs  |   18 -
 Tomboy/panelapplet/ObjectManager.cs                |   19 -
 Tomboy/panelapplet/PanelApplet.cs                  |  470 --------------------
 Tomboy/panelapplet/PanelAppletBackgroundType.cs    |   17 -
 Tomboy/panelapplet/PanelAppletFactory.cs           |   60 ---
 Tomboy/panelapplet/PanelAppletFactoryCallback.cs   |   10 -
 Tomboy/panelapplet/PanelAppletFlags.cs             |   19 -
 configure.in                                       |   28 +-
 15 files changed, 7 insertions(+), 771 deletions(-)
---
diff --git a/Tomboy/Applet.cs b/Tomboy/Applet.cs
index 0ff3d35..6905f9d 100644
--- a/Tomboy/Applet.cs
+++ b/Tomboy/Applet.cs
@@ -6,11 +6,7 @@ using System.Reflection;
 using System.Runtime.InteropServices;
 using Mono.Unix;
 
-#if FIXED_PANELAPPLET
 using Gnome;
-#else
-using _Gnome;
-#endif
 
 namespace Tomboy
 {
diff --git a/Tomboy/Makefile.am b/Tomboy/Makefile.am
index ae95e23..faa4249 100644
--- a/Tomboy/Makefile.am
+++ b/Tomboy/Makefile.am
@@ -49,20 +49,10 @@ GNOME_CSFILES =					\
 	$(srcdir)/XKeybinder.cs			\
 	$(srcdir)/gtk-sharp-beans/*.cs
 
-PANELAPPLET_CSFILES =			\
-	$(srcdir)/panelapplet/*.cs
-
 if ENABLE_GNOME
 DBUS_CSFLAGS = -define:ENABLE_DBUS
 DBUS_USED_CSFILES = $(DBUS_CSFILES)
 GNOME_USED_CSFILES = $(GNOME_CSFILES)
-
-if FIXED_PANELAPPLET
-FIXED_PANELAPPLET_CSFLAGS = -define:FIXED_PANELAPPLET
-else
-PANELAPPLET_USED_CSFILES =			\
-	$(PANELAPPLET_CSFILES)
-endif
 endif
 
 if FIXED_GTKSPELL
@@ -82,7 +72,6 @@ CSFLAGS = 				\
 	$(DBUS_CSFLAGS) 		\
 	$(OSX_CSFLAGS) 		\
 	$(WIN_CSFLAGS) 		\
-	$(FIXED_PANELAPPLET_CSFLAGS)	\
 	$(FIXED_GTKSPELL_CSFLAGS) \
 	$(HAS_GTK_2_16_FLAGS) \
 	$(CSC_DEFINES)
diff --git a/Tomboy/Tomboy.cs b/Tomboy/Tomboy.cs
index f2d2146..3028011 100644
--- a/Tomboy/Tomboy.cs
+++ b/Tomboy/Tomboy.cs
@@ -4,10 +4,8 @@ using System.IO;
 using System.Xml;
 using Mono.Unix;
 
-#if FIXED_PANELAPPLET
+#if !WIN32 && !MAC
 using Gnome;
-#elif !WIN32 && !MAC
-using _Gnome;
 #endif
 
 using Tomboy.Sync;
diff --git a/configure.in b/configure.in
index a62401c..54b5c14 100644
--- a/configure.in
+++ b/configure.in
@@ -180,30 +180,14 @@ PKG_CHECK_MODULES(MONO_ADDINS, mono-addins >= 0.3 \
 # Tomboy.exe needs Gtk# Gnome# GConf#
 #
 GTKSHARP2_MINIMUM_VERSION=2.10.1
-GNOMESHARP_MINIMUM_VERSION=2.15
+GNOMESHARP_MINIMUM_VERSION=2.24
 if test "x$ENABLE_GNOME" != "xno"; then
-	if pkg-config --atleast-version=2.23.90 gnome-sharp-2.0; then
-		PKG_CHECK_MODULES(GNOME,
-			          gnome-sharp-2.0
-			          gconf-sharp-2.0
-			          gconf-sharp-peditors-2.0
-			          gnome-panel-sharp-2.24)
-		has_fixed_panelapplet="yes"
-
-	else
-		if pkg-config --atleast-version=2.16.1 gconf-sharp-2.0; then
-			PKG_CHECK_MODULES(GNOME,
-					  gnome-sharp-2.0 > $GNOMESHARP_MINIMUM_VERSION
-					  gconf-sharp-2.0
-					  gconf-sharp-peditors-2.0)
-		else
-			PKG_CHECK_MODULES(GNOME,
-					  gnome-sharp-2.0 > $GNOMESHARP_MINIMUM_VERSION
-					  gconf-sharp-2.0)
-		fi
-	fi
+	PKG_CHECK_MODULES(GNOME,
+		          gnome-sharp-2.0 >= $GNOMESHARP_MINIMUM_VERSION
+		          gconf-sharp-2.0
+		          gconf-sharp-peditors-2.0
+		          gnome-panel-sharp-2.24)
 fi
-AM_CONDITIONAL(FIXED_PANELAPPLET, test "x$has_fixed_panelapplet" = "xyes")
 AC_SUBST(GNOME_LIBS)
 
 PKG_CHECK_MODULES(GTKSHARP,