[gtkhtml] Paste of HTML text removes leading/trailing whitespaces

[Milan Crha <mcrha src gnome org>]

commit 3cf4e38a9821abb5bb79e2408d2559415821baec
Author: Milan Crha <mcrha redhat com>
Date:   Thu Jun 27 21:02:43 2013 +0200

    Paste of HTML text removes leading/trailing whitespaces
    
    Even when copying a text within composer with leading or trailing
    whitespace, the text is marked as an HTML text in clipboard, and
    the whitespace is removed on paste, instead of preserved. The added
    code adds whitespaces as necessary.

 gtkhtml/gtkhtml.c |   35 ++++++++++++++++++++++++++++++++---
 1 files changed, 32 insertions(+), 3 deletions(-)
---
diff --git a/gtkhtml/gtkhtml.c b/gtkhtml/gtkhtml.c
index 2098a4e..635ce04 100644
--- a/gtkhtml/gtkhtml.c
+++ b/gtkhtml/gtkhtml.c
@@ -4627,9 +4627,38 @@ clipboard_paste_received_cb (GtkClipboard *clipboard,
                                g_free (utf8);
                                utf8 = cite;
                        }
-                       if (utf8)
-                               gtk_html_insert_html (GTK_HTML (widget), utf8);
-                       else
+                       if (utf8) {
+                               gint leading_spaces = 0;
+
+                               /* check for leading spaces */
+                               while (g_ascii_isspace (utf8[leading_spaces]))
+                                       leading_spaces++;
+
+                               if (leading_spaces)
+                                       html_engine_paste_text (e, utf8, leading_spaces);
+
+                               if (utf8[leading_spaces])
+                                       gtk_html_insert_html (GTK_HTML (widget), utf8 + leading_spaces);
+
+                               /* check for trailing spaces */
+                               length = g_utf8_strlen (utf8, -1);
+                               if (length > leading_spaces) {
+                                       const gchar *ptr, *from = NULL;
+
+                                       ptr = utf8;
+                                       while (ptr = g_utf8_next_char (ptr), ptr && *ptr) {
+                                               if (g_ascii_isspace (*ptr)) {
+                                                       if (!from)
+                                                               from = ptr;
+                                               } else {
+                                                       from = NULL;
+                                               }
+                                       }
+
+                                       if (from)
+                                               html_engine_paste_text (e, from, g_utf8_strlen (from, -1));
+                               }
+                       } else
                                g_warning ("selection was empty");
                } else if ((utf8 = (gchar *) gtk_selection_data_get_text (selection_data))) {
                        utf8 = utf8_filter_out_bom (utf8);