X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-msg-edit-window.c;h=5354a71c062777f0c456b8241ae0ed113d9c5026;hb=23f786131a2e4d78a7a54f52edd53a0c906a9113;hp=bd6dd5fd5dd5cc39d8ec089360bda0ce640fd1bc;hpb=8b6cff6e0692434e7fac9669b742552ece5a3f86;p=modest diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c index bd6dd5f..5354a71 100644 --- a/src/maemo/modest-msg-edit-window.c +++ b/src/maemo/modest-msg-edit-window.c @@ -35,6 +35,7 @@ #include #include #include +#include #include @@ -104,11 +105,6 @@ static void text_buffer_can_redo (GtkTextBuffer *buffer, gboolean can_redo, Mod static void text_buffer_apply_tag (GtkTextBuffer *buffer, GtkTextTag *tag, GtkTextIter *start, GtkTextIter *end, gpointer userdata); -static void text_buffer_insert_text (GtkTextBuffer *buffer, - GtkTextIter *location, - gchar *text, - gint len, - ModestMsgEditWindow *window); static void text_buffer_delete_images_by_id (GtkTextBuffer *buffer, const gchar * image_id); static void subject_field_changed (GtkEditable *editable, ModestMsgEditWindow *window); static void subject_field_insert_text (GtkEditable *editable, @@ -138,6 +134,7 @@ static void modest_msg_edit_window_show_toolbar (ModestWindow *window, static void modest_msg_edit_window_clipboard_owner_change (GtkClipboard *clipboard, GdkEvent *event, ModestMsgEditWindow *window); +static void modest_msg_edit_window_clipboard_owner_handle_change_in_idle (ModestMsgEditWindow *window); static void subject_field_move_cursor (GtkEntry *entry, GtkMovementStep step, gint a1, @@ -169,25 +166,21 @@ static void init_window (ModestMsgEditWindow *obj); gboolean scroll_drag_timeout (gpointer userdata); static void correct_scroll (ModestMsgEditWindow *w); -static void correct_scroll_without_drag_check (ModestMsgEditWindow *w); +static void correct_scroll_without_drag_check (ModestMsgEditWindow *w, gboolean only_if_focused); static void text_buffer_end_user_action (GtkTextBuffer *buffer, ModestMsgEditWindow *userdata); static void text_buffer_mark_set (GtkTextBuffer *buffer, GtkTextIter *iter, GtkTextMark *mark, ModestMsgEditWindow *userdata); -void vadj_changed (GtkAdjustment *adj, - ModestMsgEditWindow *window); - - - - +static void vadj_changed (GtkAdjustment *adj, + ModestMsgEditWindow *window); static void DEBUG_BUFFER (WPTextBuffer *buffer) { #ifdef DEBUG GtkTextIter iter; - g_message ("BEGIN BUFFER OF SIZE %d", gtk_text_buffer_get_char_count (GTK_TEXT_BUFFER (buffer))); + g_debug ("BEGIN BUFFER OF SIZE %d", gtk_text_buffer_get_char_count (GTK_TEXT_BUFFER (buffer))); gtk_text_buffer_get_start_iter (GTK_TEXT_BUFFER (buffer), &iter); while (!gtk_text_iter_is_end (&iter)) { @@ -214,11 +207,11 @@ static void DEBUG_BUFFER (WPTextBuffer *buffer) g_string_append (output, " "); } output = g_string_append (output, "]\n"); - g_message ("%s", output->str); + g_debug ("%s", output->str); g_string_free (output, TRUE); gtk_text_iter_forward_to_tag_toggle (&iter, NULL); } - g_message ("END BUFFER"); + g_debug ("END BUFFER"); #endif } @@ -243,6 +236,7 @@ struct _ModestMsgEditWindowPrivate { ModestPairList *from_field_protos; GtkWidget *from_field; + gchar *original_account_name; GtkWidget *to_field; GtkWidget *cc_field; @@ -270,12 +264,17 @@ struct _ModestMsgEditWindowPrivate { GtkWidget *find_toolbar; gchar *last_search; + GtkWidget *font_dialog; + GtkWidget *scroll; guint scroll_drag_timeout_id; + gdouble last_upper; - gint last_cid; + gint next_cid; TnyList *attachments; TnyList *images; + guint64 images_size; + gint images_count; TnyHeaderFlags priority_flags; @@ -283,11 +282,14 @@ struct _ModestMsgEditWindowPrivate { gulong clipboard_change_handler_id; gulong default_clipboard_change_handler_id; gulong account_removed_handler_id; + guint clipboard_owner_idle; gchar *clipboard_text; TnyMsg *draft_msg; TnyMsg *outbox_msg; gchar *msg_uid; + gchar *references; + gchar *in_reply_to; gboolean sent; }; @@ -409,7 +411,9 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj) priv->subject_field = NULL; priv->attachments = TNY_LIST (tny_simple_list_new ()); priv->images = TNY_LIST (tny_simple_list_new ()); - priv->last_cid = 0; + priv->images_size = 0; + priv->images_count = 0; + priv->next_cid = 0; priv->cc_caption = NULL; priv->bcc_caption = NULL; @@ -423,16 +427,22 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj) priv->draft_msg = NULL; priv->outbox_msg = NULL; priv->msg_uid = NULL; + priv->references = NULL; + priv->in_reply_to = NULL; priv->can_undo = FALSE; priv->can_redo = FALSE; priv->clipboard_change_handler_id = 0; priv->default_clipboard_change_handler_id = 0; priv->account_removed_handler_id = 0; + priv->clipboard_owner_idle = 0; priv->clipboard_text = NULL; priv->sent = FALSE; priv->scroll_drag_timeout_id = 0; + priv->last_upper = 0.0; + + priv->font_dialog = NULL; modest_window_mgr_register_help_id (modest_runtime_get_window_mgr(), GTK_WINDOW(obj),"applications_email_editor"); @@ -469,7 +479,7 @@ get_transports (void) gchar *from_string = NULL; if (account_name) { from_string = modest_account_mgr_get_from_string (account_mgr, - account_name); + account_name, NULL); } if (from_string && account_name) { @@ -501,7 +511,7 @@ scroll_drag_timeout (gpointer userdata) priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(win); - correct_scroll_without_drag_check (win); + correct_scroll_without_drag_check (win, TRUE); priv->scroll_drag_timeout_id = 0; @@ -509,7 +519,7 @@ scroll_drag_timeout (gpointer userdata) } static void -correct_scroll_without_drag_check (ModestMsgEditWindow *w) +correct_scroll_without_drag_check (ModestMsgEditWindow *w, gboolean only_if_focused) { ModestMsgEditWindowPrivate *priv; GtkTextMark *insert; @@ -522,6 +532,9 @@ correct_scroll_without_drag_check (ModestMsgEditWindow *w) priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(w); + if (only_if_focused && !gtk_widget_is_focus (priv->msg_body)) + return; + insert = gtk_text_buffer_get_insert (priv->text_buffer); gtk_text_buffer_get_iter_at_mark (priv->text_buffer, &iter, insert); @@ -533,7 +546,7 @@ correct_scroll_without_drag_check (ModestMsgEditWindow *w) if ((offset + rectangle.y + rectangle.height) > ((gint) (vadj->value +vadj->page_size))) { - new_value = (offset + rectangle.y) + vadj->page_size * 0.75; + new_value = (offset + rectangle.y) - vadj->page_size * 0.25; if (new_value > vadj->upper - vadj->page_size) new_value = vadj->upper - vadj->page_size; } else if ((offset + rectangle.y) < ((gint) vadj->value)) { @@ -573,7 +586,7 @@ correct_scroll (ModestMsgEditWindow *w) return; } - correct_scroll_without_drag_check (w); + correct_scroll_without_drag_check (w, TRUE); } static void @@ -594,10 +607,50 @@ text_buffer_mark_set (GtkTextBuffer *buffer, gtk_text_buffer_end_user_action (buffer); } -void vadj_changed (GtkAdjustment *adj, - ModestMsgEditWindow *window) +static void +cut_clipboard_check (GtkTextView *text_view, + gpointer userdata) +{ + GtkTextBuffer *buffer; + + buffer = gtk_text_view_get_buffer (text_view); + if (!modest_text_utils_buffer_selection_is_valid (buffer)) { + g_signal_stop_emission_by_name ((gpointer )text_view, "cut-clipboard"); + } +} + +static void +copy_clipboard_check (GtkTextView *text_view, + gpointer userdata) +{ + GtkTextBuffer *buffer; + + buffer = gtk_text_view_get_buffer (text_view); + if (!modest_text_utils_buffer_selection_is_valid (buffer)) { + g_signal_stop_emission_by_name ((gpointer )text_view, "copy-clipboard"); + } +} + +static void +vadj_changed (GtkAdjustment *adj, + ModestMsgEditWindow *window) { - correct_scroll (window); + ModestMsgEditWindowPrivate *priv; + + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); + + if (priv->last_upper != adj->upper) { + priv->last_upper = adj->upper; + correct_scroll (window); + } +} + +static void +attachment_deleted (ModestAttachmentsView *attachments_view, + gpointer user_data) +{ + modest_msg_edit_window_remove_attachments (MODEST_MSG_EDIT_WINDOW (user_data), + NULL); } static void @@ -615,8 +668,8 @@ connect_signals (ModestMsgEditWindow *obj) G_CALLBACK (text_buffer_can_redo), obj); g_signal_connect (G_OBJECT (priv->text_buffer), "changed", G_CALLBACK (body_changed), obj); - g_signal_connect (G_OBJECT (priv->text_buffer), "insert-text", - G_CALLBACK (text_buffer_insert_text), obj); + g_signal_connect (G_OBJECT (priv->text_buffer), "modified-changed", + G_CALLBACK (body_changed), obj); g_signal_connect (G_OBJECT (obj), "window-state-event", G_CALLBACK (modest_msg_edit_window_window_state_event), NULL); @@ -666,6 +719,9 @@ connect_signals (ModestMsgEditWindow *obj) g_signal_connect (G_OBJECT (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD)), "owner-change", G_CALLBACK (modest_msg_edit_window_clipboard_owner_change), obj); + g_signal_connect (G_OBJECT (priv->msg_body), "cut-clipboard", G_CALLBACK (cut_clipboard_check), NULL); + g_signal_connect (G_OBJECT (priv->msg_body), "copy-clipboard", G_CALLBACK (copy_clipboard_check), NULL); + g_signal_connect (G_OBJECT (priv->attachments_view), "delete", G_CALLBACK (attachment_deleted), obj); } static void @@ -798,9 +854,9 @@ init_window (ModestMsgEditWindow *obj) g_object_set (priv->text_buffer, "font_scale", DEFAULT_FONT_SCALE, NULL); wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), TRUE); #if (GTK_MINOR_VERSION >= 10) - gtk_text_buffer_register_serialize_tagset(GTK_TEXT_BUFFER(priv->text_buffer), "wp-text-buffer"); + gtk_text_buffer_register_serialize_tagset(GTK_TEXT_BUFFER(priv->text_buffer), NULL); deserialize_type = gtk_text_buffer_register_deserialize_tagset(GTK_TEXT_BUFFER(priv->text_buffer), - "wp-text-buffer"); + NULL); gtk_text_buffer_deserialize_set_can_create_tags (GTK_TEXT_BUFFER (priv->text_buffer), deserialize_type, TRUE); #endif @@ -873,6 +929,10 @@ modest_msg_edit_window_finalize (GObject *obj) call this function before */ modest_msg_edit_window_disconnect_signals (MODEST_WINDOW (obj)); + if (priv->font_dialog != NULL) { + gtk_dialog_response (GTK_DIALOG (priv->font_dialog), GTK_RESPONSE_NONE); + } + if (priv->clipboard_text != NULL) { g_free (priv->clipboard_text); priv->clipboard_text = NULL; @@ -900,7 +960,15 @@ modest_msg_edit_window_finalize (GObject *obj) g_source_remove (priv->scroll_drag_timeout_id); priv->scroll_drag_timeout_id = 0; } + if (priv->clipboard_owner_idle > 0) { + g_source_remove (priv->clipboard_owner_idle); + priv->clipboard_owner_idle = 0; + } + if (priv->original_account_name) + g_free (priv->original_account_name); g_free (priv->msg_uid); + g_free (priv->references); + g_free (priv->in_reply_to); g_free (priv->last_search); g_slist_free (priv->font_items_group); g_slist_free (priv->size_items_group); @@ -914,30 +982,45 @@ modest_msg_edit_window_finalize (GObject *obj) } static GdkPixbuf * -pixbuf_from_stream (TnyStream *stream, const gchar *mime_type) +pixbuf_from_stream (TnyStream *stream, const gchar *mime_type, guint64 *stream_size) { GdkPixbufLoader *loader; GdkPixbuf *pixbuf; + guint64 size; + + size = 0; loader = gdk_pixbuf_loader_new_with_mime_type (mime_type, NULL); - if (loader == NULL) + if (loader == NULL) { + if (stream_size) + *stream_size = 0; return NULL; + } tny_stream_reset (TNY_STREAM (stream)); while (!tny_stream_is_eos (TNY_STREAM (stream))) { + GError *error = NULL; unsigned char read_buffer[128]; gint readed; readed = tny_stream_read (TNY_STREAM (stream), (char *) read_buffer, 128); - if (!gdk_pixbuf_loader_write (loader, read_buffer, readed, NULL)) + size += readed; + if (!gdk_pixbuf_loader_write (loader, read_buffer, readed, &error)) { + if (error) + g_free (error); break; + } } pixbuf = gdk_pixbuf_loader_get_pixbuf (loader); - g_object_ref (pixbuf); + if (pixbuf) + g_object_ref (pixbuf); gdk_pixbuf_loader_close (loader, NULL); g_object_unref (loader); + if (!pixbuf) + return NULL; + if (gdk_pixbuf_get_width (pixbuf) > IMAGE_MAX_WIDTH) { GdkPixbuf *new_pixbuf; gint new_height; @@ -948,6 +1031,9 @@ pixbuf_from_stream (TnyStream *stream, const gchar *mime_type) pixbuf = new_pixbuf; } + if (stream_size) + *stream_size = size; + return pixbuf; } @@ -966,17 +1052,23 @@ replace_with_images (ModestMsgEditWindow *self, TnyList *attachments) const gchar *cid = tny_mime_part_get_content_id (part); const gchar *mime_type = tny_mime_part_get_content_type (part); if ((cid != NULL)&&(mime_type != NULL)) { - TnyStream *stream = tny_mime_part_get_stream (part); - GdkPixbuf *pixbuf = pixbuf_from_stream (stream, mime_type); + guint64 stream_size; + TnyStream *stream = tny_mime_part_get_decoded_stream (part); + GdkPixbuf *pixbuf = pixbuf_from_stream (stream, mime_type, &stream_size); + + g_object_unref (stream); if (pixbuf != NULL) { + priv->images_count ++; + priv->images_size += stream_size; wp_text_buffer_replace_image (WP_TEXT_BUFFER (priv->text_buffer), cid, pixbuf); g_object_unref (pixbuf); } } g_object_unref (part); } + g_object_unref (iter); } static void @@ -988,9 +1080,9 @@ get_related_images (ModestMsgEditWindow *self, TnyMsg *msg) content_type = tny_mime_part_get_content_type (TNY_MIME_PART (msg)); - if (content_type && !g_strcasecmp (content_type, "multipart/related")) { + if (content_type && !g_ascii_strcasecmp (content_type, "multipart/related")) { parent = g_object_ref (msg); - } else if (content_type && !g_strcasecmp (content_type, "multipart/mixed")) { + } else if (content_type && !g_ascii_strcasecmp (content_type, "multipart/mixed")) { TnyList *parts = TNY_LIST (tny_simple_list_new ()); TnyIterator *iter; @@ -1000,7 +1092,7 @@ get_related_images (ModestMsgEditWindow *self, TnyMsg *msg) TnyMimePart *part; part = TNY_MIME_PART (tny_iterator_get_current (iter)); content_type = tny_mime_part_get_content_type (part); - if (content_type && !g_strcasecmp (content_type, "multipart/related")) { + if (content_type && !g_ascii_strcasecmp (content_type, "multipart/related")) { parent = part; break; } else { @@ -1035,7 +1127,7 @@ get_related_images (ModestMsgEditWindow *self, TnyMsg *msg) } static void -update_last_cid (ModestMsgEditWindow *self, TnyList *attachments) +update_next_cid (ModestMsgEditWindow *self, TnyList *attachments) { TnyIterator *iter; ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self); @@ -1048,19 +1140,20 @@ update_last_cid (ModestMsgEditWindow *self, TnyList *attachments) if (cid != NULL) { char *invalid = NULL; gint int_cid = strtol (cid, &invalid, 10); - if ((invalid != NULL) && (*invalid == '\0') && (int_cid > priv->last_cid)) { - priv->last_cid = int_cid; + if ((invalid != NULL) && (*invalid == '\0') && (int_cid >= priv->next_cid)) { + priv->next_cid = int_cid + 1; } } g_object_unref (part); } + g_object_unref (iter); } static void set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich) { TnyHeader *header; - const gchar *to, *cc, *bcc, *subject; + gchar *to, *cc, *bcc, *subject; gchar *body; ModestMsgEditWindowPrivate *priv; GtkTextIter iter; @@ -1074,10 +1167,10 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich) priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self); header = tny_msg_get_header (msg); - to = tny_header_get_to (header); - cc = tny_header_get_cc (header); - bcc = tny_header_get_bcc (header); - subject = tny_header_get_subject (header); + to = tny_header_dup_to (header); + cc = tny_header_dup_cc (header); + bcc = tny_header_dup_bcc (header); + subject = tny_header_dup_subject (header); priority_flags = tny_header_get_priority (header); if (to) @@ -1102,6 +1195,7 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich) gtk_entry_set_text (GTK_ENTRY(priv->subject_field), subject); modest_msg_edit_window_set_priority_flags (MODEST_MSG_EDIT_WINDOW(self), priority_flags); + modest_tny_msg_get_references (TNY_MSG (msg), NULL, &(priv->references), &(priv->in_reply_to)); update_window_title (self); @@ -1130,14 +1224,14 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich) gtk_widget_show_all (priv->attachments_caption); } get_related_images (self, msg); - update_last_cid (self, priv->attachments); - update_last_cid (self, priv->images); + update_next_cid (self, priv->attachments); + update_next_cid (self, priv->images); replace_with_images (self, priv->images); if (preserve_is_rich && !is_html) { wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), FALSE); /* Get the default format required from configuration */ - } else if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_PREFER_FORMATTED_TEXT, NULL)) { + } else if (!preserve_is_rich && !modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_PREFER_FORMATTED_TEXT, NULL)) { wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), FALSE); } @@ -1157,7 +1251,7 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich) gtk_text_buffer_get_start_iter (priv->text_buffer, &iter); gtk_text_buffer_place_cursor (priv->text_buffer, &iter); - modest_msg_edit_window_reset_modified (self); + modest_msg_edit_window_set_modified (self, FALSE); modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (self)); modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (self)); @@ -1185,6 +1279,11 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich) } g_object_unref (msg_folder); } + + g_free (to); + g_free (subject); + g_free (cc); + g_free (bcc); } static void @@ -1378,12 +1477,14 @@ modest_msg_edit_window_setup_toolbar (ModestMsgEditWindow *window) ModestWindow* -modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, gboolean preserve_is_rich) +modest_msg_edit_window_new (TnyMsg *msg, + const gchar *account_name, + const gchar *mailbox, /* ignored */ + gboolean preserve_is_rich) { GObject *obj; ModestWindowPrivate *parent_priv; ModestMsgEditWindowPrivate *priv; - ModestPair *account_pair = NULL; ModestDimmingRulesGroup *menu_rules_group = NULL; ModestDimmingRulesGroup *toolbar_rules_group = NULL; ModestDimmingRulesGroup *clipboard_rules_group = NULL; @@ -1404,6 +1505,7 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, gboolean pre hildon_window_set_menu (HILDON_WINDOW (obj), GTK_MENU (parent_priv->menubar)); priv->from_field_protos = get_transports (); modest_combo_box_set_pair_list (MODEST_COMBO_BOX (priv->from_field), priv->from_field_protos); + modest_combo_box_set_active_id (MODEST_COMBO_BOX (priv->from_field), (gpointer) account_name); modest_msg_edit_window_setup_toolbar (MODEST_MSG_EDIT_WINDOW (obj)); hildon_window_add_toolbar (HILDON_WINDOW (obj), GTK_TOOLBAR (priv->find_toolbar)); @@ -1414,9 +1516,7 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, gboolean pre modest_window_set_active_account (MODEST_WINDOW(obj), account_name); - account_pair = modest_pair_list_find_by_first_as_string (priv->from_field_protos, account_name); - if (account_pair != NULL) - modest_combo_box_set_active_id (MODEST_COMBO_BOX (priv->from_field), account_pair->first); + priv->original_account_name = (account_name) ? g_strdup (account_name) : NULL; parent_priv->ui_dimming_manager = modest_ui_dimming_manager_new (); menu_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_MENU, FALSE); @@ -1452,8 +1552,6 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, gboolean pre g_object_unref (menu_rules_group); g_object_unref (toolbar_rules_group); g_object_unref (clipboard_rules_group); - gtk_widget_show_all (GTK_WIDGET (obj)); - set_msg (MODEST_MSG_EDIT_WINDOW (obj), msg, preserve_is_rich); text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), MODEST_MSG_EDIT_WINDOW (obj)); @@ -1463,7 +1561,7 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, gboolean pre modest_window_check_dimming_rules_group (MODEST_WINDOW (obj), MODEST_DIMMING_RULES_CLIPBOARD); priv->update_caption_visibility = TRUE; - modest_msg_edit_window_reset_modified (MODEST_MSG_EDIT_WINDOW (obj)); + modest_msg_edit_window_set_modified (MODEST_MSG_EDIT_WINDOW (obj), FALSE); /* Track account-removed signal, this window should be closed in the case we're creating a mail associated to the account @@ -1473,7 +1571,9 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, gboolean pre "account_removed", G_CALLBACK(on_account_removed), obj); - + + modest_msg_edit_window_clipboard_owner_handle_change_in_idle (MODEST_MSG_EDIT_WINDOW (obj)); + return (ModestWindow*) obj; } @@ -1500,6 +1600,10 @@ get_formatted_data (ModestMsgEditWindow *edit_window) wp_text_buffer_save_document (WP_TEXT_BUFFER(priv->text_buffer), get_formatted_data_cb, &string_buffer); + modest_text_utils_hyperlinkify (string_buffer); + + gtk_text_buffer_set_modified (priv->text_buffer, TRUE); + return g_string_free (string_buffer, FALSE); } @@ -1523,12 +1627,14 @@ modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window) /* don't free these (except from) */ data = g_slice_new0 (MsgData); data->from = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(), - account_name); + account_name, NULL); data->account_name = g_strdup (account_name); data->to = g_strdup (modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->to_field))); data->cc = g_strdup (modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->cc_field))); data->bcc = g_strdup (modest_recpt_editor_get_recipients (MODEST_RECPT_EDITOR (priv->bcc_field))); data->subject = g_strdup (gtk_entry_get_text (GTK_ENTRY (priv->subject_field))); + data->references = g_strdup (priv->references); + data->in_reply_to = g_strdup (priv->in_reply_to); if (priv->draft_msg) { data->draft_msg = g_object_ref (priv->draft_msg); } else if (priv->outbox_msg) { @@ -1595,6 +1701,7 @@ modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window) g_object_unref (part); tny_iterator_next (att_iter); } + g_object_unref (att_iter); data->priority_flags = priv->priority_flags; @@ -1627,6 +1734,8 @@ modest_msg_edit_window_free_msg_data (ModestMsgEditWindow *edit_window, g_free (data->plain_body); g_free (data->html_body); g_free (data->account_name); + g_free (data->in_reply_to); + g_free (data->references); if (data->draft_msg != NULL) { g_object_unref (data->draft_msg); @@ -1641,6 +1750,23 @@ modest_msg_edit_window_free_msg_data (ModestMsgEditWindow *edit_window, g_slice_free (MsgData, data); } +void +modest_msg_edit_window_get_parts_size (ModestMsgEditWindow *window, + gint *parts_count, + guint64 *parts_size) +{ + ModestMsgEditWindowPrivate *priv; + + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); + + modest_attachments_view_get_sizes (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), parts_count, parts_size); + + /* TODO: add images */ + *parts_size += priv->images_size; + *parts_count += priv->images_count; + +} + ModestMsgEditFormat modest_msg_edit_window_get_format (ModestMsgEditWindow *self) { @@ -1783,8 +1909,12 @@ modest_msg_edit_window_set_format_state (ModestMsgEditWindow *self, text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), self); + g_free (buffer_format); g_free (current_format); + /* Check dimming rules */ + modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (self)); + modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (self)); } static void @@ -1825,13 +1955,13 @@ text_buffer_refresh_attributes (WPTextBuffer *buffer, ModestMsgEditWindow *windo switch (buffer_format->justification) { case GTK_JUSTIFY_LEFT: - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentLeftMenu"); + action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentMenu/AlignmentLeftMenu"); break; case GTK_JUSTIFY_CENTER: - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentCenterMenu"); + action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentMenu/AlignmentCenterMenu"); break; case GTK_JUSTIFY_RIGHT: - action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentRightMenu"); + action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/AlignmentMenu/AlignmentRightMenu"); break; default: break; @@ -1996,7 +2126,8 @@ modest_msg_edit_window_select_background_color (ModestMsgEditWindow *window) -static TnyStream* create_stream_for_uri (const gchar* uri) +static TnyStream* +create_stream_for_uri (const gchar* uri) { if (!uri) return NULL; @@ -2006,9 +2137,22 @@ static TnyStream* create_stream_for_uri (const gchar* uri) GnomeVFSHandle *handle = NULL; GnomeVFSResult test = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ); if (test == GNOME_VFS_OK) { - /* Create the tinymail stream: */ - /* Presumably tinymai will call gnome_vfs_close (handle) later. */ - result = TNY_STREAM (tny_vfs_stream_new (handle)); + TnyStream *vfssstream = TNY_STREAM (tny_vfs_stream_new (handle)); + /* Streams over OBEX (Bluetooth) are not seekable but + * we expect them to be (we might need to read them + * several times). So if this is a Bluetooth URI just + * read the whole file into memory (this is not a fast + * protocol so we can assume that these files are not + * going to be very big) */ + if ((g_ascii_strncasecmp (uri, "obex://", 7) == 0)|| + (g_ascii_strncasecmp (uri, "upnpav://", 9) == 0)) { + TnyStream *memstream = tny_camel_mem_stream_new (); + tny_stream_write_to_stream (vfssstream, memstream); + g_object_unref (vfssstream); + result = memstream; + } else { + result = vfssstream; + } } return result; @@ -2032,6 +2176,10 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window) modest_maemo_utils_setup_images_filechooser (GTK_FILE_CHOOSER (dialog)); + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), + GTK_WINDOW (dialog), + GTK_WINDOW (window)); + response = gtk_dialog_run (GTK_DIALOG (dialog)); switch (response) { case GTK_RESPONSE_OK: @@ -2053,43 +2201,59 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window) result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ); if (result == GNOME_VFS_OK) { GdkPixbuf *pixbuf; - GnomeVFSFileInfo info; + GnomeVFSFileInfo *info; gchar *filename, *basename, *escaped_filename; TnyMimePart *mime_part; gchar *content_id; const gchar *mime_type = NULL; GnomeVFSURI *vfs_uri; + guint64 stream_size; + gnome_vfs_close (handle); vfs_uri = gnome_vfs_uri_new (uri); escaped_filename = g_path_get_basename (gnome_vfs_uri_get_path (vfs_uri)); filename = gnome_vfs_unescape_string_for_display (escaped_filename); g_free (escaped_filename); gnome_vfs_uri_unref (vfs_uri); + info = gnome_vfs_file_info_new (); - if (gnome_vfs_get_file_info (uri, &info, GNOME_VFS_FILE_INFO_GET_MIME_TYPE + if (gnome_vfs_get_file_info (uri, info, GNOME_VFS_FILE_INFO_GET_MIME_TYPE | GNOME_VFS_FILE_INFO_FORCE_SLOW_MIME_TYPE) == GNOME_VFS_OK) - mime_type = gnome_vfs_file_info_get_mime_type (&info); + mime_type = gnome_vfs_file_info_get_mime_type (info); mime_part = tny_platform_factory_new_mime_part (modest_runtime_get_platform_factory ()); TnyStream *stream = create_stream_for_uri (uri); + + if (stream == NULL) { + + modest_platform_information_banner (NULL, NULL, + _FM("sfil_ib_opening_not_allowed")); + + g_object_unref (mime_part); + gnome_vfs_file_info_unref (info); + continue; + } + tny_mime_part_construct (mime_part, stream, mime_type, "base64"); - content_id = g_strdup_printf ("%d", priv->last_cid); + content_id = g_strdup_printf ("%d", priv->next_cid); tny_mime_part_set_content_id (mime_part, content_id); g_free (content_id); - priv->last_cid++; + priv->next_cid++; basename = g_path_get_basename (filename); tny_mime_part_set_filename (mime_part, basename); g_free (basename); - pixbuf = pixbuf_from_stream (stream, mime_type); + pixbuf = pixbuf_from_stream (stream, mime_type, &stream_size); if (pixbuf != NULL) { + priv->images_size += stream_size; + priv->images_count ++; insert_mark = gtk_text_buffer_get_insert (GTK_TEXT_BUFFER (priv->text_buffer)); gtk_text_buffer_get_iter_at_mark (GTK_TEXT_BUFFER (priv->text_buffer), &position, insert_mark); wp_text_buffer_insert_image (WP_TEXT_BUFFER (priv->text_buffer), &position, g_strdup (tny_mime_part_get_content_id (mime_part)), pixbuf); @@ -2099,6 +2263,7 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window) gtk_text_buffer_set_modified (priv->text_buffer, TRUE); g_free (filename); g_object_unref (mime_part); + gnome_vfs_file_info_unref (info); } } @@ -2113,10 +2278,22 @@ modest_msg_edit_window_offer_attach_file (ModestMsgEditWindow *window) gint response = 0; GSList *uris = NULL; GSList *uri_node; + GnomeVFSFileSize total_size, allowed_size; + ModestMsgEditWindowPrivate *priv; + gint att_num; + guint64 att_size; + + g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(window)); + + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); + + if (modest_platform_check_memory_low (MODEST_WINDOW(window), TRUE)) + return; dialog = hildon_file_chooser_dialog_new (GTK_WINDOW (window), GTK_FILE_CHOOSER_ACTION_OPEN); gtk_window_set_title (GTK_WINDOW (dialog), _("mcen_ti_select_attachment_title")); gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE); + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (dialog), GTK_WINDOW (window)); response = gtk_dialog_run (GTK_DIALOG (dialog)); switch (response) { @@ -2128,27 +2305,51 @@ modest_msg_edit_window_offer_attach_file (ModestMsgEditWindow *window) } gtk_widget_destroy (dialog); + /* allowed size is the maximum size - what's already there */ + modest_attachments_view_get_sizes ( + MODEST_ATTACHMENTS_VIEW (priv->attachments_view), + &att_num, &att_size); + allowed_size = MODEST_MAX_ATTACHMENT_SIZE - att_size; + + total_size = 0; for (uri_node = uris; uri_node != NULL; uri_node = g_slist_next (uri_node)) { + const gchar *uri = (const gchar *) uri_node->data; - modest_msg_edit_window_attach_file_one (window, uri); + + total_size += modest_msg_edit_window_attach_file_one + (window, uri, allowed_size); + + if (total_size > allowed_size) { + g_warning ("%s: total size: %u", + __FUNCTION__, (unsigned int)total_size); + break; + } + + allowed_size -= total_size; + + } g_slist_foreach (uris, (GFunc) g_free, NULL); g_slist_free (uris); } -void -modest_msg_edit_window_attach_file_one ( - ModestMsgEditWindow *window, - const gchar *uri) + +GnomeVFSFileSize +modest_msg_edit_window_attach_file_one (ModestMsgEditWindow *window, + const gchar *uri, + GnomeVFSFileSize allowed_size) + { - g_return_if_fail (window); - g_return_if_fail (uri); + GnomeVFSHandle *handle = NULL; + ModestMsgEditWindowPrivate *priv; + GnomeVFSResult result; + GnomeVFSFileSize size = 0; + g_return_val_if_fail (window, 0); + g_return_val_if_fail (uri, 0); - ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); - + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); - GnomeVFSHandle *handle = NULL; - GnomeVFSResult result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ); + result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ); if (result == GNOME_VFS_OK) { TnyMimePart *mime_part; TnyStream *stream; @@ -2157,9 +2358,10 @@ modest_msg_edit_window_attach_file_one ( gchar *escaped_filename; gchar *filename; gchar *content_id; - GnomeVFSFileInfo info; + GnomeVFSFileInfo *info; GnomeVFSURI *vfs_uri; + gnome_vfs_close (handle); vfs_uri = gnome_vfs_uri_new (uri); @@ -2167,24 +2369,48 @@ modest_msg_edit_window_attach_file_one ( filename = gnome_vfs_unescape_string_for_display (escaped_filename); g_free (escaped_filename); gnome_vfs_uri_unref (vfs_uri); + + info = gnome_vfs_file_info_new (); if (gnome_vfs_get_file_info (uri, - &info, + info, GNOME_VFS_FILE_INFO_GET_MIME_TYPE) == GNOME_VFS_OK) - mime_type = gnome_vfs_file_info_get_mime_type (&info); + mime_type = gnome_vfs_file_info_get_mime_type (info); mime_part = tny_platform_factory_new_mime_part (modest_runtime_get_platform_factory ()); - stream = TNY_STREAM (tny_vfs_stream_new (handle)); - tny_mime_part_construct (mime_part, stream, mime_type, "base64"); + /* try to get the attachment's size; this may fail for weird + * file systems, like obex, upnp... */ + if (allowed_size != 0 && + info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE) { + size = info->size; + if (size > allowed_size) { + modest_platform_information_banner (NULL, NULL, + _("mail_ib_error_attachment_size")); + return 0; + } + } else + g_debug ("%s: could not get attachment size", __FUNCTION__); + + stream = create_stream_for_uri (uri); + + if (stream == NULL) { + + modest_platform_information_banner (NULL, NULL, _FM("sfil_ib_opening_not_allowed")); + g_object_unref (mime_part); + gnome_vfs_file_info_unref (info); + return 0; + } + + tny_mime_part_construct (mime_part, stream, mime_type, "base64"); g_object_unref (stream); - content_id = g_strdup_printf ("%d", priv->last_cid); + content_id = g_strdup_printf ("%d", priv->next_cid); tny_mime_part_set_content_id (mime_part, content_id); g_free (content_id); - priv->last_cid++; + priv->next_cid++; basename = g_path_get_basename (filename); tny_mime_part_set_filename (mime_part, basename); @@ -2192,13 +2418,17 @@ modest_msg_edit_window_attach_file_one ( tny_list_prepend (priv->attachments, (GObject *) mime_part); modest_attachments_view_add_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), - mime_part); + mime_part, + info->size == 0, info->size); gtk_widget_set_no_show_all (priv->attachments_caption, FALSE); gtk_widget_show_all (priv->attachments_caption); gtk_text_buffer_set_modified (priv->text_buffer, TRUE); g_free (filename); g_object_unref (mime_part); + gnome_vfs_file_info_unref (info); } + + return size; } void @@ -2220,7 +2450,6 @@ modest_msg_edit_window_remove_attachments (ModestMsgEditWindow *window, if (tny_list_get_length (att_list) == 0) { hildon_banner_show_information (NULL, NULL, _("TODO: no attachments selected to remove")); } else { - GtkWidget *confirmation_dialog = NULL; gboolean dialog_response; gchar *message = NULL; gchar *filename = NULL; @@ -2233,7 +2462,7 @@ modest_msg_edit_window_remove_attachments (ModestMsgEditWindow *window, if (TNY_IS_MSG (part)) { TnyHeader *header = tny_msg_get_header (TNY_MSG (part)); if (header) { - filename = g_strdup (tny_header_get_subject (header)); + filename = tny_header_dup_subject (header); g_object_unref (header); } if (filename == NULL) { @@ -2247,13 +2476,13 @@ modest_msg_edit_window_remove_attachments (ModestMsgEditWindow *window, filename = g_strdup (""); } message = g_strdup_printf (ngettext("emev_nc_delete_attachment", "emev_nc_delete_attachments", - (tny_list_get_length (att_list) == 1)), filename); + tny_list_get_length (att_list)), filename); g_free (filename); - confirmation_dialog = hildon_note_new_confirmation (GTK_WINDOW (window), message); + + dialog_response = modest_platform_run_confirmation_dialog (GTK_WINDOW (window), message); g_free (message); - dialog_response = (gtk_dialog_run (GTK_DIALOG (confirmation_dialog))==GTK_RESPONSE_OK); - gtk_widget_destroy (confirmation_dialog); - if (!dialog_response) { + + if (dialog_response != GTK_RESPONSE_OK) { g_object_unref (att_list); return; } @@ -2277,6 +2506,7 @@ modest_msg_edit_window_remove_attachments (ModestMsgEditWindow *window, gtk_text_buffer_set_modified (priv->text_buffer, TRUE); g_object_unref (mime_part); } + g_object_unref (iter); } g_object_unref (att_list); @@ -2452,6 +2682,13 @@ modest_msg_edit_window_open_addressbook (ModestMsgEditWindow *window, g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window)); g_return_if_fail ((editor == NULL) || (MODEST_IS_RECPT_EDITOR (editor))); + + /* we check for low-mem; in that case, show a warning, and don't allow + * for the addressbook + */ + if (modest_platform_check_memory_low (MODEST_WINDOW(window), TRUE)) + return; + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); if (editor == NULL) { @@ -2480,7 +2717,7 @@ modest_msg_edit_window_open_addressbook (ModestMsgEditWindow *window, } - modest_address_book_select_addresses (editor); + modest_address_book_select_addresses (editor, GTK_WINDOW (window)); } @@ -2607,6 +2844,8 @@ modest_msg_edit_window_set_file_format (ModestMsgEditWindow *window, break; } modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window)); + modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window)); + text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), window); } } @@ -2632,6 +2871,8 @@ modest_msg_edit_window_select_font (ModestMsgEditWindow *window) priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); dialog = hildon_font_selection_dialog_new (GTK_WINDOW (window), NULL); + modest_window_mgr_set_modal (modest_runtime_get_window_mgr(), + GTK_WINDOW(dialog), GTK_WINDOW (window)); /* First we get the currently selected font information */ wp_text_buffer_get_attributes (WP_TEXT_BUFFER (priv->text_buffer), &oldfmt, TRUE); @@ -2667,8 +2908,12 @@ modest_msg_edit_window_select_font (ModestMsgEditWindow *window) "family-set", !oldfmt.cs.font, NULL); + modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), + GTK_WINDOW (dialog), GTK_WINDOW (window)); gtk_widget_show_all (dialog); + priv->font_dialog = dialog; response = gtk_dialog_run (GTK_DIALOG (dialog)); + priv->font_dialog = NULL; if (response == GTK_RESPONSE_OK) { g_object_get( dialog, @@ -2754,7 +2999,6 @@ modest_msg_edit_window_undo (ModestMsgEditWindow *window) modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window)); modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (window)); - } void @@ -2886,24 +3130,26 @@ body_changed (GtkTextBuffer *buffer, ModestMsgEditWindow *editor) } void -modest_msg_edit_window_reset_modified (ModestMsgEditWindow *editor) +modest_msg_edit_window_set_modified (ModestMsgEditWindow *editor, + gboolean modified) { ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (editor); GtkTextBuffer *buffer; buffer = modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR(priv->to_field)); - gtk_text_buffer_set_modified (buffer, FALSE); + gtk_text_buffer_set_modified (buffer, modified); buffer = modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR(priv->cc_field)); - gtk_text_buffer_set_modified (buffer, FALSE); + gtk_text_buffer_set_modified (buffer, modified); buffer = modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR(priv->bcc_field)); - gtk_text_buffer_set_modified (buffer, FALSE); - gtk_text_buffer_set_modified (priv->text_buffer, FALSE); + gtk_text_buffer_set_modified (buffer, modified); + gtk_text_buffer_set_modified (priv->text_buffer, modified); } gboolean modest_msg_edit_window_is_modified (ModestMsgEditWindow *editor) { ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (editor); + const char *account_name; GtkTextBuffer *buffer; buffer = modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR(priv->to_field)); @@ -2917,6 +3163,10 @@ modest_msg_edit_window_is_modified (ModestMsgEditWindow *editor) return TRUE; if (gtk_text_buffer_get_modified (priv->text_buffer)) return TRUE; + account_name = modest_combo_box_get_active_id (MODEST_COMBO_BOX (priv->from_field)); + if (!priv->original_account_name || strcmp(account_name, priv->original_account_name)) { + return TRUE; + } return FALSE; } @@ -2928,7 +3178,8 @@ gboolean modest_msg_edit_window_check_names (ModestMsgEditWindow *window, gboolean add_to_addressbook) { ModestMsgEditWindowPrivate *priv = NULL; - + GSList *address_list = NULL; + g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE); priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); @@ -2941,22 +3192,32 @@ modest_msg_edit_window_check_names (ModestMsgEditWindow *window, gboolean add_to return FALSE; } - if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->to_field), add_to_addressbook)) { + /* Check names */ + g_object_ref (window); + if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->to_field), &address_list)) { modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->to_field)); + g_object_unref (window); return FALSE; } - if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->cc_field), add_to_addressbook)) { + if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->cc_field), &address_list)) { modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->cc_field)); + g_object_unref (window); return FALSE; } - if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->bcc_field), add_to_addressbook)) { + if (!modest_address_book_check_names (MODEST_RECPT_EDITOR (priv->bcc_field), &address_list)) { modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->bcc_field)); + g_object_unref (window); return FALSE; } + /* Add contacts to address book */ + if (address_list) + modest_address_book_add_address_list (address_list); + if (!modest_recpt_editor_has_focus (MODEST_RECPT_EDITOR (priv->cc_field)) && !modest_recpt_editor_has_focus (MODEST_RECPT_EDITOR (priv->bcc_field))) modest_recpt_editor_grab_focus (MODEST_RECPT_EDITOR (priv->to_field)); + g_object_unref (window); return TRUE; @@ -2988,6 +3249,7 @@ modest_msg_edit_window_clipboard_owner_change (GtkClipboard *clipboard, if (!GTK_WIDGET_VISIBLE (window)) return; + g_object_ref (window); text = gtk_clipboard_wait_for_text (selection_clipboard); if (priv->clipboard_text != NULL) { @@ -2995,8 +3257,37 @@ modest_msg_edit_window_clipboard_owner_change (GtkClipboard *clipboard, } priv->clipboard_text = text; - modest_window_check_dimming_rules_group (MODEST_WINDOW (window), MODEST_DIMMING_RULES_CLIPBOARD); + if (GTK_WIDGET_VISIBLE (window)) { + modest_window_check_dimming_rules_group (MODEST_WINDOW (window), MODEST_DIMMING_RULES_CLIPBOARD); + } + g_object_unref (window); +} + +static gboolean clipboard_owner_change_idle (gpointer userdata) +{ + ModestMsgEditWindow *window = (ModestMsgEditWindow *) userdata; + ModestMsgEditWindowPrivate *priv; + + gdk_threads_enter (); + g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE); + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); + + priv->clipboard_owner_idle = 0; + modest_msg_edit_window_clipboard_owner_change (NULL, NULL, window); + gdk_threads_leave (); + + return FALSE; } + +static void +modest_msg_edit_window_clipboard_owner_handle_change_in_idle (ModestMsgEditWindow *window) +{ + ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); + if (priv->clipboard_owner_idle == 0) { + priv->clipboard_owner_idle = g_idle_add (clipboard_owner_change_idle, window); + } +} + static void subject_field_move_cursor (GtkEntry *entry, GtkMovementStep step, @@ -3079,55 +3370,12 @@ subject_field_insert_text (GtkEditable *editable, if (result_len + old_length > 1000) { hildon_banner_show_information (GTK_WIDGET (window), NULL, - dgettext("hildon-common-strings", - "ckdg_ib_maximum_characters_reached")); + _CS("ckdg_ib_maximum_characters_reached")); } g_string_free (result, TRUE); } -static void -text_buffer_insert_text (GtkTextBuffer *buffer, - GtkTextIter *iter, - gchar *new_text, - gint new_text_length, - ModestMsgEditWindow *window) -{ - GString *result = g_string_new (""); - gchar *current; - gint result_len = 0; - gboolean changed = FALSE; - - for (current = new_text; current != NULL && *current != '\0'; current = g_utf8_next_char (current)) { - gunichar c = g_utf8_get_char_validated (current, 8); - /* Invalid unichar, stop */ - if (c == -1) - break; - /* a bullet */ - switch (c) { - case 0x2022: - result = g_string_append_c (result, ' '); - changed = TRUE; - break; - default: - result = g_string_append_unichar (result, c); - } - result_len++; - } - - if (changed) { - g_signal_stop_emission_by_name (G_OBJECT (buffer), "insert-text"); - g_signal_handlers_block_by_func(G_OBJECT(buffer), G_CALLBACK(text_buffer_insert_text), window); - g_signal_emit_by_name (buffer, "insert-text", - (gpointer) iter, - (gpointer) result->str, (gpointer) result->len, - (gpointer) window); - g_signal_handlers_unblock_by_func(G_OBJECT(buffer), G_CALLBACK(text_buffer_insert_text), window); - } - - g_string_free (result, TRUE); -} - void modest_msg_edit_window_toggle_find_toolbar (ModestMsgEditWindow *window, gboolean show) @@ -3230,7 +3478,8 @@ modest_msg_edit_window_find_toolbar_search (GtkWidget *widget, g_free (priv->last_search); priv->last_search = NULL; /* Information banner about empty search */ - hildon_banner_show_information (NULL, NULL, dgettext ("hildon-common-strings", "ecdg_ib_find_rep_enter_text")); + hildon_banner_show_information (NULL, NULL, + _CS ("ecdg_ib_find_rep_enter_text")); return; } @@ -3246,20 +3495,23 @@ modest_msg_edit_window_find_toolbar_search (GtkWidget *widget, result = gtk_text_iter_forward_search_insensitive (&selection_end, current_search, &match_start, &match_end); if (!result) - hildon_banner_show_information (NULL, NULL, dgettext ("hildon-libs", "ckct_ib_find_search_complete")); + hildon_banner_show_information (NULL, NULL, + _HL ("ckct_ib_find_search_complete")); } else { GtkTextIter buffer_start; gtk_text_buffer_get_start_iter (priv->text_buffer, &buffer_start); result = gtk_text_iter_forward_search_insensitive (&buffer_start, current_search, &match_start, &match_end); if (!result) - hildon_banner_show_information (NULL, NULL, dgettext ("hildon-libs", "ckct_ib_find_no_matches")); + hildon_banner_show_information (NULL, NULL, + _HL ("ckct_ib_find_no_matches")); } /* Mark as selected the string found in search */ if (result) { gtk_text_buffer_select_range (priv->text_buffer, &match_start, &match_end); gtk_text_view_scroll_to_iter (GTK_TEXT_VIEW (priv->msg_body), &match_start, 0.0, TRUE, 0.0, 0.0); + correct_scroll_without_drag_check (MODEST_MSG_EDIT_WINDOW (window), FALSE); } else { g_free (priv->last_search); priv->last_search = NULL; @@ -3325,7 +3577,7 @@ modest_msg_edit_window_set_draft (ModestMsgEditWindow *window, } priv->msg_uid = modest_tny_folder_get_header_unique_id (header); if (GTK_WIDGET_REALIZED (window)) - modest_window_mgr_register_window (mgr, MODEST_WINDOW (window)); + modest_window_mgr_register_window (mgr, MODEST_WINDOW (window), NULL); } priv->draft_msg = draft; @@ -3340,7 +3592,7 @@ text_buffer_apply_tag (GtkTextBuffer *buffer, GtkTextTag *tag, ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (userdata); gchar *tag_name; - if (tag == NULL+13) return; + if (tag == NULL) return; g_object_get (G_OBJECT (tag), "name", &tag_name, NULL); if ((tag_name != NULL) && (g_str_has_prefix (tag_name, "image-tag-replace-"))) { replace_with_images (window, priv->images); @@ -3355,7 +3607,7 @@ modest_msg_edit_window_add_part (ModestMsgEditWindow *window, g_return_if_fail (TNY_IS_MIME_PART (part)); tny_list_prepend (priv->attachments, (GObject *) part); - modest_attachments_view_add_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), part); + modest_attachments_view_add_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view), part, TRUE, 0); gtk_widget_set_no_show_all (priv->attachments_caption, FALSE); gtk_widget_show_all (priv->attachments_caption); gtk_text_buffer_set_modified (priv->text_buffer, TRUE); @@ -3440,7 +3692,8 @@ on_zoom_minus_plus_not_implemented (ModestWindow *window) { g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window), FALSE); - hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_cannot_zoom_here")); + hildon_banner_show_information (NULL, NULL, + _CS("ckct_ib_cannot_zoom_here")); return FALSE; }