tasque r88 - in trunk: . src

[bgmerrell svn gnome org]

Author: bgmerrell
Date: Fri Jul 18 05:56:04 2008
New Revision: 88
URL: http://svn.gnome.org/viewvc/tasque?rev=88&view=rev

Log:
* configure.ac, src/PreferencesDialog.cs, src/Makefile.am: Added
check for gtk-2.12+ with #if/#else to conditionally use the GtkTooltip
class (which requires >=2.12) without having bump up our gtk version
requirement just yet.  Fixes Bug #543245.



Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/Makefile.am
   trunk/src/TaskTreeView.cs

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Jul 18 05:56:04 2008
@@ -40,6 +40,8 @@
 PKG_CHECK_MODULES([GNOME_SHARP_20], [gnome-sharp-2.0])
 PKG_CHECK_MODULES([GTK_DOTNET_20], [gtk-dotnet-2.0])
 PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0 >= 2.10.0])
+PKG_CHECK_MODULES([GTK_SHARP_2_12], gtk-sharp-2.0 >= 2.12.0, GTK_2_12="yes", GTK_2_12="no")
+AM_CONDITIONAL(GTK_2_12, test "$GTK_2_12" = "yes")
 PKG_CHECK_MODULES([NDESK_DBUS_10], [ndesk-dbus-1.0])
 PKG_CHECK_MODULES([NDESK_DBUS_GLIB_10], [ndesk-dbus-glib-1.0])
 
@@ -95,6 +97,14 @@
 fi
 AC_SUBST(DBUS_SERVICE_DIR)
 
+
+#CSC_DEFINES=""
+#if pkg-config --atleast-version=2.12 gtk-sharp-2.0; then
+#	CSC_DEFINES="-d:GTK_2_12"
+#fi
+#AC_SUBST(CSC_DEFINES)
+
+
 #
 # Dummy Backend (for debugging)
 #

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Fri Jul 18 05:56:04 2008
@@ -5,11 +5,15 @@
 TARGET = Tasque.exe
 WRAPPER = tasque
 
+if GTK_2_12
+GTK_2_12_CSFLAGS = -define:GTK_2_12
+endif
+
 if ENABLE_DEBUG
-CSFLAGS =  -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
+CSFLAGS =  -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG $(GTK_2_12_CSFLAGS)
 endif
 if ENABLE_RELEASE
-CSFLAGS =  -noconfig -codepage:utf8 -warn:4
+CSFLAGS =  -noconfig -codepage:utf8 -warn:4 $(GTK_2_12_CSFLAGS)
 endif
 
 if ENABLE_NOTIFY_SHARP

Modified: trunk/src/TaskTreeView.cs
==============================================================================
--- trunk/src/TaskTreeView.cs	(original)
+++ trunk/src/TaskTreeView.cs	Fri Jul 18 05:56:04 2008
@@ -38,12 +38,14 @@
 			: base ()
 		{		
 
+			#if GTK_2_12
 			// set up the timing for the tooltips
 			this.Settings.SetLongProperty("gtk-tooltip-browse-mode-timeout", 0, "Tasque:TaskTreeView");
 			this.Settings.SetLongProperty("gtk-tooltip-browse-timeout", 750, "Tasque:TaskTreeView");
 			this.Settings.SetLongProperty("gtk-tooltip-timeout", 750, "Tasque:TaskTreeView");
 
 			ConnectEvents();
+			#endif
 			
 			// TODO: Modify the behavior of the TreeView so that it doesn't show
 			// the highlighted row.  Then, also tie in with the mouse hovering
@@ -289,6 +291,7 @@
 			}
 		}
 
+		#if GTK_2_12
 		private void ConnectEvents()
 		{
 			this.CursorChanged += delegate(object o, EventArgs args) {			
@@ -336,6 +339,7 @@
 			}
 			};
 		}
+		#endif
 
 		void TaskPriorityCellDataFunc (Gtk.TreeViewColumn tree_column,
 									   Gtk.CellRenderer cell,