tomboy r2090 - in trunk: . Tomboy Tomboy/panelapplet

[sharm svn gnome org]

Author: sharm
Date: Thu Aug 21 17:37:32 2008
New Revision: 2090
URL: http://svn.gnome.org/viewvc/tomboy?rev=2090&view=rev

Log:
* configure.in: Set minimum gnome-sharp version to 2.15 to account for
  panel applet fixes.  Handle gnome-panel-sharp being split out of
  gnome-sharp in 2.23.90.
* Tomboy/Applet.cs, Tomboy/Tomboy.cs: Stop using internal copy of panel
  applet code.  This has been fixed upstream for some time as far as
  I can tell.
* Tomboy/panelapplet, Tomboy/panelapplet/BonoboUIVerb.cs,
  Tomboy/panelapplet/PanelAppletFactory.cs,
  Tomboy/panelapplet/ChangeSizeHandler.cs,
  Tomboy/panelapplet/ObjectManager.cs,
  Tomboy/panelapplet/PanelAppletFlags.cs,
  Tomboy/panelapplet/ChangeBackgroundHandler.cs,
  Tomboy/panelapplet/GnomeSharp.PanelAppletFactoryCallbackNative.cs,
  Tomboy/panelapplet/PanelApplet.cs,
  Tomboy/panelapplet/MoveFocusOutOfAppletHandler.cs,
  Tomboy/panelapplet/PanelAppletBackgroundType.cs,
  Tomboy/panelapplet/PanelAppletFactoryCallback.cs,
  Tomboy/Makefile.am: Delete internal copy of panel applet code.

Removed:
   trunk/Tomboy/panelapplet/
Modified:
   trunk/ChangeLog
   trunk/Tomboy/Applet.cs
   trunk/Tomboy/Makefile.am
   trunk/Tomboy/Tomboy.cs
   trunk/configure.in

Modified: trunk/Tomboy/Applet.cs
==============================================================================
--- trunk/Tomboy/Applet.cs	(original)
+++ trunk/Tomboy/Applet.cs	Thu Aug 21 17:37:32 2008
@@ -5,10 +5,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 using Mono.Unix;
-
-// Work around bug in Gtk# panel applet bindings by using a local copy with
-// fixed OnBackgroundChanged marshalling.
-using _Gnome;
+using Gnome;
 
 namespace Tomboy
 {

Modified: trunk/Tomboy/Makefile.am
==============================================================================
--- trunk/Tomboy/Makefile.am	(original)
+++ trunk/Tomboy/Makefile.am	Thu Aug 21 17:37:32 2008
@@ -63,7 +63,6 @@
 	$(srcdir)/Notebooks/*.cs		\
 	$(srcdir)/Synchronization/*.cs		\
 	\
-	$(srcdir)/panelapplet/*.cs		\
 	$(srcdir)/Gnome.Keyring/*.cs		\
 	\
 	$(DBUS_CSFILES)	

Modified: trunk/Tomboy/Tomboy.cs
==============================================================================
--- trunk/Tomboy/Tomboy.cs	(original)
+++ trunk/Tomboy/Tomboy.cs	Thu Aug 21 17:37:32 2008
@@ -105,8 +105,7 @@
 		static void RegisterPanelAppletFactory ()
 		{
 			// This will block if there is no existing instance running
-			// FIXME: Use custom built panel applet bindings to work around bug in GTK#
-			_Gnome.PanelAppletFactory.Register (typeof (TomboyApplet));
+			Gnome.PanelAppletFactory.Register (typeof (TomboyApplet));
 		}
 
 		static void StartTrayIcon ()

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Aug 21 17:37:32 2008
@@ -136,17 +136,27 @@
 # Tomboy.exe needs Gtk# Gnome# GConf#
 #
 GTKSHARP2_MINIMUM_VERSION=$GTK20_MINIMUM_VERSION
-if pkg-config --atleast-version=2.16.1 gconf-sharp-2.0; then
+GNOMESHARP_MINIMUM_VERSION=2.15
+if pkg-config --atleast-version=2.23.90 gnome-sharp-2.0; then
 	PKG_CHECK_MODULES(TOMBOY,
 	                  gtk-sharp-2.0 >= $GTKSHARP2_MINIMUM_VERSION
 	                  gnome-sharp-2.0
 	                  gconf-sharp-2.0
-	                  gconf-sharp-peditors-2.0)
+	                  gconf-sharp-peditors-2.0
+	                  gnome-panel-sharp-2.24)
 else
-	PKG_CHECK_MODULES(TOMBOY,
-	                  gtk-sharp-2.0 >= $GTKSHARP2_MINIMUM_VERSION
-	                  gnome-sharp-2.0
-	                  gconf-sharp-2.0)
+	if pkg-config --atleast-version=2.16.1 gconf-sharp-2.0; then
+		PKG_CHECK_MODULES(TOMBOY,
+			          gtk-sharp-2.0 >= $GTKSHARP2_MINIMUM_VERSION
+			          gnome-sharp-2.0 > $GNOMESHARP_MINIMUM_VERSION
+			          gconf-sharp-2.0
+			          gconf-sharp-peditors-2.0)
+	else
+		PKG_CHECK_MODULES(TOMBOY,
+			          gtk-sharp-2.0 >= $GTKSHARP2_MINIMUM_VERSION
+			          gnome-sharp-2.0 > $GNOMESHARP_MINIMUM_VERSION
+			          gconf-sharp-2.0)
+	fi
 fi
 AC_SUBST(TOMBOY_LIBS)