* make the startup banner / dbus invocation work. this fixes NB#55355

[modest] / src / maemo / modest-platform.c

diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c
index 42d5e2a..ee77522 100644 (file)
--- a/src/maemo/modest-platform.c
+++ b/src/maemo/modest-platform.c
@@ -46,13 +46,16 @@
 #include <gtk/gtkmenuitem.h>
 #include <gtk/gtkmain.h>
 #include <string.h>
+
+static osso_context_t *osso_context = NULL;
        
 gboolean
 modest_platform_init (void)
-{      
-       osso_context_t *osso_context =
-               osso_initialize(PACKAGE, PACKAGE_VERSION,
-                               TRUE, NULL);    
+{
+       osso_hw_state_t hw_state = { 0 };       
+       osso_context =
+               osso_initialize(PACKAGE,PACKAGE_VERSION,
+                               FALSE, NULL);   
        if (!osso_context) {
                g_printerr ("modest: failed to acquire osso context\n");
                return FALSE;
@@ -81,7 +84,8 @@ modest_platform_init (void)
        */
 
        /* Register hardware event dbus callback: */
-    osso_hw_set_event_cb(osso_context, NULL, modest_osso_cb_hw_state_handler, NULL);
+       hw_state.shutdown_ind = TRUE;
+       osso_hw_set_event_cb(osso_context, NULL,/*&hw_state*/ modest_osso_cb_hw_state_handler, NULL);
 
        /* Register osso auto-save callbacks: */
        result = osso_application_set_autosave_cb (osso_context, 
@@ -193,6 +197,32 @@ modest_platform_activate_uri (const gchar *uri)
        return result;
 }
 
+gboolean 
+modest_platform_activate_file (const gchar *path)
+{
+       gint result;
+       DBusConnection *con;
+       gchar *uri_path = NULL;
+
+       uri_path = g_strconcat ("file://", path, NULL);
+       
+       con = osso_get_dbus_connection (osso_context);
+#ifdef MODEST_HILDON_VERSION_0
+       result = osso_mime_open_file (con, uri_path);
+
+       if (result != 1)
+               hildon_banner_show_information (NULL, NULL, _("mcen_ni_noregistered_viewer"));
+       return result != 1;
+#else
+       result = hildon_mime_open_file (con, uri_path);
+
+       if (result != 1)
+               hildon_banner_show_information (NULL, NULL, _("mcen_ni_noregistered_viewer"));
+       return result != 1;
+#endif
+
+}
+
 typedef struct  {
        GSList * actions;
        gchar *uri;