f-spot r3999 - in trunk: . src

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Tue May 27 21:27:26 2008
New Revision: 3999
URL: http://svn.gnome.org/viewvc/f-spot?rev=3999&view=rev

Log:
workaround for a bug in gtk-sharp 2.10.3 to 2.12.1

Modified:
   trunk/configure.in
   trunk/src/GroupSelector.cs

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue May 27 21:27:26 2008
@@ -111,6 +111,9 @@
 if pkg-config --atleast-version=2.10 gtk-sharp-2.0; then
    CSC_DEFINES="$CSC_DEFINES -d:GTK_2_10"
 fi
+if pkg-config --atleast-version=2.10.3 gtk-sharp-2.0; then
+   CSC_DEFINES="$CSC_DEFINES -d:GTK_2_10_3"
+fi
 if pkg-config --atleast-version=2.11 gtk-sharp-2.0; then
    CSC_DEFINES="$CSC_DEFINES -d:GTK_2_11"
 fi

Modified: trunk/src/GroupSelector.cs
==============================================================================
--- trunk/src/GroupSelector.cs	(original)
+++ trunk/src/GroupSelector.cs	Tue May 27 21:27:26 2008
@@ -923,9 +923,13 @@
 					active.X = min_x;
 					active.Width = max_x - min_x;
 					
-					if (active.Intersect (area, out active)) {
+#if GTK_2_10_3 && !GTK_2_12_2 //workaround for buggy code
+					active.Intersect (area);
+					GdkWindow.DrawRectangle (Style.BaseGC (State), true, active);
+#else
+					if (active.Intersect (area, out active))
 						GdkWindow.DrawRectangle (Style.BaseGC (State), true, active);
-					}
+#endif
 					
 					int i;
 					BoxXHit (area.X, out i);