f-spot r3782 - in branches/FSPOT_0_4_2_STABLE: . src

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Tue Mar 25 07:42:46 2008
New Revision: 3782
URL: http://svn.gnome.org/viewvc/f-spot?rev=3782&view=rev

Log:
backporting -r3781 to the stable branch

Modified:
   branches/FSPOT_0_4_2_STABLE/ChangeLog
   branches/FSPOT_0_4_2_STABLE/configure.in
   branches/FSPOT_0_4_2_STABLE/src/InfoDisplay.cs

Modified: branches/FSPOT_0_4_2_STABLE/configure.in
==============================================================================
--- branches/FSPOT_0_4_2_STABLE/configure.in	(original)
+++ branches/FSPOT_0_4_2_STABLE/configure.in	Tue Mar 25 07:42:46 2008
@@ -73,22 +73,23 @@
 AC_SUBST(F_CFLAGS)
 AC_SUBST(F_LIBS)
 
+CSC_DEFINES=""
 PKG_CHECK_MODULES(GNOME_SHARP, gnome-sharp-2.0 >= 2.8)
 if pkg-config --atleast-version=2.19.90 gnome-sharp; then
 	PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-3.14 >= 2.19.90)
-	GTKHTML_SHARP_PKG="-pkg:gtkhtml-sharp-3.14"
+ 	GTKHTML_SHARP_PKG="-pkg:gtkhtml-sharp-3.14 -pkg:gnome-sharp-2.0"
+ 	CSC_DEFINES="$CSC_DEFINES -d:GTKHTML_3_14"
 else
 	PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-2.0 >= 2.8)
 	GTKHTML_SHARP_PKG="-pkg:gtkhtml-sharp-2.0"
 fi
 AC_SUBST(GTKHTML_SHARP_PKG)
 
-CSC_DEFINES=""
 if pkg-config --atleast-version=2.10 gtk-sharp-2.0; then
-   CSC_DEFINES="-d:GTK_2_10"
+   CSC_DEFINES="$CSC_DEFINES -d:GTK_2_10"
 fi
 if pkg-config --atleast-version=2.11 gtk-sharp-2.0; then
-   CSC_DEFINES="-d:GTK_2_11"
+   CSC_DEFINES="$CSC_DEFINES -d:GTK_2_11"
 fi
 
 dnl - Choose PreferenceBackend (default to gconf)

Modified: branches/FSPOT_0_4_2_STABLE/src/InfoDisplay.cs
==============================================================================
--- branches/FSPOT_0_4_2_STABLE/src/InfoDisplay.cs	(original)
+++ branches/FSPOT_0_4_2_STABLE/src/InfoDisplay.cs	Tue Mar 25 07:42:46 2008
@@ -148,7 +148,11 @@
 
 		private void Update ()
 		{
+#if GTKHTML_3_14
+			Gtk.HTMLStream stream = this.Begin (null, "text/html; charset=utf-8", Gtk.HTMLBeginFlags.KeepScroll);
+#else
 			Gtk.HTMLStream stream = this.Begin (null, "text/html; charset=utf-8", Gtk.HTMLBeginFlags.Scroll);
+#endif
 			
 			string bg = Color (this.Style.Background (Gtk.StateType.Active));
 			string fg = Color (this.Style.Foreground (Gtk.StateType.Active));