[maemo-commits] [maemo-commits] r9473 - in projects/haf/branches/hildon-libs/hildon-1: . pkgconfig src

[From: subversion at stage.maemo.org]

Author: mdk
Date: 2007-01-31 11:14:26 +0200 (Wed, 31 Jan 2007)
New Revision: 9473

Modified:
   projects/haf/branches/hildon-libs/hildon-1/ChangeLog.2
   projects/haf/branches/hildon-libs/hildon-1/configure.ac
   projects/haf/branches/hildon-libs/hildon-1/pkgconfig/hildon.pc.in
   projects/haf/branches/hildon-libs/hildon-1/src/hildon-seekbar.c
Log:
Xan's fixes for new gtk compilation.


Modified: projects/haf/branches/hildon-libs/hildon-1/ChangeLog.2
===================================================================
--- projects/haf/branches/hildon-libs/hildon-1/ChangeLog.2	2007-01-31 08:57:13 UTC (rev 9472)
+++ projects/haf/branches/hildon-libs/hildon-1/ChangeLog.2	2007-01-31 09:14:26 UTC (rev 9473)
@@ -1,3 +1,9 @@
+2007-01-31  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
+
+	* configure.ac:
+	* pkgconfig/hildon.pc.in:
+	* src/hildon-seekbar.c: Xan's fixes for new gtk compilation.
+
 2007-01-29  Michael Dominic Kostrzewa  <michael.kostrzewa at nokia.com> 
 
 	* ./: More documentation fixes. 

Modified: projects/haf/branches/hildon-libs/hildon-1/configure.ac
===================================================================
--- projects/haf/branches/hildon-libs/hildon-1/configure.ac	2007-01-31 08:57:13 UTC (rev 9472)
+++ projects/haf/branches/hildon-libs/hildon-1/configure.ac	2007-01-31 09:14:26 UTC (rev 9473)
@@ -106,6 +106,12 @@
 PKG_CHECK_MODULES(CHECK, check , [BUILD_TESTS="yes"], [BUILD_TESTS="no"])
 AM_CONDITIONAL(BUILD_TESTS, test "x$BUILD_TESTS" = "xyes")
 
+CFLAGS="$CFLAGS ${ASSERT_CFLAGS} -Wall -Wmissing-prototypes -Wmissing-declarations -Werror -Wno-format"
+# -Wno-format due to way translation string are done
+
+### enable MAEMO platform extensions
+CFLAGS="$CFLAGS -DMAEMO_CHANGES"
+
 # HILDON_OBJ_*
 # default vars for the examples
 # includes all the low-level flags
@@ -115,9 +121,6 @@
 AC_SUBST(HILDON_OBJ_CFLAGS)
 AC_SUBST(HILDON_OBJ_LIBS)
 
-CFLAGS="$CFLAGS ${ASSERT_CFLAGS} -Wall -Wmissing-prototypes -Wmissing-declarations -Werror -Wno-format"
-# -Wno-format due to way translation string are done
-
 AC_CONFIG_FILES([Makefile src/Makefile  \
                  pkgconfig/Makefile     \
                  examples/Makefile      \

Modified: projects/haf/branches/hildon-libs/hildon-1/pkgconfig/hildon.pc.in
===================================================================
--- projects/haf/branches/hildon-libs/hildon-1/pkgconfig/hildon.pc.in	2007-01-31 08:57:13 UTC (rev 9472)
+++ projects/haf/branches/hildon-libs/hildon-1/pkgconfig/hildon.pc.in	2007-01-31 09:14:26 UTC (rev 9473)
@@ -8,4 +8,4 @@
 Requires: gtk+-2.0 >= @GTK_VERSION@
 Version: @VERSION@
 Libs: -L${libdir} -lhildon_ at PACKAGE_VERSION_MAJOR@
-Cflags: -I${includedir}
+Cflags: -I${includedir} -DMAEMO_CHANGES

Modified: projects/haf/branches/hildon-libs/hildon-1/src/hildon-seekbar.c
===================================================================
--- projects/haf/branches/hildon-libs/hildon-1/src/hildon-seekbar.c	2007-01-31 08:57:13 UTC (rev 9472)
+++ projects/haf/branches/hildon-libs/hildon-1/src/hildon-seekbar.c	2007-01-31 09:14:26 UTC (rev 9473)
@@ -423,7 +423,7 @@
 {
     g_return_val_if_fail (HILDON_IS_SEEKBAR (seekbar), 0);
 
-    return osso_gtk_range_get_stream_position (GTK_RANGE(seekbar));
+    return gtk_range_get_fill_level (GTK_RANGE (seekbar));
 }
 
 /**
@@ -447,13 +447,13 @@
             fraction >= range->adjustment->lower);
 
     /* Set to show stream indicator. */
-    g_object_set (G_OBJECT (seekbar), "stream_indicator", TRUE, NULL);
+    g_object_set (G_OBJECT (seekbar), "show-fill-level", TRUE, NULL);
 
     fraction = CLAMP (fraction, range->adjustment->lower,
             range->adjustment->upper);
 
     /* Update stream position of range widget */
-    osso_gtk_range_set_stream_position (range, fraction);
+    gtk_range_set_fill_level (range, fraction);
 
     if (fraction < hildon_seekbar_get_position(seekbar))
         hildon_seekbar_set_position(seekbar, fraction);
@@ -504,7 +504,7 @@
     value = floor (adj->value);
     if (time != value) {
         value = (time < adj->upper) ? time : adj->upper;
-        if (value <= osso_gtk_range_get_stream_position (range)) {
+        if (value <= gtk_range_get_fill_level (range)) {
             adj->value = value;
             gtk_adjustment_value_changed (adj);