[evolution/gnome-3-18] EComposerPrivate - Critical warning when pasting empty clipboard content

[Tomas Popela <tpopela src gnome org>]

commit 0b1e1499cbe6281bab9497c555685e8246d7b520
Author: Tomas Popela <tpopela redhat com>
Date:   Fri Dec 11 10:49:50 2015 +0100

    EComposerPrivate - Critical warning when pasting empty clipboard content

 composer/e-composer-private.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index dfe1597..9be3186 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -519,7 +519,9 @@ e_composer_paste_html (EMsgComposer *composer,
        g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
        g_return_val_if_fail (GTK_IS_CLIPBOARD (clipboard), FALSE);
 
-       html = e_clipboard_wait_for_html (clipboard);
+       if (!(html = e_clipboard_wait_for_html (clipboard)))
+               return FALSE;
+
        g_return_val_if_fail (html != NULL, FALSE);
 
        editor = e_msg_composer_get_editor (composer);
@@ -627,8 +629,8 @@ e_composer_paste_text (EMsgComposer *composer,
        g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);
        g_return_val_if_fail (GTK_IS_CLIPBOARD (clipboard), FALSE);
 
-       text = gtk_clipboard_wait_for_text (clipboard);
-       g_return_val_if_fail (text != NULL, FALSE);
+       if (!(text = gtk_clipboard_wait_for_text (clipboard)))
+               return FALSE;
 
        editor = e_msg_composer_get_editor (composer);
        view = e_html_editor_get_view (editor);