[gedit/wip/use-tagged-entry: 19/19] ViewFrame: fix bugs about search text (un)escaping

[Sébastien Wilmet <swilmet src gnome org>]

commit c341ee46214dec616d30244d4105bba7998d7ec1
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Wed Jul 17 23:12:00 2013 +0200

    ViewFrame: fix bugs about search text (un)escaping

 gedit/gedit-view-frame.c |  119 ++++++++++++++++++----------------------------
 1 files changed, 46 insertions(+), 73 deletions(-)
---
diff --git a/gedit/gedit-view-frame.c b/gedit/gedit-view-frame.c
index 60d8e56..7d92c8a 100644
--- a/gedit/gedit-view-frame.c
+++ b/gedit/gedit-view-frame.c
@@ -839,95 +839,60 @@ search_entry_insert_text (GtkEditable    *editable,
                           gint           *position,
                           GeditViewFrame *frame)
 {
-       if (frame->priv->search_mode == GOTO_LINE)
-       {
-               gunichar c;
-               const gchar *p;
-               const gchar *end;
-               const gchar *next;
-
-               p = text;
-               end = text + length;
+       gunichar c;
+       const gchar *p;
+       const gchar *end;
+       const gchar *next;
 
-               if (p == end)
-               {
-                       return;
-               }
+       if (frame->priv->search_mode == SEARCH)
+       {
+               return;
+       }
 
-               c = g_utf8_get_char (p);
+       p = text;
+       end = text + length;
 
-               if (((c == '-' || c == '+') && *position == 0) ||
-                   (c == ':' && *position != 0))
-               {
-                       gchar *s = NULL;
+       if (p == end)
+       {
+               return;
+       }
 
-                       if (c == ':')
-                       {
-                               s = gtk_editable_get_chars (editable, 0, -1);
-                               s = g_utf8_strchr (s, -1, ':');
-                       }
+       c = g_utf8_get_char (p);
 
-                       if (s == NULL || s == p)
-                       {
-                               next = g_utf8_next_char (p);
-                               p = next;
-                       }
+       if (((c == '-' || c == '+') && *position == 0) ||
+           (c == ':' && *position != 0))
+       {
+               gchar *s = NULL;
 
-                       g_free (s);
+               if (c == ':')
+               {
+                       s = gtk_editable_get_chars (editable, 0, -1);
+                       s = g_utf8_strchr (s, -1, ':');
                }
 
-               while (p != end)
+               if (s == NULL || s == p)
                {
                        next = g_utf8_next_char (p);
-
-                       c = g_utf8_get_char (p);
-
-                       if (!g_unichar_isdigit (c))
-                       {
-                               g_signal_stop_emission_by_name (editable, "insert_text");
-                               gtk_widget_error_bell (GTK_WIDGET (frame->priv->search_entry));
-                               break;
-                       }
-
                        p = next;
                }
-       }
-       else
-       {
-               /* SEARCH mode */
-               static gboolean  insert_text = FALSE;
-               gchar           *escaped_text;
-               gint             new_len;
-
-               gedit_debug_message (DEBUG_SEARCH, "Text: %s", text);
-
-               /* To avoid recursive behavior */
-               if (insert_text)
-               {
-                       return;
-               }
 
-               escaped_text = gtk_source_utils_escape_search_text (text);
+               g_free (s);
+       }
 
-               gedit_debug_message (DEBUG_SEARCH, "Escaped Text: %s", escaped_text);
+       while (p != end)
+       {
+               next = g_utf8_next_char (p);
 
-               new_len = strlen (escaped_text);
+               c = g_utf8_get_char (p);
 
-               if (new_len == length)
+               if (!g_unichar_isdigit (c))
                {
-                       g_free (escaped_text);
-                       return;
+                       g_signal_stop_emission_by_name (editable, "insert_text");
+                       gtk_widget_error_bell (GTK_WIDGET (frame->priv->search_entry));
+                       break;
                }
 
-               insert_text = TRUE;
-
-               g_signal_stop_emission_by_name (editable, "insert_text");
-
-               gtk_editable_insert_text (editable, escaped_text, new_len, position);
-
-               insert_text = FALSE;
-
-               g_free (escaped_text);
+               p = next;
        }
 }
 
@@ -1265,19 +1230,27 @@ init_search_entry (GeditViewFrame *frame)
 
                if (selection_exists && (search_text != NULL) && (selection_len <= 160))
                {
-                       gtk_entry_set_text (GTK_ENTRY (frame->priv->search_entry), search_text);
+                       gchar *search_text_escaped = gtk_source_utils_escape_search_text (search_text);
+
+                       gtk_entry_set_text (GTK_ENTRY (frame->priv->search_entry),
+                                           search_text_escaped);
 
                        gtk_editable_set_position (GTK_EDITABLE (frame->priv->search_entry),
                                                   -1);
+
+                       g_free (search_text_escaped);
                }
                else if (old_search_text != NULL)
                {
+                       gchar *old_search_text_escaped = gtk_source_utils_escape_search_text 
(old_search_text);
+
                        g_free (frame->priv->old_search_text);
-                       frame->priv->old_search_text = g_strdup (old_search_text);
+                       frame->priv->old_search_text = old_search_text_escaped;
                        g_signal_handler_block (frame->priv->search_entry,
                                                frame->priv->search_entry_changed_id);
 
-                       gtk_entry_set_text (GTK_ENTRY (frame->priv->search_entry), old_search_text);
+                       gtk_entry_set_text (GTK_ENTRY (frame->priv->search_entry),
+                                           old_search_text_escaped);
 
                        gtk_editable_select_region (GTK_EDITABLE (frame->priv->search_entry),
                                                    0, -1);