* src/modest-account-mgr-helpers.[ch],

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

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index cebe023..b637877 100644 (file)
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -1515,9 +1515,10 @@ modest_ui_dimming_rules_on_editor_paste (ModestWindow *win, gpointer user_data)
 
        if (!dimmed) {
                ModestEmailClipboard *e_clipboard = modest_runtime_get_email_clipboard ();
+               const gchar *clipboard_text = modest_msg_edit_window_get_clipboard_text (MODEST_MSG_EDIT_WINDOW (win));
+
                dimmed = modest_email_clipboard_cleared (e_clipboard) && 
-                       (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));
+                 ((clipboard_text == NULL) || (clipboard_text[0] == '\0'));
        }
        
        return dimmed;