X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-msg-edit-window.c;h=65cefee819448ce9a976311fa6d85fd046f694a9;hp=0f127a32cb053a78a5f27777dd21adafba76e2a6;hb=b3c8a32f002d101d3c94dedcfa68ce6255f97a71;hpb=518e2f866b4ddaa35443cef48c874a358be0851f diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c index 0f127a3..65cefee 100644 --- a/src/maemo/modest-msg-edit-window.c +++ b/src/maemo/modest-msg-edit-window.c @@ -138,6 +138,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,7 +170,7 @@ 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, @@ -179,6 +180,8 @@ static void text_buffer_mark_set (GtkTextBuffer *buffer, void vadj_changed (GtkAdjustment *adj, ModestMsgEditWindow *window); +static ModestPair *find_transport_from_message_sender (ModestPairList *transports, + TnyMsg *msg); @@ -243,6 +246,7 @@ struct _ModestMsgEditWindowPrivate { ModestPairList *from_field_protos; GtkWidget *from_field; + const gchar *original_account_name; GtkWidget *to_field; GtkWidget *cc_field; @@ -286,6 +290,7 @@ 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; @@ -434,6 +439,7 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj) 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; @@ -492,6 +498,41 @@ get_transports (void) return transports; } +/** + * Search an (account, address) ModestPairList for a pair whose + * address matches the one in the From: header of a TnyMsg + * + * @result: A ModestPair * with a matching address, or NULL if none found + */ +static ModestPair * +find_transport_from_message_sender (ModestPairList *transports, TnyMsg *msg) +{ + g_return_val_if_fail (transports, NULL); + g_return_val_if_fail (msg, NULL); + + ModestPair *account_pair = NULL; + TnyHeader *header = tny_msg_get_header (msg); + + if (header != NULL && tny_header_get_from (header)) { + char *from_addr = modest_text_utils_get_email_address (tny_header_get_from (header)); + GSList *iter; + for (iter = transports; iter && !account_pair; iter = iter->next) { + ModestPair *pair = (ModestPair *) iter->data; + char *account_addr = modest_text_utils_get_email_address ((char *) pair->second); + if (account_addr && !strcasecmp(from_addr, account_addr)) { + account_pair = pair; + } + g_free (account_addr); + } + g_free (from_addr); + } + + if (header) + g_object_unref (header); + + return account_pair; +} + static void window_focus (GtkWindow *window, GtkWidget *widget, gpointer userdata) @@ -507,7 +548,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; @@ -515,7 +556,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; @@ -528,7 +569,7 @@ correct_scroll_without_drag_check (ModestMsgEditWindow *w) priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(w); - if (!gtk_widget_is_focus (priv->msg_body)) + if (only_if_focused && !gtk_widget_is_focus (priv->msg_body)) return; insert = gtk_text_buffer_get_insert (priv->text_buffer); @@ -542,7 +583,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)) { @@ -582,7 +623,7 @@ correct_scroll (ModestMsgEditWindow *w) return; } - correct_scroll_without_drag_check (w); + correct_scroll_without_drag_check (w, TRUE); } static void @@ -603,6 +644,30 @@ text_buffer_mark_set (GtkTextBuffer *buffer, gtk_text_buffer_end_user_action (buffer); } +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"); + } +} + void vadj_changed (GtkAdjustment *adj, ModestMsgEditWindow *window) { @@ -631,6 +696,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), "modified-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 (obj), "window-state-event", @@ -682,6 +749,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); + } static void @@ -916,6 +986,10 @@ 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; + } g_free (priv->msg_uid); g_free (priv->last_search); g_slist_free (priv->font_items_group); @@ -948,19 +1022,25 @@ pixbuf_from_stream (TnyStream *stream, const gchar *mime_type, guint64 *stream_s 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); size += readed; - if (!gdk_pixbuf_loader_write (loader, read_buffer, readed, NULL)) + if (!gdk_pixbuf_loader_write (loader, read_buffer, readed, &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; @@ -993,7 +1073,7 @@ replace_with_images (ModestMsgEditWindow *self, TnyList *attachments) const gchar *mime_type = tny_mime_part_get_content_type (part); if ((cid != NULL)&&(mime_type != NULL)) { guint64 stream_size; - TnyStream *stream = tny_mime_part_get_stream (part); + TnyStream *stream = tny_mime_part_get_decoded_stream (part); GdkPixbuf *pixbuf = pixbuf_from_stream (stream, mime_type, &stream_size); @@ -1190,7 +1270,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)); @@ -1447,10 +1527,15 @@ 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); + account_pair = find_transport_from_message_sender (priv->from_field_protos, msg); + if (account_pair == NULL) { + 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_pair ? (const gchar *) account_pair->first : NULL; + parent_priv->ui_dimming_manager = modest_ui_dimming_manager_new (); menu_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_MENU, FALSE); toolbar_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_TOOLBAR, TRUE); @@ -1485,8 +1570,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)); @@ -1496,7 +1579,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 @@ -1506,7 +1589,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; } @@ -1878,13 +1963,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; @@ -2199,14 +2284,16 @@ modest_msg_edit_window_attach_file_one ( ModestMsgEditWindow *window, const gchar *uri) { + GnomeVFSHandle *handle = NULL; + ModestMsgEditWindowPrivate *priv; + GnomeVFSResult result; + g_return_if_fail (window); g_return_if_fail (uri); - 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; @@ -2670,6 +2757,7 @@ modest_msg_edit_window_set_file_format (ModestMsgEditWindow *window, break; } modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (window)); + text_buffer_refresh_attributes (WP_TEXT_BUFFER (priv->text_buffer), window); } } @@ -2949,24 +3037,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)); @@ -2980,6 +3070,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; } @@ -3051,6 +3145,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) { @@ -3058,8 +3153,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, @@ -3323,6 +3447,7 @@ modest_msg_edit_window_find_toolbar_search (GtkWidget *widget, 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;