Use the constant name (TNY_HEADER_FLAG_NORMAL_PRIORITY) and

[modest] / src / modest-ui-dimming-rules.c

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index 77b6d9b..42d1384 100644 (file)
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -1474,7 +1474,8 @@ modest_ui_dimming_rules_on_editor_paste (ModestWindow *win, gpointer user_data)
        if (!dimmed) {
                ModestEmailClipboard *e_clipboard = modest_runtime_get_email_clipboard ();
                dimmed = modest_email_clipboard_cleared (e_clipboard) && 
-                       (modest_msg_edit_window_get_clipboard_text(MODEST_MSG_EDIT_WINDOW (win)) != NULL);
+                       (modest_msg_edit_window_get_clipboard_text(MODEST_MSG_EDIT_WINDOW (win)) == NULL) &&
+                        !gtk_clipboard_wait_is_text_available(gtk_clipboard_get(GDK_SELECTION_CLIPBOARD));
        }
        
        return dimmed;
@@ -2623,3 +2624,15 @@ modest_ui_dimming_rules_on_save_to_drafts (ModestWindow *win,
 
        return dimmed;  
 }
+
+gboolean
+modest_ui_dimming_rules_on_insert_image (ModestWindow *win,
+                                        gpointer user_data)
+{
+       g_return_val_if_fail (MODEST_MSG_EDIT_WINDOW (win), FALSE);
+
+       ModestMsgEditFormat format =
+         modest_msg_edit_window_get_format (MODEST_MSG_EDIT_WINDOW (win));
+
+       return (format != MODEST_MSG_EDIT_FORMAT_HTML);
+}