* configure.ac:

        * Added dependecy on hildon-help for hildon-1
* src/maemo/modest-hildon-includes.h:
        * Now it includes hildon-help for hildon-1 platform.
* src/maemo/modest-platform.c:
        * Now it uses hildon-help instead of osso help in hildon-1
          platform.

pmo-trunk-r2060

diff --git a/configure.ac b/configure.ac
index 292d7b5..60342f9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -92,7 +92,7 @@ if test "x$with_platform" = "xmaemo"; then
    
    PKG_CHECK_MODULES(HILDON, hildon-1 >= 0.9.9, hildon1=yes, hildon1=no)       
    if test "$hildon1" == "yes"; then   # the 'new' hildon                              
    
    PKG_CHECK_MODULES(HILDON, hildon-1 >= 0.9.9, hildon1=yes, hildon1=no)       
    if test "$hildon1" == "yes"; then   # the 'new' hildon                              

-      PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO, conic libtinymail-maemo-1.0 hildon-1 libosso libhildonmime osso-addressbook-1.0 wpeditor libossohelp libebook-1.2 libalarm)          
+      PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO, conic libtinymail-maemo-1.0 hildon-1 libosso libhildonmime osso-addressbook-1.0 libwpeditor-plus hildon-help libebook-1.2 libalarm)          

    
     else     # the old hildon
      PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO, conic libtinymail-maemo-1.0 hildon-libs >= 0.12.0 libosso libossomime libossohelp osso-addressbook-1.0 libwpeditor-plus libebook-1.2 libalarm gnome-vfs-module-2.0)            
    
     else     # the old hildon
      PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO, conic libtinymail-maemo-1.0 hildon-libs >= 0.12.0 libosso libossomime libossohelp osso-addressbook-1.0 libwpeditor-plus libebook-1.2 libalarm gnome-vfs-module-2.0)            

diff --git a/src/maemo/modest-hildon-includes.h b/src/maemo/modest-hildon-includes.h
index e5df459..2fa2851 100644 (file)
--- a/src/maemo/modest-hildon-includes.h
+++ b/src/maemo/modest-hildon-includes.h
@@ -60,6 +60,7 @@ k * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
 #include <hildon/hildon-find-toolbar.h>
 #include <hildon/hildon-sort-dialog.h>
 #include <hildon/hildon-number-editor.h>
 #include <hildon/hildon-find-toolbar.h>
 #include <hildon/hildon-sort-dialog.h>
 #include <hildon/hildon-number-editor.h>

+#include <hildon/hildon-help.h>

 #endif /* MODEST_HILDON_VERSION_0*/
 
 
 #endif /* MODEST_HILDON_VERSION_0*/
 
 

diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c
index 54798d6..a00f2f0 100644 (file)
--- a/src/maemo/modest-platform.c
+++ b/src/maemo/modest-platform.c
@@ -803,7 +803,11 @@ modest_platform_show_help (GtkWindow *parent_window,
        g_return_if_fail (osso_context);
 
        /* Show help */
        g_return_if_fail (osso_context);
 
        /* Show help */

+#ifdef MODEST_HILDON_VERSION_0

        result = ossohelp_show (osso_context, help_id, OSSO_HELP_SHOW_DIALOG);
        result = ossohelp_show (osso_context, help_id, OSSO_HELP_SHOW_DIALOG);

+#elsif
+       result = hildon_help_show (osso_context, help_id, OSSO_HELP_SHOW_DIALOG);
+#endif

 
        if (result != OSSO_OK) {
                gchar *error_msg;
 
        if (result != OSSO_OK) {
                gchar *error_msg;