* Fixes NB#103073, do not show notifications when Modest is showing its UI

[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 8f037cc..38a92cb 100644 (file)
--- a/src/dbus_api/modest-dbus-callbacks.c
+++ b/src/dbus_api/modest-dbus-callbacks.c
@@ -40,6 +40,7 @@
 #include "widgets/modest-msg-edit-window.h"
 #include "modest-tny-msg.h"
 #include "modest-platform.h"
+#include "modest-defs.h"
 #include <libmodest-dbus-client/libmodest-dbus-client.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <stdio.h>
@@ -888,11 +889,9 @@ static gboolean
 on_idle_send_receive(gpointer user_data)
 {
        gboolean auto_update;
-       ModestWindow *main_win = NULL;
+       ModestWindow *top_win = NULL;
 
-       main_win =
-               modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
-                                                  FALSE); /* don't create */
+       top_win = modest_window_mgr_get_current_top (modest_runtime_get_window_mgr ());
 
        gdk_threads_enter (); /* CHECKED */
 
@@ -902,7 +901,7 @@ on_idle_send_receive(gpointer user_data)
 
        if (auto_update)
                /* Do send receive */
-               modest_ui_actions_do_send_receive_all (main_win, FALSE, FALSE, FALSE);
+               modest_ui_actions_do_send_receive_all (top_win, FALSE, FALSE, FALSE);
        else
                /* Disable auto update */
                modest_platform_set_update_interval (0);
@@ -1527,12 +1526,12 @@ on_dbus_method_search (DBusConnection *con, DBusMessage *message)
        }
 
        if (sd_v > 0) {
-               search->flags |= MODEST_SEARCH_BEFORE;
+               search->flags |= MODEST_SEARCH_AFTER;
                search->start_date = start_date;
        }
 
        if (ed_v > 0) {
-               search->flags |= MODEST_SEARCH_AFTER;
+               search->flags |= MODEST_SEARCH_BEFORE;
                search->end_date = end_date;
        }