#include "modest-tny-account.h"
#include "modest-tny-folder.h"
#include "modest-ui-actions.h"
+#include "modest-utils.h"
#include "modest-debug.h"
#include "modest-search.h"
#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>
#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>
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)
}
from_header = tny_header_dup_from (header);
- if (from_header) {
- GSList *accounts = modest_account_mgr_account_names (modest_runtime_get_account_mgr (), TRUE);
- GSList *node = NULL;
- for (node = accounts; node != NULL; node = g_slist_next (node)) {
- gchar *from = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr (), node->data);
-
- if (from && (strcmp (from_header, from) == 0)) {
- g_free (modest_account_name);
- modest_account_name = g_strdup (node->data);
- g_free (from);
- break;
- }
- g_free (from);
- }
- g_slist_foreach (accounts, (GFunc) g_free, NULL);
- g_slist_free (accounts);
- g_free (from_header);
- }
+ modest_account_name = modest_utils_get_account_name_from_recipient (from_header);
+ g_free (from_header);
if (modest_account_name == NULL) {
- modest_account_name = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr ());
+ ModestAccountMgr *mgr = modest_runtime_get_account_mgr ();
+ modest_account_name = modest_account_mgr_get_default_account (mgr);
}
msg_view = modest_msg_edit_window_new (msg, modest_account_name, TRUE);
g_free (modest_account_name);
}
if (msg_view != NULL) {
- modest_window_mgr_register_window (win_mgr, msg_view);
- 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));
+ }
}
}
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));
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);
static gboolean
on_idle_open_message_performer (gpointer user_data)
{
- ModestWindow *main_win = NULL;
+ ModestWindow *top_win = NULL;
OpenMsgPerformerInfo *info = (OpenMsgPerformerInfo *) user_data;
- 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());
/* Lock before the call as we're in an idle handler */
gdk_threads_enter ();
if (info->connect) {
- modest_platform_connect_and_perform (GTK_WINDOW (main_win), TRUE, info->account,
+ modest_platform_connect_and_perform (GTK_WINDOW (top_win), TRUE,
+ info->account,
on_open_message_performer, info);
} else {
- on_open_message_performer (FALSE, NULL, GTK_WINDOW (main_win), info->account, info);
+ on_open_message_performer (FALSE, NULL, GTK_WINDOW (top_win),
+ info->account, info);
}
gdk_threads_leave ();
gpointer user_data)
{
TnyHeader *header;
- ModestWindow *main_win = NULL, *msg_view = NULL;
- ModestHeaderView *header_view;
+ ModestWindow *top_win = NULL, *msg_view = NULL;
header = (TnyHeader *) user_data;
/* Get the main window if exists */
- main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(),
- FALSE); /* don't create */
- if (!main_win) {
+ top_win = modest_window_mgr_get_current_top (modest_runtime_get_window_mgr());
+ if (!top_win) {
g_object_unref (header);
return;
}
}
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 gboolean
-on_idle_delete_message (gpointer user_data)
+static gpointer
+thread_prepare_delete_message (gpointer userdata)
{
TnyList *headers = NULL, *tmp_headers = NULL;
TnyFolder *folder = NULL;
TnyHeader *header = NULL, *msg_header = NULL;
TnyMsg *msg = NULL;
TnyAccount *account = NULL;
- const char *uri = NULL;
+ char *uri;
gchar *uid = NULL;
ModestMailOperation *mail_op = NULL;
- ModestWindow *main_win = NULL;
+ ModestWindow *top_win = NULL;
+
+ uri = (char *) userdata;
- uri = (char *) user_data;
-
msg = find_message_by_url (uri, &account);
if (account)
g_object_unref (account);
if (!msg) {
g_warning ("%s: Could not find message '%s'", __FUNCTION__, uri);
g_idle_add (notify_error_in_dbus_callback, NULL);
+ g_free (uri);
return FALSE;
}
-
- 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());
+
folder = tny_msg_get_folder (msg);
if (!folder) {
g_warning ("%s: Could not find folder (uri:'%s')", __FUNCTION__, uri);
g_object_unref (msg);
g_idle_add (notify_error_in_dbus_callback, NULL);
+ g_free (uri);
return FALSE;
}
if (folder)
g_object_unref (folder);
g_idle_add (notify_error_in_dbus_callback, NULL);
+ g_free (uri);
return FALSE;
}
* the code below is or does Gtk+ code */
gdk_threads_enter (); /* CHECKED */
- mail_op = modest_mail_operation_new (main_win ? G_OBJECT(main_win) : NULL);
+ mail_op = modest_mail_operation_new (top_win ? G_OBJECT(top_win) : NULL);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
g_signal_connect (G_OBJECT (mail_op),
/* Clean */
if (header)
g_object_unref (header);
+ g_free (uri);
return FALSE;
}
+static gboolean
+on_idle_delete_message (gpointer user_data)
+{
+ const char *uri = NULL;
+
+ uri = (char *) user_data;
+
+ g_thread_create (thread_prepare_delete_message, g_strdup (uri), FALSE, NULL);
+
+ return FALSE;
+
+}
+
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 */
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);
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)
{
}
if (main_win) {
- /* Ideally, we would just use gtk_widget_show(),
- * but this widget is not coded correctly to support that: */
- gtk_widget_show_all (GTK_WIDGET (main_win));
- gtk_window_present (GTK_WINDOW (main_win));
-
/* If we're showing an already existing window then
reselect the INBOX */
if (!new_window) {
}
}
+ 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)
}
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;
}
tny_folder_store_get_folders (folder_store,
all_folders,
NULL /* query */,
+ FALSE,
NULL /* error */);
TnyIterator *iter = tny_list_create_iterator (all_folders);