#ifdef MODEST_PLATFORM_MAEMO
#include "maemo/modest-osso-state-saving.h"
#include "maemo/modest-maemo-utils.h"
+#include "maemo/modest-hildon-includes.h"
#endif /* MODEST_PLATFORM_MAEMO */
#include "widgets/modest-ui-constants.h"
GtkWidget *parent_window;
} ReplyForwardHelper;
+typedef struct _PasteAsAttachmentHelper {
+ ModestMsgEditWindow *window;
+ GtkWidget *banner;
+} PasteAsAttachmentHelper;
+
/*
* The do_headers_action uses this kind of functions to perform some
ModestMailOperationState *state,
gpointer user_data);
+static gboolean
+download_uncached_messages (TnyList *header_list, GtkWindow *win,
+ gboolean reply_fwd);
static void
run_account_setup_wizard (ModestWindow *win)
{
ModestEasysetupWizardDialog *wizard;
-
+
g_return_if_fail (MODEST_IS_WINDOW(win));
wizard = modest_easysetup_wizard_dialog_new ();
gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (win));
+
+ /* Don't make this a modal window, because secondary windows will then
+ * be unusable, freezing the UI: */
+ /* gtk_window_set_modal (GTK_WINDOW (wizard), TRUE); */
+
gtk_dialog_run (GTK_DIALOG (wizard));
gtk_widget_destroy (GTK_WIDGET (wizard));
}
"uses the tinymail email framework written by Philip van Hoof"));
gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG(about), authors);
gtk_about_dialog_set_website (GTK_ABOUT_DIALOG(about), "http://modest.garage.maemo.org");
+ gtk_window_set_transient_for (GTK_WINDOW (about), GTK_WINDOW (win));
+ gtk_window_set_modal (GTK_WINDOW (about), TRUE);
gtk_dialog_run (GTK_DIALOG (about));
gtk_widget_destroy(about);
gpointer user_data)
{
modest_do_message_delete (header, win);
-
-/* refilter treemodel to hide marked-as-deleted rows */
-/* if (MODEST_IS_HEADER_VIEW (user_data)) */
-/* modest_header_view_refilter (MODEST_HEADER_VIEW (user_data)); */
}
/** After deleing a message that is currently visible in a window,
modest_msg_view_window_first_message_selected (win)) {
modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (win));
} else {
- modest_msg_view_window_select_next_message (win);
+ if (!modest_msg_view_window_select_next_message (win)) {
+ gboolean ret_value;
+ g_signal_emit_by_name (G_OBJECT (win), "delete-event", NULL, &ret_value);
+ }
}
}
mgr = modest_runtime_get_window_mgr ();
while (!tny_iterator_is_done (iter) && !found) {
header = TNY_HEADER (tny_iterator_get_current (iter));
- found = modest_window_mgr_find_registered_header (mgr, header, NULL);
- g_object_unref (header);
+ if (header) {
+ found = modest_window_mgr_find_registered_header (mgr, header, NULL);
+ g_object_unref (header);
+ }
+
tny_iterator_next (iter);
}
g_object_unref (iter);
if (tny_list_get_length(header_list) == 1) {
iter = tny_list_create_iterator (header_list);
header = TNY_HEADER (tny_iterator_get_current (iter));
- desc = g_strdup_printf ("%s", tny_header_get_subject (header));
- g_object_unref (header);
+ if (header) {
+ desc = g_strdup_printf ("%s", tny_header_get_subject (header));
+ g_object_unref (header);
+ }
+
g_object_unref (iter);
}
message = g_strdup_printf(ngettext("emev_nc_delete_message", "emev_nc_delete_messages",
/* Remove each header. If it's a view window header_view == NULL */
do_headers_action (win, headers_action_delete, header_view);
+ /* refresh the header view (removing marked-as-deleted)*/
+ modest_header_view_refilter (MODEST_HEADER_VIEW(header_view));
+
if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
modest_ui_actions_refresh_message_window_after_delete (MODEST_MSG_VIEW_WINDOW (win));
modest_ui_actions_on_close_window (GtkAction *action, ModestWindow *win)
{
gboolean ret_value;
+
g_signal_emit_by_name (G_OBJECT (win), "delete-event", NULL, &ret_value);
/* if (MODEST_IS_MSG_VIEW_WINDOW (win)) { */
} else {
/* Show the list of accounts: */
GtkDialog *account_win = GTK_DIALOG(modest_account_view_window_new ());
+ gtk_window_set_transient_for (GTK_WINDOW (account_win), GTK_WINDOW (win));
+
+ /* Don't make this a modal window, because secondary windows will then
+ * be unusable, freezing the UI: */
+ /* gtk_window_set_modal (GTK_WINDOW (account_win), TRUE); */
modest_maemo_show_dialog_and_forget (GTK_WINDOW (win), account_win);
}
#else
/* Create and register edit window */
/* This is destroyed by TOOD. */
- msg_win = modest_msg_edit_window_new (msg, account_name);
+ msg_win = modest_msg_edit_window_new (msg, account_name, FALSE);
mgr = modest_runtime_get_window_mgr ();
modest_window_mgr_register_window (mgr, msg_win);
/* Gets folder type (OUTBOX headers will be opened in edit window */
if (modest_tny_folder_is_local_folder (folder))
- folder_type = modest_tny_folder_get_local_folder_type (folder);
+ folder_type = modest_tny_folder_get_local_or_mmc_folder_type (folder);
/* If the header is in the drafts folder then open the editor,
else the message view window */
- if (folder_type == TNY_FOLDER_TYPE_DRAFTS) {
+ if ((folder_type == TNY_FOLDER_TYPE_DRAFTS) ||
+ (folder_type == TNY_FOLDER_TYPE_OUTBOX)) {
/* we cannot edit without a valid account... */
if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE)) {
run_account_setup_wizard(parent_win);
goto cleanup;
}
- win = modest_msg_edit_window_new (msg, account);
+ win = modest_msg_edit_window_new (msg, account, TRUE);
+
} else {
gchar *uid = modest_tny_folder_get_header_unique_id (header);
{
ModestWindowMgr *mgr = NULL;
TnyIterator *iter = NULL;
- ModestMailOperation *mail_op1 = NULL;
- ModestMailOperation *mail_op2 = NULL;
+ ModestMailOperation *mail_op = NULL;
TnyList *not_opened_headers = NULL;
- TnyList *not_opened_cached_headers = NULL;
- TnyHeaderFlags flags;
+ TnyHeaderFlags flags = 0;
/* Look if we already have a message view for each header. If
true, then remove the header from the list of headers to
mgr = modest_runtime_get_window_mgr ();
iter = tny_list_create_iterator (headers);
not_opened_headers = tny_simple_list_new ();
- not_opened_cached_headers = tny_simple_list_new ();
+
while (!tny_iterator_is_done (iter)) {
- ModestWindow *window;
- TnyHeader *header;
- gboolean found;
+ ModestWindow *window = NULL;
+ TnyHeader *header = NULL;
+ gboolean found = FALSE;
header = TNY_HEADER (tny_iterator_get_current (iter));
- flags = tny_header_get_flags (header);
+ if (header)
+ flags = tny_header_get_flags (header);
window = NULL;
found = modest_window_mgr_find_registered_header (mgr, header, &window);
else
/* the header has been registered already, we don't do
* anything but wait for the window to come up*/
- g_warning ("debug: header %p already registered, waiting for window",
- header);
+ g_debug ("header %p already registered, waiting for window", header);
} else {
- if (!(flags & TNY_HEADER_FLAG_CACHED))
- tny_list_append (not_opened_headers, G_OBJECT (header));
- /* Check if msg has already been retreived */
- else
- tny_list_append (not_opened_cached_headers, G_OBJECT (header));
+ tny_list_append (not_opened_headers, G_OBJECT (header));
}
- g_object_unref (header);
+
+ if (header)
+ g_object_unref (header);
+
tny_iterator_next (iter);
}
g_object_unref (iter);
* make a connection. It's generally easier to do this here (in the mainloop)
* than later in a thread:
*/
- if (tny_list_get_length (not_opened_cached_headers) > 0) {
- gboolean connected = modest_platform_connect_and_wait (GTK_WINDOW (win), NULL);
-
- /* Don't go further if a connection would be necessary but none is available: */
- if (!connected) {
+ if (tny_list_get_length (not_opened_headers) > 0) {
+ TnyIterator *iter;
+ gboolean found = FALSE;
+
+ iter = tny_list_create_iterator (not_opened_headers);
+ while (!tny_iterator_is_done (iter) && !found) {
+ TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
+ if (!(tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED))
+ found = TRUE;
+ else
+ tny_iterator_next (iter);
+
+ g_object_unref (header);
+ }
+ g_object_unref (iter);
+
+ if (found && !modest_platform_connect_and_wait (GTK_WINDOW (win), NULL)) {
g_object_unref (not_opened_headers);
- g_object_unref (not_opened_cached_headers);
- return;
+ return;
}
}
TnyIterator *iter_not_opened = tny_list_create_iterator (not_opened_headers);
while (!tny_iterator_is_done (iter_not_opened)) {
TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter_not_opened));
- modest_window_mgr_register_header (mgr, header);
- g_object_unref (header);
+ if (header) {
+ modest_window_mgr_register_header (mgr, header);
+ g_object_unref (header);
+ }
tny_iterator_next (iter_not_opened);
}
g_object_unref (iter_not_opened);
iter_not_opened = NULL;
- TnyIterator *iter_cached = tny_list_create_iterator (not_opened_cached_headers);
- while (!tny_iterator_is_done (iter_cached)) {
- TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter_cached));
- modest_window_mgr_register_header (mgr, header);
- g_object_unref (header);
-
- tny_iterator_next (iter_cached);
- }
- g_object_unref (iter_cached);
- iter_cached = NULL;
-
-
- /* Open each uncached message */
+ /* Open each message */
if (tny_list_get_length (not_opened_headers) > 0) {
- mail_op1 = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE,
+ mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE,
G_OBJECT (win),
modest_ui_actions_get_msgs_full_error_handler,
NULL);
- modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op1);
+ modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
if (tny_list_get_length (not_opened_headers) > 1) {
- modest_mail_operation_get_msgs_full (mail_op1,
+ modest_mail_operation_get_msgs_full (mail_op,
not_opened_headers,
open_msg_cb,
NULL,
} else {
TnyIterator *iter = tny_list_create_iterator (not_opened_headers);
TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
- modest_mail_operation_get_msg (mail_op1, header, open_msg_cb, NULL);
- g_object_unref (header);
- g_object_unref (iter);
- }
- }
-
- /* Open each cached message */
- if (tny_list_get_length (not_opened_cached_headers) > 0) {
- mail_op2 = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE,
- G_OBJECT (win),
- modest_ui_actions_get_msgs_full_error_handler,
- NULL);
- modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op2);
- if (tny_list_get_length (not_opened_cached_headers) > 1) {
- modest_mail_operation_get_msgs_full (mail_op2,
- not_opened_headers,
- open_msg_cb,
- NULL,
- NULL);
- } else {
- TnyIterator *iter = tny_list_create_iterator (not_opened_cached_headers);
- TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
- modest_mail_operation_get_msg (mail_op2, header, open_msg_cb, NULL);
+ modest_mail_operation_get_msg (mail_op, header, open_msg_cb, NULL);
g_object_unref (header);
g_object_unref (iter);
}
+ g_object_unref (mail_op);
}
/* Clean */
if (not_opened_headers != NULL)
g_object_unref (not_opened_headers);
- if (not_opened_cached_headers != NULL)
- g_object_unref (not_opened_cached_headers);
- if (iter != NULL)
- g_object_unref (iter);
- if (mail_op1 != NULL)
- g_object_unref (mail_op1);
- if (mail_op2 != NULL)
- g_object_unref (mail_op2);
}
void
switch (rf_helper->action) {
case ACTION_REPLY:
new_msg =
- modest_tny_msg_create_reply_msg (msg, from, signature,
+ modest_tny_msg_create_reply_msg (msg, header, from, signature,
rf_helper->reply_forward_type,
MODEST_TNY_MSG_REPLY_MODE_SENDER);
break;
case ACTION_REPLY_TO_ALL:
new_msg =
- modest_tny_msg_create_reply_msg (msg, from, signature, rf_helper->reply_forward_type,
+ modest_tny_msg_create_reply_msg (msg, header, from, signature, rf_helper->reply_forward_type,
MODEST_TNY_MSG_REPLY_MODE_ALL);
edit_type = MODEST_EDIT_TYPE_REPLY;
break;
}
/* Create and register the windows */
- msg_win = modest_msg_edit_window_new (new_msg, rf_helper->account_name);
+ msg_win = modest_msg_edit_window_new (new_msg, rf_helper->account_name, FALSE);
mgr = modest_runtime_get_window_mgr ();
modest_window_mgr_register_window (mgr, msg_win);
if (account)
g_object_unref (G_OBJECT (account));
/* g_object_unref (msg); */
- g_object_unref (header);
free_reply_forward_helper (rf_helper);
}
* of them are currently downloaded
*/
static gboolean
-download_uncached_messages (TnyList *header_list, GtkWindow *win,
+download_uncached_messages (TnyList *header_list,
+ GtkWindow *win,
gboolean reply_fwd)
{
TnyIterator *iter;
iter = tny_list_create_iterator (header_list);
while (!tny_iterator_is_done (iter)) {
TnyHeader *header;
- TnyHeaderFlags flags;
header = TNY_HEADER (tny_iterator_get_current (iter));
- flags = tny_header_get_flags (header);
- /* TODO: is this the right flag?, it seems that some
- headers that have been previously downloaded do not
- come with it */
- if (! (flags & TNY_HEADER_FLAG_CACHED))
- uncached_messages ++;
- g_object_unref (header);
+ if (header) {
+ if (!(tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED))
+ uncached_messages ++;
+ g_object_unref (header);
+ }
+
tny_iterator_next (iter);
}
g_object_unref (iter);
TnyList *header_list = NULL;
ReplyForwardHelper *rf_helper = NULL;
guint reply_forward_type;
- gboolean continue_download;
+ gboolean continue_download = TRUE;
+ gboolean do_retrieve = TRUE;
g_return_if_fail (MODEST_IS_WINDOW(win));
if (!header_list)
return;
+ reply_forward_type =
+ modest_conf_get_int (modest_runtime_get_conf (),
+ (action == ACTION_FORWARD) ? MODEST_CONF_FORWARD_TYPE : MODEST_CONF_REPLY_TYPE,
+ NULL);
+
/* Check that the messages have been previously downloaded */
- continue_download = download_uncached_messages (header_list, GTK_WINDOW (win), TRUE);
+ do_retrieve = (action == ACTION_FORWARD) || (reply_forward_type != MODEST_TNY_MSG_REPLY_TYPE_CITE);
+ if (do_retrieve)
+ continue_download = download_uncached_messages (header_list, GTK_WINDOW (win), TRUE);
if (!continue_download) {
g_object_unref (header_list);
return;
}
- reply_forward_type =
- modest_conf_get_int (modest_runtime_get_conf (),
- (action == ACTION_FORWARD) ? MODEST_CONF_FORWARD_TYPE : MODEST_CONF_REPLY_TYPE,
- NULL);
/* We assume that we can only select messages of the
same folder and that we reply all of them from the
same account. In fact the interface currently only
if (!msg || !header) {
if (msg)
g_object_unref (msg);
- if (header)
- g_object_unref (header);
g_printerr ("modest: no message found\n");
return;
} else {
reply_forward_cb (NULL, header, msg, rf_helper);
}
+ if (header)
+ g_object_unref (header);
} else {
TnyHeader *header;
TnyIterator *iter;
- /* Retrieve messages */
- mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE,
- G_OBJECT(win),
- modest_ui_actions_get_msgs_full_error_handler,
- NULL);
- modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
-
/* Only reply/forward to one message */
iter = tny_list_create_iterator (header_list);
header = TNY_HEADER (tny_iterator_get_current (iter));
g_object_unref (iter);
- modest_mail_operation_get_msg (mail_op,
- header,
- reply_forward_cb,
- rf_helper);
+ if (header) {
+ /* Retrieve messages */
+ if (do_retrieve) {
+ mail_op = modest_mail_operation_new_with_error_handling (
+ MODEST_MAIL_OPERATION_TYPE_RECEIVE,
+ G_OBJECT(win),
+ modest_ui_actions_get_msgs_full_error_handler,
+ NULL);
+ modest_mail_operation_queue_add (
+ modest_runtime_get_mail_operation_queue (), mail_op);
+
+ modest_mail_operation_get_msg (mail_op,
+ header,
+ reply_forward_cb,
+ rf_helper);
+ /* Clean */
+ g_object_unref(mail_op);
+ } else {
+ /* we put a ref here to prevent double unref as the reply
+ * forward callback unrefs the header at its end */
+ reply_forward_cb (NULL, header, NULL, rf_helper);
+ }
+
-/* modest_mail_operation_get_msgs_full (mail_op, */
-/* header_list, */
-/* reply_forward_cb, */
-/* rf_helper, */
-/* free_reply_forward_helper); */
+ g_object_unref (header);
+ }
- /* Clean */
- g_object_unref(mail_op);
}
/* Free */
account_names = NULL;
}
-/*
- * Handler of the click on Send&Receive button in the main toolbar
- */
-void
-modest_ui_actions_on_send_receive (GtkAction *action, ModestWindow *win)
+void
+modest_do_refresh_current_folder(ModestWindow *win)
{
- /* Check if accounts exist */
- gboolean accounts_exist =
- modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE);
-
- /* If not, allow the user to create an account before trying to send/receive. */
- if (!accounts_exist)
- modest_ui_actions_on_accounts (NULL, win);
-
/* Refresh currently selected folder. Note that if we only
- want to retrive the headers, then the refresh only will
+ want to retreive the headers, then the refresh only will
invoke a poke_status over all folders, i.e., only the
total/unread count will be updated */
if (MODEST_IS_MAIN_WINDOW (win)) {
if (folder_store)
g_object_unref (folder_store);
}
+}
+
+
+/*
+ * Handler of the click on Send&Receive button in the main toolbar
+ */
+void
+modest_ui_actions_on_send_receive (GtkAction *action, ModestWindow *win)
+{
+ /* Check if accounts exist */
+ gboolean accounts_exist =
+ modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE);
+
+ /* If not, allow the user to create an account before trying to send/receive. */
+ if (!accounts_exist)
+ modest_ui_actions_on_accounts (NULL, win);
+
+ modest_do_refresh_current_folder (win);
/* Refresh the active account */
modest_ui_actions_do_send_receive (NULL, win);
g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
g_return_if_fail (MODEST_IS_HEADER_VIEW (header_view));
+ /* in the case the folder is empty, show the empty folder message and focus
+ * folder view */
+ if (!header && gtk_widget_is_focus (GTK_WIDGET (header_view))) {
+ if (modest_header_view_is_empty (header_view)) {
+ TnyFolder *folder = modest_header_view_get_folder (header_view);
+ GtkWidget *folder_view =
+ modest_main_window_get_child_widget (main_window,
+ MODEST_WIDGET_TYPE_FOLDER_VIEW);
+ if (folder != NULL)
+ modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view), folder, FALSE);
+ gtk_widget_grab_focus (GTK_WIDGET (folder_view));
+ return;
+ }
+ }
/* If no header has been selected then exit */
if (!header)
return;
gtk_window_set_default_size (GTK_WINDOW(dialog), 300, 300);
if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
-// modest_platform_connect_and_wait ();
+ /* TODO: Comment about why is this commented out: */
+ /* modest_platform_connect_and_wait (); */
}
}
gtk_widget_destroy (dialog);
{
g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window));
- if (!modest_msg_edit_window_check_names (edit_window))
+ if (!modest_msg_edit_window_check_names (edit_window, TRUE))
return;
/* Offer the connection dialog, if necessary: */
account_name = modest_account_mgr_get_default_account (account_mgr);
if (!account_name) {
- g_printerr ("modest: no account found\n");
+ /* Run account setup wizard */
+ run_account_setup_wizard(MODEST_WINDOW(edit_window));
return;
}
(modest_runtime_get_account_store(),
account_name));
if (!transport_account) {
- g_printerr ("modest: no transport account found for '%s'\n", account_name);
- g_free (account_name);
- modest_msg_edit_window_free_msg_data (edit_window, data);
+ /* Run account setup wizard */
+ run_account_setup_wizard(MODEST_WINDOW(edit_window));
return;
}
g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
g_return_if_fail (GTK_IS_ACTION (action));
- modest_msg_edit_window_attach_file (window);
+ modest_msg_edit_window_offer_attach_file (window);
}
void
delete_folder (main_window, TRUE);
}
+
+static void
+show_error (GtkWidget *parent_widget, const gchar* text)
+{
+ hildon_banner_show_information(parent_widget, NULL, text);
+
+#if 0
+ GtkDialog *dialog = GTK_DIALOG (hildon_note_new_information (parent_window, text)); */
+ /*
+ GtkDialog *dialog = GTK_DIALOG (gtk_message_dialog_new (parent_window,
+ (GtkDialogFlags)0,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ text ));
+ */
+
+ gtk_dialog_run (dialog);
+ gtk_widget_destroy (GTK_WIDGET (dialog));
+#endif
+}
+
void
modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
const gchar* server_account_name,
*cancel = FALSE;
} else {
+ show_error(GTK_WIDGET (main_window), _("mail_ib_login_cancelled"));
+
if (username)
*username = NULL;
ModestWindow *window)
{
GtkWidget *focused_widget;
+ GtkClipboard *clipboard;
+ clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
focused_widget = gtk_window_get_focus (GTK_WINDOW (window));
if (GTK_IS_EDITABLE (focused_widget)) {
gtk_editable_cut_clipboard (GTK_EDITABLE(focused_widget));
+ gtk_clipboard_set_can_store (clipboard, NULL, 0);
+ gtk_clipboard_store (clipboard);
} else if (GTK_IS_TEXT_VIEW (focused_widget)) {
GtkTextBuffer *buffer;
- GtkClipboard *clipboard;
- clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused_widget));
gtk_text_buffer_cut_clipboard (buffer, clipboard, TRUE);
gtk_clipboard_set_can_store (clipboard, NULL, 0);
+ gtk_clipboard_store (clipboard);
} else if (MODEST_IS_HEADER_VIEW (focused_widget)) {
modest_header_view_cut_selection (MODEST_HEADER_VIEW (focused_widget));
} else if (MODEST_IS_FOLDER_VIEW (focused_widget)) {
if (GTK_IS_LABEL (focused_widget)) {
gtk_clipboard_set_text (clipboard, gtk_label_get_text (GTK_LABEL (focused_widget)), -1);
+ gtk_clipboard_set_can_store (clipboard, NULL, 0);
+ gtk_clipboard_store (clipboard);
} else if (GTK_IS_EDITABLE (focused_widget)) {
gtk_editable_copy_clipboard (GTK_EDITABLE(focused_widget));
+ gtk_clipboard_set_can_store (clipboard, NULL, 0);
+ gtk_clipboard_store (clipboard);
} else if (GTK_IS_HTML (focused_widget)) {
gtk_html_copy (GTK_HTML (focused_widget));
+ gtk_clipboard_set_can_store (clipboard, NULL, 0);
+ gtk_clipboard_store (clipboard);
} else if (GTK_IS_TEXT_VIEW (focused_widget)) {
GtkTextBuffer *buffer;
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused_widget));
gtk_text_buffer_copy_clipboard (buffer, clipboard);
gtk_clipboard_set_can_store (clipboard, NULL, 0);
+ gtk_clipboard_store (clipboard);
} else if (MODEST_IS_HEADER_VIEW (focused_widget)) {
TnyList *header_list = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (focused_widget));
TnyIterator *iter = tny_list_create_iterator (header_list);
TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
- TnyFolder *folder = tny_header_get_folder (header);
- TnyAccount *account = tny_folder_get_account (folder);
- const gchar *proto_str = tny_account_get_proto (TNY_ACCOUNT (account));
- /* If it's POP then ask */
- gboolean ask = (modest_protocol_info_get_transport_store_protocol (proto_str) ==
- MODEST_PROTOCOL_STORE_POP) ? TRUE : FALSE;
- g_object_unref (account);
- g_object_unref (folder);
- g_object_unref (header);
+
+ gboolean ask = FALSE;
+ if (header) {
+ TnyFolder *folder = tny_header_get_folder (header);
+ TnyAccount *account = tny_folder_get_account (folder);
+ const gchar *proto_str = tny_account_get_proto (TNY_ACCOUNT (account));
+ /* If it's POP then ask */
+ ask = (modest_protocol_info_get_transport_store_protocol (proto_str) ==
+ MODEST_PROTOCOL_STORE_POP) ? TRUE : FALSE;
+ g_object_unref (account);
+ g_object_unref (folder);
+ g_object_unref (header);
+ }
+
g_object_unref (iter);
/* Check that the messages have been previously downloaded */
gtk_widget_destroy (GTK_WIDGET(user_data));
}
+static void
+paste_as_attachment_free (gpointer data)
+{
+ PasteAsAttachmentHelper *helper = (PasteAsAttachmentHelper *) data;
+
+ gtk_widget_destroy (helper->banner);
+ g_object_unref (helper->banner);
+ g_free (helper);
+}
+
+static void
+paste_msg_as_attachment_cb (ModestMailOperation *mail_op,
+ TnyHeader *header,
+ TnyMsg *msg,
+ gpointer userdata)
+{
+ PasteAsAttachmentHelper *helper = (PasteAsAttachmentHelper *) userdata;
+ g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (helper->window));
+
+ if (msg == NULL)
+ return;
+
+ modest_msg_edit_window_add_part (MODEST_MSG_EDIT_WINDOW (helper->window), TNY_MIME_PART (msg));
+
+}
+
void
modest_ui_actions_on_paste (GtkAction *action,
ModestWindow *window)
if (GTK_IS_EDITABLE (focused_widget)) {
gtk_editable_paste_clipboard (GTK_EDITABLE(focused_widget));
} else if (GTK_IS_TEXT_VIEW (focused_widget)) {
- GtkTextBuffer *buffer;
- GtkClipboard *clipboard;
+ ModestEmailClipboard *e_clipboard = NULL;
+ e_clipboard = modest_runtime_get_email_clipboard ();
+ if (modest_email_clipboard_cleared (e_clipboard)) {
+ GtkTextBuffer *buffer;
+ GtkClipboard *clipboard;
+
+ clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+ buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused_widget));
+ gtk_text_buffer_paste_clipboard (buffer, clipboard, NULL, TRUE);
+ } else if (MODEST_IS_MSG_EDIT_WINDOW (window)) {
+ ModestMailOperation *mail_op;
+ TnyFolder *src_folder;
+ TnyList *data;
+ gboolean delete;
+ PasteAsAttachmentHelper *helper = g_new0 (PasteAsAttachmentHelper, 1);
+ helper->window = MODEST_MSG_EDIT_WINDOW (window);
+ helper->banner = modest_platform_animation_banner (GTK_WIDGET (window), NULL,
+ _CS("ckct_nw_pasting"));
+ modest_email_clipboard_get_data (e_clipboard, &src_folder, &data, &delete);
+ mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE,
+ G_OBJECT (window));
+ if (helper->banner != NULL) {
+ g_object_ref (G_OBJECT (helper->banner));
+ gtk_window_set_modal (GTK_WINDOW (helper->banner), FALSE);
+ gtk_widget_show (GTK_WIDGET (helper->banner));
+ }
- clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
- buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (focused_widget));
- gtk_text_buffer_paste_clipboard (buffer, clipboard, NULL, TRUE);
+ if (data != NULL) {
+ modest_mail_operation_get_msgs_full (mail_op,
+ data,
+ (GetMsgAsyncUserCallback) paste_msg_as_attachment_cb,
+ helper,
+ paste_as_attachment_free);
+ }
+ }
} else if (MODEST_IS_FOLDER_VIEW (focused_widget)) {
ModestEmailClipboard *clipboard = NULL;
TnyFolder *src_folder = NULL;
dialog = modest_details_dialog_new_with_header (GTK_WINDOW (window), header);
/* Run dialog */
+ gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
gtk_widget_show_all (dialog);
gtk_dialog_run (GTK_DIALOG (dialog));
dialog = modest_details_dialog_new_with_folder (window, folder);
/* Run dialog */
+ gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
gtk_widget_show_all (dialog);
gtk_dialog_run (GTK_DIALOG (dialog));
iter = tny_list_create_iterator (headers_list);
header = TNY_HEADER (tny_iterator_get_current (iter));
- headers_action_show_details (header, win, NULL);
- g_object_unref (header);
+ if (header) {
+ headers_action_show_details (header, win, NULL);
+ g_object_unref (header);
+ }
g_object_unref (iter);
g_object_unref (headers_list);
modest_ui_actions_on_check_names (GtkAction *action, ModestMsgEditWindow *window)
{
g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
- modest_msg_edit_window_check_names (window);
+ modest_msg_edit_window_check_names (window, FALSE);
}
static void
iter = tny_list_create_iterator (list);
while (tny_iterator_is_done (iter) && !found) {
TnyHeader *header;
- TnyHeaderFlags flags;
+ TnyHeaderFlags flags = 0;
header = TNY_HEADER (tny_iterator_get_current (iter));
- flags = tny_header_get_flags (header);
- if (!(flags & TNY_HEADER_FLAG_PARTIAL))
- found = TRUE;
+ if (header) {
+ flags = tny_header_get_flags (header);
+ if (!(flags & TNY_HEADER_FLAG_PARTIAL))
+ found = TRUE;
+
+ g_object_unref (header);
+ }
if (!found)
tny_iterator_next (iter);
/* If the destination is a local folder */
if (modest_tny_folder_is_local_folder (dest_folder)) {
- TnyFolder *src_folder;
- TnyIterator *iter;
- TnyHeader *header;
+ TnyFolder *src_folder = NULL;
+ TnyIterator *iter = NULL;
+ TnyHeader *header = NULL;
/* Get source folder */
iter = tny_list_create_iterator (headers);
header = TNY_HEADER (tny_iterator_get_current (iter));
- src_folder = tny_header_get_folder (header);
- g_object_unref (header);
+ if (header) {
+ src_folder = tny_header_get_folder (header);
+ g_object_unref (header);
+ }
+
g_object_unref (iter);
/* if no src_folder, message may be an attahcment */
response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win),
(const gchar *) message);
}
+
g_object_unref (src_folder);
}
+
return response;
}
while (!tny_iterator_is_done (iter)) {
TnyMimePart *part;
part = TNY_MIME_PART (tny_iterator_get_current (iter));
- if (tny_mime_part_is_attachment (part) || TNY_IS_MSG (part)) {
+ if (part && (tny_mime_part_is_attachment (part) || TNY_IS_MSG (part))) {
if (tny_mime_part_is_purged (part))
some_purged = TRUE;
else
pending_purges++;
}
+
+ if (part)
+ g_object_unref (part);
+
tny_iterator_next (iter);
}
TnyMimePart *part;
part = TNY_MIME_PART (tny_iterator_get_current (iter));
- if (tny_mime_part_is_attachment (part) || TNY_IS_MSG (part))
+ if (part && (tny_mime_part_is_attachment (part) || TNY_IS_MSG (part)))
tny_mime_part_set_purged (part);
+
+ if (part)
+ g_object_unref (part);
+
tny_iterator_next (iter);
}
TnyMimePart *part;
part = TNY_MIME_PART (tny_iterator_get_current (iter));
- g_object_unref (part);
+ if (part) {
+ /* One for the reference given by tny_iterator_get_current(): */
+ g_object_unref (part);
+
+ /* TODO: Is this meant to remove the attachment by doing another unref()?
+ * Otherwise, this seems useless. */
+ }
+
tny_iterator_next (iter);
}
modest_window_mgr_unregister_header (mgr, header);
/* Create and run the dialog */
dialog = create_move_to_dialog (GTK_WINDOW (win), folder_view, &tree_view);
modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (tree_view));
+ gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
result = gtk_dialog_run (GTK_DIALOG(dialog));
g_object_ref (tree_view);
gtk_widget_destroy (dialog);
HeadersFunc func,
gpointer user_data)
{
- TnyList *headers_list;
- TnyIterator *iter;
- TnyHeader *header;
- TnyFolder *folder;
+ TnyList *headers_list = NULL;
+ TnyIterator *iter = NULL;
+ TnyHeader *header = NULL;
+ TnyFolder *folder = NULL;
/* Get headers */
headers_list = get_selected_headers (win);
/* Get the folder */
iter = tny_list_create_iterator (headers_list);
header = TNY_HEADER (tny_iterator_get_current (iter));
- folder = tny_header_get_folder (header);
- g_object_unref (header);
+ if (header) {
+ folder = tny_header_get_folder (header);
+ g_object_unref (header);
+ }
/* Call the function for each header */
while (!tny_iterator_is_done (iter)) {
dialog = modest_platform_get_global_settings_dialog ();
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (win));
+ gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
gtk_widget_show_all (dialog);
gtk_dialog_run (GTK_DIALOG (dialog));
projects / modest / blobdiff