* 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
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)
#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*/
g_return_if_fail (osso_context);
/* Show help */
+#ifdef MODEST_HILDON_VERSION_0
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;