[maemo-commits] [maemo-commits] r14409 - in projects/haf/trunk/hildon-help: . debian src

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2007-10-10 18:27:41 +0300 (Wed, 10 Oct 2007)
New Revision: 14409

Modified:
   projects/haf/trunk/hildon-help/ChangeLog
   projects/haf/trunk/hildon-help/configure.ac
   projects/haf/trunk/hildon-help/debian/changelog
   projects/haf/trunk/hildon-help/src/hildon-help-private.h
Log:
  * Trivial: try help-contents-common icons before Hildon theme icons
  * Fixes: NB#69791, NB#67114


Modified: projects/haf/trunk/hildon-help/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-help/ChangeLog	2007-10-10 13:44:49 UTC (rev 14408)
+++ projects/haf/trunk/hildon-help/ChangeLog	2007-10-10 15:27:41 UTC (rev 14409)
@@ -1,3 +1,9 @@
+2007-10-10 Gabriel Schulhof <gabriel.schulhof at nokia.com>
+
+	* Version 1.9.6
+	* Trivial: try help-contents-common icons before Hildon theme icons
+	* Fixes: NB#69791, NB#67114
+
 2007-07-25 Gabriel Schulhof <gabriel.schulhof at nokia.com>
 
 	* Version 1.9.5

Modified: projects/haf/trunk/hildon-help/configure.ac
===================================================================
--- projects/haf/trunk/hildon-help/configure.ac	2007-10-10 13:44:49 UTC (rev 14408)
+++ projects/haf/trunk/hildon-help/configure.ac	2007-10-10 15:27:41 UTC (rev 14409)
@@ -7,7 +7,7 @@
 
 # Mandatory, initializes autoconf.
 #
-AC_INIT(libhildonhelp, 1.9.5)
+AC_INIT(libhildonhelp, 1.9.6)
 
 # Tests that source dir exists
 AC_CONFIG_SRCDIR(src/hildon-help.h)

Modified: projects/haf/trunk/hildon-help/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-help/debian/changelog	2007-10-10 13:44:49 UTC (rev 14408)
+++ projects/haf/trunk/hildon-help/debian/changelog	2007-10-10 15:27:41 UTC (rev 14409)
@@ -1,3 +1,10 @@
+libhildonhelp (1.9.6-1) unstable; urgency=low
+
+  * Trivial: try help-contents-common icons before Hildon theme icons
+  * Fixes: NB#69791, NB#67114
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Wed, 10 Oct 2007 18:13:14 +0300
+
 libhildonhelp (1.9.5-1) unstable; urgency=low
 
   * Allow changing the help icon after the dialog is realized

Modified: projects/haf/trunk/hildon-help/src/hildon-help-private.h
===================================================================
--- projects/haf/trunk/hildon-help/src/hildon-help-private.h	2007-10-10 13:44:49 UTC (rev 14408)
+++ projects/haf/trunk/hildon-help/src/hildon-help-private.h	2007-10-10 15:27:41 UTC (rev 14409)
@@ -70,12 +70,12 @@
  * if the 'filename' param is relative (does not start with '/')
  */
 #define HELPLIB_PICTURE_PATHS   \
+    "/usr/share/osso-help/graphics/%s.png", \
     "/usr/share/icons/hicolor/40x40/hildon/%s.png", \
     "/usr/share/icons/hicolor/34x34/hildon/%s.png", \
     "/usr/share/icons/hicolor/50x50/hildon/%s.png", \
     "/usr/share/icons/hicolor/scalable/hildon/%s.png", \
     "/usr/share/icons/hicolor/26x26/hildon/%s.png", \
-    "/usr/share/osso-help/graphics/%s.png", \
     "/usr/share/icons/hicolor/26x26/osso/%s.png", \
     "/usr/share/icons/hicolor/scalable/osso/%s.png", \
     "/usr/share/icons/hicolor/40x40/osso/%s.png", \