On failing to retrieve a message in view and closing, show header window

[modest] / src / dbus_api / modest-dbus-callbacks.c

diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c
index d6be5e6..7a5ecd1 100644 (file)
--- a/src/dbus_api/modest-dbus-callbacks.c
+++ b/src/dbus_api/modest-dbus-callbacks.c
@@ -47,13 +47,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <glib/gstdio.h>
-#ifdef MODEST_HAVE_HILDON0_WIDGETS
-#include <hildon-widgets/hildon-program.h>
-#include <libgnomevfs/gnome-vfs-mime-utils.h>
-#else
 #include <hildon/hildon-program.h>
 #include <libgnomevfs/gnome-vfs-mime.h>
-#endif
 #include <tny-fs-stream.h>
 
 #ifdef MODEST_TOOLKIT_HILDON2
@@ -261,7 +256,7 @@ on_mail_to(GArray * arguments, gpointer data, osso_rpc_t * retval)
        
        /* Note that we cannot report failures during sending, 
         * because that would be asynchronous. */
-       return OSSO_OK;
+       return OSSO_OK;
 }
 
 
@@ -356,7 +351,7 @@ on_compose_mail(GArray * arguments, gpointer data, osso_rpc_t * retval)
        /* Use g_idle to context-switch into the application's thread: */
        g_idle_add(on_idle_compose_mail, (gpointer)idle_data);
        
-       return OSSO_OK;
+       return OSSO_OK;
 }
 
 static TnyMsg *
@@ -919,7 +914,7 @@ on_delete_message (GArray *arguments, gpointer data, osso_rpc_t *retval)
        /* Use g_idle to context-switch into the application's thread: */
        g_idle_add(on_idle_delete_message, (gpointer)uri);
        
-       return OSSO_OK;
+       return OSSO_OK;
 }
 
 typedef struct _SendReceivePerformerData {
@@ -1225,7 +1220,7 @@ on_send_receive(GArray *arguments, gpointer data, osso_rpc_t * retval)
        else
                on_send_receive_performer (FALSE, NULL, NULL, NULL, srp_data);
 
-       return OSSO_OK;
+       return OSSO_OK;
 }
 
 static gint
@@ -1257,7 +1252,7 @@ on_send_receive_full (GArray *arguments, gpointer data, osso_rpc_t * retval)
        else
                on_send_receive_performer (FALSE, NULL, NULL, NULL, srp_data);
 
-       return OSSO_OK;
+       return OSSO_OK;
 }
 
 static gint
@@ -1265,7 +1260,7 @@ on_open_default_inbox(GArray * arguments, gpointer data, osso_rpc_t * retval)
 {
        g_idle_add(on_idle_top_application, NULL);
 
-       return OSSO_OK;
+       return OSSO_OK;
 }
 
 
@@ -1430,7 +1425,7 @@ on_top_application(GArray * arguments, gpointer data, osso_rpc_t * retval)
        /* Use g_idle to context-switch into the application's thread: */
        g_idle_add(on_idle_top_application, NULL);
 
-       return OSSO_OK;
+       return OSSO_OK;
 }
 
 static gboolean
@@ -1482,9 +1477,9 @@ static gint
 on_open_edit_accounts_dialog (GArray * arguments, gpointer data, osso_rpc_t * retval)
 {
        /* Use g_idle to context-switch into the application's thread: */
-       g_idle_add (on_idle_open_edit_accounts_dialog, NULL);
+       g_idle_add (on_idle_open_edit_accounts_dialog, NULL);
 
-       return OSSO_OK;
+       return OSSO_OK;
 }
 
 static gboolean