* Fixes NB#99458, do not show "Opening" banner when opening notifications

[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 ee7d3bd..d8d2abb 100644 (file)
--- a/src/dbus_api/modest-dbus-callbacks.c
+++ b/src/dbus_api/modest-dbus-callbacks.c
@@ -46,12 +46,20 @@
 #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
+#include <hildon/hildon.h>
+#include <modest-accounts-window.h>
+#include <modest-folder-window.h>
+#endif
+
 #include <tny-list.h>
 #include <tny-iterator.h>
 #include <tny-simple-list.h>
@@ -398,15 +406,17 @@ typedef struct {
        GtkWidget *animation;
 } OpenMsgPerformerInfo;
 
+#ifndef MODEST_TOOLKIT_HILDON2
 static gboolean
 on_show_opening_animation (gpointer userdata)
 {
        OpenMsgPerformerInfo *info = (OpenMsgPerformerInfo *) userdata;
        info->animation = modest_platform_animation_banner (NULL, NULL, _("mail_me_opening"));
        info->animation_timeout = 0;
-       
+
        return FALSE;
 }
+#endif
 
 static gboolean
 on_find_msg_async_destroy (gpointer userdata)
@@ -537,8 +547,11 @@ find_msg_async_cb (TnyFolder *folder,
                 }
 
                if (msg_view != NULL) {
-                       modest_window_mgr_register_window (win_mgr, msg_view, NULL);
-                       gtk_widget_show_all (GTK_WIDGET (msg_view));
+                       if (!modest_window_mgr_register_window (win_mgr, msg_view, NULL)) {
+                               gtk_widget_destroy (GTK_WIDGET (msg_view));
+                       } else {
+                               gtk_widget_show_all (GTK_WIDGET (msg_view));
+                       }
                }
         }
 
@@ -572,7 +585,7 @@ on_open_message_performer (gboolean canceled,
         if (!account) {
                 ModestTnyAccountStore *account_store;
                 ModestTnyLocalFoldersAccount *local_folders_account;
-                
+ 
                 account_store = modest_runtime_get_account_store ();
                 local_folders_account = MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (
                         modest_tny_account_store_get_local_folders_account (account_store));
@@ -587,8 +600,9 @@ on_open_message_performer (gboolean canceled,
                 on_find_msg_async_destroy (info);
                 return;
         }
-        
+#ifndef MODEST_TOOLKIT_HILDON2
        info->animation_timeout = g_timeout_add (1000, on_show_opening_animation, info);
+#endif
         /* Get message */
         tny_folder_find_msg_async (folder, info->uri, find_msg_async_cb, NULL, info);
         g_object_unref (folder);
@@ -705,7 +719,6 @@ on_remove_msgs_finished (ModestMailOperation *mail_op,
 {      
        TnyHeader *header;
        ModestWindow *main_win = NULL, *msg_view = NULL;
-       ModestHeaderView *header_view;
 
        header = (TnyHeader *) user_data;
 
@@ -724,12 +737,10 @@ on_remove_msgs_finished (ModestMailOperation *mail_op,
        }       
        g_object_unref (header);
 
-       /* Refilter the header view explicitly */
-       header_view = (ModestHeaderView *)
-               modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(main_win),
-                                                    MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
-       if (header_view && MODEST_IS_HEADER_VIEW (header_view))
-               modest_header_view_refilter (header_view);
+       /* Refilter the header views explicitely */
+
+       /* TODO: call modest_window_mgr_refilter_header_views */
+       /* this call will go through all the windows, get the header views and refilter them */
 }
 
 static gpointer
@@ -1146,7 +1157,40 @@ on_open_default_inbox(GArray * arguments, gpointer data, osso_rpc_t * retval)
        return OSSO_OK;
 }
 
+#ifdef MODEST_TOOLKIT_HILDON2
+static gboolean
+on_idle_top_application (gpointer user_data)
+{
+       HildonWindowStack *stack;
+       GtkWidget *window;
+
+       /* This is a GDK lock because we are an idle callback and
+        * the code below is or does Gtk+ code */
+
+       gdk_threads_enter (); /* CHECKED */
+
+       stack = hildon_window_stack_get_default ();
+       window = GTK_WIDGET (hildon_window_stack_peek (stack));
 
+       if (window) {
+               gtk_window_present (GTK_WINDOW (window));
+       } else {
+               ModestWindowMgr *mgr;
+
+               mgr = modest_runtime_get_window_mgr ();
+               window = (GtkWidget *) modest_window_mgr_show_initial_window (mgr);
+               if (window) {
+                       modest_platform_remove_new_mail_notifications (FALSE);
+               } else {
+                       g_printerr ("modest: failed to get main window instance\n");
+               }
+       }
+
+       gdk_threads_leave (); /* CHECKED */
+       
+       return FALSE; /* Do not call this callback again. */
+}
+#else
 static gboolean 
 on_idle_top_application (gpointer user_data)
 {
@@ -1178,10 +1222,16 @@ on_idle_top_application (gpointer user_data)
                }
        }
 
+       if (main_win) {
+               gtk_widget_show_all (GTK_WIDGET (main_win));
+               gtk_window_present (GTK_WINDOW (main_win));
+       }
+
        gdk_threads_leave (); /* CHECKED */
        
        return FALSE; /* Do not call this callback again. */
 }
+#endif
 
 static gint 
 on_top_application(GArray * arguments, gpointer data, osso_rpc_t * retval)