From: Alberto Garcia <agarcia@igalia.com>
Date: Wed, 17 Oct 2007 11:38:46 +0000 (+0000)
Subject: Check properly the contents of the clipboard before
X-Git-Tag: git_migration_finished~2250
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=69a8e3d5ea1a6a22bca24aebfda27b22074c4107

Check properly the contents of the clipboard before
deciding whether to dim the "Paste" menu option
Fixes NB#73404

pmo-trunk-r3523
---

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index f990644..42d1384 100644
--- 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;