X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-msg-edit-window.c;h=639ecb4f3cfb3167c7ef191982a48322bc11a100;hp=efbc6419a0062cfd465f89e091dbd411b574b725;hb=f4c8ac213f2217771e21aade64fbed16d618a77e;hpb=d5b08938b54760fd913b3e5712375b099452c3ad diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c index efbc641..639ecb4 100644 --- a/src/maemo/modest-msg-edit-window.c +++ b/src/maemo/modest-msg-edit-window.c @@ -169,7 +169,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 +179,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 +245,7 @@ struct _ModestMsgEditWindowPrivate { ModestPairList *from_field_protos; GtkWidget *from_field; + const gchar *original_account_name; GtkWidget *to_field; GtkWidget *cc_field; @@ -492,6 +495,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 +545,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 +553,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 +566,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 +580,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 +620,7 @@ correct_scroll (ModestMsgEditWindow *w) return; } - correct_scroll_without_drag_check (w); + correct_scroll_without_drag_check (w, TRUE); } static void @@ -603,6 +641,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) { @@ -682,6 +744,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 @@ -1447,10 +1512,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); @@ -2970,6 +3040,7 @@ 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)); @@ -2983,6 +3054,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; } @@ -3326,6 +3401,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;