Adding Lucas patch to enable settable timeout on the banners and settable icon.

3 files changed, 35 insertions, 30 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index bf08bd8..ba72fd7 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -11,11 +11,13 @@ SCAN_OPTIONS					=
 
 SCANOBJ_OPTIONS					=--type-init-func="gtk_type_init(0)"
 
-DOC_SOURCE_DIR					=../src
+DOC_SOURCE_DIR					= $(top_srcdir)/src
+DOC_BUILD_DIR 					= $(top_builddir)/src
 
-HFILE_GLOB					=$(top_srcdir)/src/*.h
 
-CFILE_GLOB					=$(top_srcdir)/src/*.c
+HFILE_GLOB					= $(top_srcdir)/src/*.h
+
+CFILE_GLOB					= $(top_srcdir)/src/*.c
 
 IGNORE_HFILES 					= hildon-banner-private.h 		\
 						  hildon-calendar-popup-private.h	\
@@ -48,19 +50,23 @@ IGNORE_HFILES 					= hildon-banner-private.h 		\
 
 INCLUDES 					= $(GTK_CFLAGS) -I$(top_srcdir)
 
-GTKDOC_LIBS 					= $(GTK_LIBS) ../src/libhildon_@PACKAGE_VERSION_MAJOR@.la 
-
-MKDB_OPTIONS					=--sgml-mode
+MKDB_OPTIONS					=--sgml-mode --output-format=xml
 
 content_files					= version.xml \
 						  visual_index.xml
 
+GTKDOC_CFLAGS 					= $(HILDON_OBJ_CFLAGS)
+
+GTKDOC_LIBS 					= $(HILDON_OBJ_LIBS)
+
 version.xml: ../configure.ac
 	@echo $(VERSION) > version.xml
 
 html: html-build.stamp
 
-HTML_IMAGES 					= $(srcdir)/images/calendar-popup.png
+HTML_IMAGES 					= $(srcdir)/images/calendar-popup.png	\
+						  $(srcdir)/images/caption.png		\
+						  $(srcdir)/images/code-dialog.png
 
 FIXXREF_OPTIONS					=
 
diff --git a/doc/hildon-docs.sgml b/doc/hildon-docs.sgml
index 33ce196..6c54334 100644
--- a/doc/hildon-docs.sgml
+++ b/doc/hildon-docs.sgml
@@ -12,7 +12,6 @@
   <chapter>
     <title>Object Hierarchy</title>
     <xi:include href="xml/tree_index.sgml"/>
-    <xi:include href="visual_index.xml"/>
   </chapter>
 
   <chapter>
diff --git a/doc/visual_index.xml b/doc/visual_index.xml
index 0d083c1..89fab49 100644
--- a/doc/visual_index.xml
+++ b/doc/visual_index.xml
@@ -1,68 +1,68 @@
 <para role="gallery">
   <link linkend="HildonCalendarPopup">
-          <inlinegraphic fileref="images/calendar-popup.png" format="PNG"></inlinegraphic>
+          <inlinegraphic fileref="html/calendar-popup.png" format="PNG"></inlinegraphic>
   </link> 
   <link linkend="HildonCaption">
-          <inlinegraphic fileref="images/caption.png" format="PNG"></inlinegraphic>
+          <inlinegraphic fileref="html/caption.png" format="PNG"></inlinegraphic>
   </link> 
   <link linkend="HildonCodeDialog">
-          <inlinegraphic fileref="images/code-dialog.png" format="PNG"></inlinegraphic>
+          <inlinegraphic fileref="html/code-dialog.png" format="PNG"></inlinegraphic>
   </link> 
   <link linkend="HildonColorButton">
-          <inlinegraphic fileref="images/color-button.png" format="PNG"></inlinegraphic>
+          <inlinegraphic fileref="html/color-button.png" format="PNG"></inlinegraphic>
   </link> 
   <link linkend="HildonColorChooserDialog">
-          <inlinegraphic fileref="images/color-chooser-dialog.png" format="PNG"></inlinegraphic>
+          <inlinegraphic fileref="html/color-chooser-dialog.png" format="PNG"></inlinegraphic>
   </link> 
   <link linkend="HildonCalorChooser">
-          <inlinegraphic fileref="images/color-chooser.png" format="PNG"></inlinegraphic>
+          <inlinegraphic fileref="html/color-chooser.png" format="PNG"></inlinegraphic>
   </link> 
   <link linkend="HildonCantrolbar">
-          <inlinegraphic fileref="images/controlbar.png" format="PNG"></inlinegraphic>
+          <inlinegraphic fileref="html/controlbar.png" format="PNG"></inlinegraphic>
   </link> 
   <link linkend="HildonDateEditor">
-          <inlinegraphic fileref="images/date-editor.png" format="PNG"></inlinegraphic>
+          <inlinegraphic fileref="html/date-editor.png" format="PNG"></inlinegraphic>
   </link> 
   <link linkend="HildonFontSelectionDialog">
-          <inlinegraphic fileref="images/font-selection-dialog.png" format="PNG"></inlinegraphic>
+          <inlinegraphic fileref="html/font-selection-dialog.png" format="PNG"></inlinegraphic>
   </link> 
   <link linkend="HildonGetPasswordDialog">
-          <inlinegraphic fileref="images/get-password-dialog.png" format="PNG"></inlinegraphic>
+          <inlinegraphic fileref="html/get-password-dialog.png" format="PNG"></inlinegraphic>
   </link> 
   <link linkend="HildonHVolumebar">
-          <inlinegraphic fileref="images/hvolumebar.png" format="PNG"></inlinegraphic>
+          <inlinegraphic fileref="html/hvolumebar.png" format="PNG"></inlinegraphic>
   </link> 
   <link linkend="HildonDialog">
-          <inlinegraphic fileref="images/login-dialog.png" format="PNG"></inlinegraphic>
+          <inlinegraphic fileref="html/login-dialog.png" format="PNG"></inlinegraphic>
   </link> 
   <link linkend="HildonNote">
-          <inlinegraphic fileref="images/note.png" format="PNG"></inlinegraphic>
+          <inlinegraphic fileref="html/note.png" format="PNG"></inlinegraphic>
   </link> 
   <link linkend="HildonNumberEditor">
-          <inlinegraphic fileref="images/number-editor.png" format="PNG"></inlinegraphic>
+          <inlinegraphic fileref="html/number-editor.png" format="PNG"></inlinegraphic>
   </link> 
   <link linkend="HildonRangeEditor">
-          <inlinegraphic fileref="images/range-editor.png" format="PNG"></inlinegraphic>
+          <inlinegraphic fileref="html/range-editor.png" format="PNG"></inlinegraphic>
   </link> 
   <link linkend="HildonSeekbar">
-          <inlinegraphic fileref="images/seekbar.png" format="PNG"></inlinegraphic>
+          <inlinegraphic fileref="html/seekbar.png" format="PNG"></inlinegraphic>
   </link> 
   <link linkend="HildonSetPasswordDialog">
-          <inlinegraphic fileref="images/set-password-dialog.png" format="PNG"></inlinegraphic>
+          <inlinegraphic fileref="html/set-password-dialog.png" format="PNG"></inlinegraphic>
   </link> 
   <link linkend="HildonSortDialog">
-          <inlinegraphic fileref="images/sort-dialog.png" format="PNG"></inlinegraphic>
+          <inlinegraphic fileref="html/sort-dialog.png" format="PNG"></inlinegraphic>
   </link> 
   <link linkend="HildonTimeEditor">
-          <inlinegraphic fileref="images/time-editor.png" format="PNG"></inlinegraphic>
+          <inlinegraphic fileref="html/time-editor.png" format="PNG"></inlinegraphic>
   </link> 
   <link linkend="HildonTimePicker">
-          <inlinegraphic fileref="images/time-picker.png" format="PNG"></inlinegraphic>
+          <inlinegraphic fileref="html/time-picker.png" format="PNG"></inlinegraphic>
   </link> 
   <link linkend="HildonVVolumebar">
-          <inlinegraphic fileref="images/vvolumebar.png" format="PNG"></inlinegraphic>
+          <inlinegraphic fileref="html/vvolumebar.png" format="PNG"></inlinegraphic>
   </link> 
   <link linkend="HildonWeekdayPicker">
-          <inlinegraphic fileref="images/weekday-picker.png" format="PNG"></inlinegraphic>
+          <inlinegraphic fileref="html/weekday-picker.png" format="PNG"></inlinegraphic>
   </link> 
 </para>