X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fdbus_api%2Fmodest-dbus-callbacks.c;h=97edc9876827343a3cc78d883c292bb34c685dc1;hb=a89eb5f92ef6a7fed000d6c370938317c084f241;hp=0289eb6d933584bd1e770cdc8ef1f583c4b04484;hpb=d73789ffb936127d7e0b2ddfb7bc60683df683c5;p=modest diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c index 0289eb6..97edc98 100644 --- a/src/dbus_api/modest-dbus-callbacks.c +++ b/src/dbus_api/modest-dbus-callbacks.c @@ -40,18 +40,27 @@ #include "widgets/modest-msg-edit-window.h" #include "modest-tny-msg.h" #include "modest-platform.h" +#include "modest-defs.h" #include #include #include #include #include #ifdef MODEST_HAVE_HILDON0_WIDGETS +#include #include #else +#include #include #endif #include +#ifdef MODEST_TOOLKIT_HILDON2 +#include +#include +#include +#endif + #include #include #include @@ -398,15 +407,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) @@ -440,8 +451,8 @@ find_msg_async_cb (TnyFolder *folder, GError *err, gpointer user_data) { - TnyHeader *header; - gchar *msg_uid; + TnyHeader *header = NULL; + gchar *msg_uid = NULL; ModestWindowMgr *win_mgr; ModestWindow *msg_view = NULL; gboolean is_draft = FALSE; @@ -454,8 +465,7 @@ find_msg_async_cb (TnyFolder *folder, } header = tny_msg_get_header (msg); - if (header && (tny_header_get_flags (header) & TNY_HEADER_FLAG_DELETED)) { - g_object_unref (header); + if (!header || (tny_header_get_flags (header) & TNY_HEADER_FLAG_DELETED)) { modest_platform_run_information_dialog (NULL, _("mail_ni_ui_folder_get_msg_folder_error"), TRUE); g_idle_add (notify_error_in_dbus_callback, NULL); goto end; @@ -484,18 +494,18 @@ find_msg_async_cb (TnyFolder *folder, } else { modest_account_name = NULL; } - + /* Drafts will be opened in the editor, and others will be opened in the viewer */ if (is_draft) { gchar *modest_account_name = NULL; gchar *from_header; - + /* we cannot edit without a valid account... */ if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr (), TRUE)) { if (!modest_ui_actions_run_account_setup_wizard(NULL)) { modest_window_mgr_unregister_header (win_mgr, header); - goto cleanup; + goto end; } } @@ -545,10 +555,11 @@ find_msg_async_cb (TnyFolder *folder, } } -cleanup: - g_object_unref (header); - end: + if (header) + g_object_unref (header); + if (msg_uid) + g_free (msg_uid); on_find_msg_async_destroy (info); } @@ -575,7 +586,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)); @@ -590,8 +601,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); @@ -600,19 +612,20 @@ on_open_message_performer (gboolean canceled, 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 (); @@ -707,15 +720,13 @@ on_remove_msgs_finished (ModestMailOperation *mail_op, 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; } @@ -727,12 +738,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 @@ -747,7 +756,7 @@ thread_prepare_delete_message (gpointer userdata) char *uri; gchar *uid = NULL; ModestMailOperation *mail_op = NULL; - ModestWindow *main_win = NULL; + ModestWindow *top_win = NULL; uri = (char *) userdata; @@ -761,10 +770,9 @@ thread_prepare_delete_message (gpointer userdata) 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); @@ -821,7 +829,7 @@ thread_prepare_delete_message (gpointer userdata) * 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), @@ -881,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 */ @@ -895,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); @@ -1114,7 +1120,7 @@ on_send_receive_performer(gboolean canceled, connect_when = modest_conf_get_int (modest_runtime_get_conf (), MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, NULL); - + /* Perform a send and receive if the user selected to connect via any mean or if the current connection method is the same as the one specified by the user */ @@ -1128,44 +1134,146 @@ on_send_receive_performer(gboolean canceled, } -static gint +static gint on_send_receive(GArray *arguments, gpointer data, osso_rpc_t * retval) -{ +{ TnyDevice *device = modest_runtime_get_device (); if (!tny_device_is_online (device)) modest_platform_connect_and_perform (NULL, FALSE, NULL, on_send_receive_performer, NULL); else on_send_receive_performer (FALSE, NULL, NULL, NULL, NULL); - + return OSSO_OK; } -static gint +static gint on_open_default_inbox(GArray * arguments, gpointer data, osso_rpc_t * retval) { g_idle_add(on_idle_top_application, NULL); - + return OSSO_OK; } -static gboolean +static gboolean +on_idle_open_account (gpointer user_data) +{ + ModestWindow *top; + ModestWindowMgr *mgr; + gchar *acc_name; + gboolean retval = TRUE; + + gdk_threads_enter (); + + acc_name = (gchar *) user_data; + mgr = modest_runtime_get_window_mgr (); + + /* If Modest is already launched then just ignore this call */ + if (modest_window_mgr_get_current_top (mgr)) { + retval = FALSE; + goto end; + } + + top = modest_window_mgr_show_initial_window (mgr); + +#ifdef MODEST_TOOLKIT_HILDON2 + if (MODEST_IS_ACCOUNTS_WINDOW (top)) { + GtkWidget *folder_window; + + folder_window = (GtkWidget *) modest_folder_window_new (NULL); + modest_folder_window_set_account (MODEST_FOLDER_WINDOW (folder_window), + acc_name); + if (modest_window_mgr_register_window (mgr, MODEST_WINDOW (folder_window), NULL)) { + gtk_widget_show (folder_window); + } else { + gtk_widget_destroy (folder_window); + folder_window = NULL; + } + } +#else + if (MODEST_IS_MAIN_WINDOW (top)) { + gchar *server_name; + GtkWidget *folder_view; + + folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (top), + MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); + server_name = modest_account_mgr_get_server_account_name (modest_runtime_get_account_mgr (), + acc_name, TNY_ACCOUNT_TYPE_STORE); + if (server_name) { + modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW (folder_view), + server_name); + g_free (server_name); + } + } +#endif + gdk_threads_leave (); + + end: + g_free (acc_name); + return FALSE; +} + +static gint +on_open_account (GArray *arguments, gpointer data, osso_rpc_t *retval) +{ + osso_rpc_t val; + gchar *account_id; + + /* Get the arguments: */ + val = g_array_index(arguments, osso_rpc_t, MODEST_DBUS_OPEN_MESSAGE_ARG_URI); + account_id = g_strdup (val.value.s); + + g_idle_add (on_idle_open_account, account_id); + + 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) { ModestWindow *main_win; gboolean new_window = FALSE; - + /* This is a GDK lock because we are an idle callback and * the code below is or does Gtk+ code */ gdk_threads_enter (); /* CHECKED */ - -#ifdef MODEST_TOOLKIT_HILDON2 - main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), - TRUE); - new_window = TRUE; -#else + main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), FALSE); @@ -1174,7 +1282,6 @@ on_idle_top_application (gpointer user_data) TRUE); new_window = TRUE; } -#endif if (main_win) { /* If we're showing an already existing window then @@ -1187,17 +1294,16 @@ on_idle_top_application (gpointer user_data) } } -#ifndef MODEST_TOOLKIT_HILDON2 if (main_win) { gtk_widget_show_all (GTK_WIDGET (main_win)); gtk_window_present (GTK_WINDOW (main_win)); } -#endif 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) @@ -1219,12 +1325,12 @@ on_idle_show_memory_low (gpointer user_data) dgettext("ke-recv","memr_ib_operation_disabled"), TRUE); gdk_threads_leave (); - + return FALSE; } - + /* Callback for normal D-BUS messages */ -gint +gint modest_dbus_req_handler(const gchar * interface, const gchar * method, GArray * arguments, gpointer data, osso_rpc_t * retval) @@ -1238,11 +1344,15 @@ modest_dbus_req_handler(const gchar * interface, const gchar * method, if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_MAIL_TO) == 0) { if (arguments->len != MODEST_DBUS_MAIL_TO_ARGS_COUNT) goto param_error; - return on_mail_to (arguments, data, retval); + return on_mail_to (arguments, data, retval); } else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_OPEN_MESSAGE) == 0) { if (arguments->len != MODEST_DBUS_OPEN_MESSAGE_ARGS_COUNT) goto param_error; return on_open_message (arguments, data, retval); + } else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_OPEN_ACCOUNT) == 0) { + if (arguments->len != MODEST_DBUS_OPEN_ACCOUNT_ARGS_COUNT) + goto param_error; + return on_open_account (arguments, data, retval); } else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_SEND_RECEIVE) == 0) { if (arguments->len != 0) goto param_error; @@ -1494,12 +1604,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; }