* src/maemo/modest-msg-edit-window.c:

[modest] / src / maemo / modest-msg-edit-window.c

diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c
index 32a4e17..fad4470 100644 (file)
--- a/src/maemo/modest-msg-edit-window.c
+++ b/src/maemo/modest-msg-edit-window.c
@@ -94,6 +94,7 @@ static void  style_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *ed
 static void  remove_attachment_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor);
 static void  zoom_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor);
 static void  paste_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor);
+static void  copy_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor);
 static void  setup_insensitive_handlers (ModestMsgEditWindow *editor);
 static void  reset_modified (ModestMsgEditWindow *editor);
 
@@ -941,8 +942,6 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name)
 
        restore_settings (MODEST_MSG_EDIT_WINDOW(obj));
                
-       gtk_window_set_icon_from_file (GTK_WINDOW(obj), MODEST_APP_ICON, NULL);
-
        modest_window_set_active_account (MODEST_WINDOW(obj), account_name);
 
        modest_msg_edit_window_setup_toolbar (MODEST_MSG_EDIT_WINDOW (obj));
@@ -2137,10 +2136,12 @@ modest_msg_edit_window_set_file_format (ModestMsgEditWindow *window,
                                        gint file_format)
 {
        ModestMsgEditWindowPrivate *priv;
+       ModestWindowPrivate *parent_priv;
        gint current_format;
 
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
 
+       parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
 
        current_format = wp_text_buffer_is_rich_text (WP_TEXT_BUFFER (priv->text_buffer))
@@ -2158,8 +2159,12 @@ modest_msg_edit_window_set_file_format (ModestMsgEditWindow *window,
                        dialog = hildon_note_new_confirmation (NULL, _("emev_nc_formatting_lost"));
                        response = gtk_dialog_run (GTK_DIALOG (dialog));
                        gtk_widget_destroy (dialog);
-                       if (response == GTK_RESPONSE_OK)
+                       if (response == GTK_RESPONSE_OK) {
                                wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), FALSE);
+                       } else {
+                               GtkToggleAction *action = GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/FileFormatMenu/FileFormatFormattedTextMenu"));
+                               toggle_action_set_active_block_notify (action, TRUE);
+                       }
                }
                        break;
                }
@@ -2396,6 +2401,8 @@ setup_insensitive_handlers (ModestMsgEditWindow *window)
 
        widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/EditMenu/PasteMenu");
        g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (paste_insensitive_press), window);
+       widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar/EditMenu/CopyMenu");
+       g_signal_connect (G_OBJECT (widget), "insensitive-press", G_CALLBACK (copy_insensitive_press), window);
 }
 
 static void  
@@ -2864,6 +2871,13 @@ paste_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor)
                
 }
 
+static void  
+copy_insensitive_press (GtkWidget *widget, ModestMsgEditWindow *editor)
+{
+       hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_unable_to_copy"));
+               
+}
+
 
 static void
 modest_msg_edit_window_system_clipboard_owner_change (GtkClipboard *clipboard,