[gedit/wip/use-gsv-search: 18/19] GeditDocument: enable/disable search highlighting with gsv API

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

commit f6f2caf62ba16c7f91958d3de4ff72763b48ae9b
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Fri Jul 12 23:21:13 2013 +0200

    GeditDocument: enable/disable search highlighting with gsv API

 gedit/gedit-document.c |   45 ++++++++++++++-------------------------------
 gedit/gedit-document.h |    4 ++--
 2 files changed, 16 insertions(+), 33 deletions(-)
---
diff --git a/gedit/gedit-document.c b/gedit/gedit-document.c
index 3642bb8..1174938 100644
--- a/gedit/gedit-document.c
+++ b/gedit/gedit-document.c
@@ -351,9 +351,7 @@ gedit_document_get_property (GObject    *object,
                        g_value_set_boolean (value, gedit_document_get_can_search_again (doc));
                        break;
                case PROP_ENABLE_SEARCH_HIGHLIGHTING:
-                       G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-                       g_value_set_boolean (value, gedit_document_get_enable_search_highlighting (doc));
-                       G_GNUC_END_IGNORE_DEPRECATIONS;
+                       g_value_set_boolean (value, gtk_source_buffer_get_highlight_search (GTK_SOURCE_BUFFER 
(doc)));
                        break;
                case PROP_NEWLINE_TYPE:
                        g_value_set_enum (value, doc->priv->newline_type);
@@ -399,10 +397,8 @@ gedit_document_set_property (GObject      *object,
                                                         g_value_get_string (value));
                        break;
                case PROP_ENABLE_SEARCH_HIGHLIGHTING:
-                       G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-                       gedit_document_set_enable_search_highlighting (doc,
-                                                                      g_value_get_boolean (value));
-                       G_GNUC_END_IGNORE_DEPRECATIONS;
+                       gtk_source_buffer_set_highlight_search (GTK_SOURCE_BUFFER (doc),
+                                                               g_value_get_boolean (value));
                        break;
                case PROP_NEWLINE_TYPE:
                        set_newline_type (doc,
@@ -539,7 +535,7 @@ gedit_document_class_init (GeditDocumentClass *klass)
        /**
         * GeditDocument:enable-search-highlighting:
         *
-        * Deprecated: 3.10: Use the search and replace API in #GtkSourceBuffer.
+        * Deprecated: 3.10: Use the #GtkSourceBuffer:highlight-search property.
         */
        g_object_class_install_property (object_class, PROP_ENABLE_SEARCH_HIGHLIGHTING,
                                         g_param_spec_boolean ("enable-search-highlighting",
@@ -1000,7 +996,7 @@ gedit_document_init (GeditDocument *doc)
        g_settings_bind (priv->editor_settings,
                         GEDIT_SETTINGS_SEARCH_HIGHLIGHTING,
                         doc,
-                        "enable-search-highlighting",
+                        "highlight-search",
                         G_SETTINGS_BIND_GET);
 
        style_scheme = get_default_style_scheme (priv->editor_settings);
@@ -2313,9 +2309,6 @@ gedit_document_search_backward (GeditDocument     *doc,
  */
 
 /* FIXME this is an issue for introspection regardning @find */
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
-
 gint
 gedit_document_replace_all (GeditDocument       *doc,
                            const gchar         *find,
@@ -2370,8 +2363,8 @@ gedit_document_replace_all (GeditDocument       *doc,
        gtk_source_buffer_set_highlight_matching_brackets (GTK_SOURCE_BUFFER (buffer), FALSE);
 
        /* and do search highliting later */
-       search_highliting = gedit_document_get_enable_search_highlighting (doc);
-       gedit_document_set_enable_search_highlighting (doc, FALSE);
+       search_highliting = gtk_source_buffer_get_highlight_search (GTK_SOURCE_BUFFER (buffer));
+       gtk_source_buffer_set_highlight_search (GTK_SOURCE_BUFFER (buffer), FALSE);
 
        gtk_text_buffer_begin_user_action (buffer);
 
@@ -2425,7 +2418,9 @@ gedit_document_replace_all (GeditDocument       *doc,
 
        gtk_source_buffer_set_highlight_matching_brackets (GTK_SOURCE_BUFFER (buffer),
                                                           brackets_highlighting);
-       gedit_document_set_enable_search_highlighting (doc, search_highliting);
+
+       gtk_source_buffer_set_highlight_search (GTK_SOURCE_BUFFER (buffer),
+                                               search_highliting);
 
        g_free (search_text);
        g_free (replace_text);
@@ -2433,8 +2428,6 @@ gedit_document_replace_all (GeditDocument       *doc,
        return cont;
 }
 
-G_GNUC_END_IGNORE_DEPRECATIONS;
-
 static void
 get_style_colors (GeditDocument *doc,
                   const gchar   *style_name,
@@ -2645,7 +2638,7 @@ _gedit_document_get_seconds_since_last_save_or_load (GeditDocument *doc)
  * @doc:
  * @enable:
  *
- * Deprecated: 3.10
+ * Deprecated: 3.10: Use gtk_source_buffer_set_highlight_search() instead.
  */
 void
 gedit_document_set_enable_search_highlighting (GeditDocument *doc,
@@ -2653,31 +2646,21 @@ gedit_document_set_enable_search_highlighting (GeditDocument *doc,
 {
        g_return_if_fail (GEDIT_IS_DOCUMENT (doc));
 
-       if (!enable)
-       {
-               gtk_source_buffer_set_search_text (GTK_SOURCE_BUFFER (doc), NULL);
-               return;
-       }
-
-       if (gedit_document_get_can_search_again (doc))
-       {
-               gtk_source_buffer_set_search_text (GTK_SOURCE_BUFFER (doc),
-                                                  doc->priv->search_text);
-       }
+       gtk_source_buffer_set_highlight_search (GTK_SOURCE_BUFFER (doc), enable);
 }
 
 /**
  * gedit_document_get_enable_search_highlighting:
  * @doc:
  *
- * Deprecated: 3.10
+ * Deprecated: 3.10: Use gtk_source_buffer_get_highlight_search() instead.
  */
 gboolean
 gedit_document_get_enable_search_highlighting (GeditDocument *doc)
 {
        g_return_val_if_fail (GEDIT_IS_DOCUMENT (doc), FALSE);
 
-       return gtk_source_buffer_get_search_text (GTK_SOURCE_BUFFER (doc)) != NULL;
+       return gtk_source_buffer_get_highlight_search (GTK_SOURCE_BUFFER (doc));
 }
 
 GeditDocumentNewlineType
diff --git a/gedit/gedit-document.h b/gedit/gedit-document.h
index 0842f30..16c93fc 100644
--- a/gedit/gedit-document.h
+++ b/gedit/gedit-document.h
@@ -307,12 +307,12 @@ GtkSourceLanguage
 const GeditEncoding
                *gedit_document_get_encoding    (GeditDocument       *doc);
 
-G_DEPRECATED
+G_DEPRECATED_FOR (gtk_source_buffer_set_highlight_search)
 void            gedit_document_set_enable_search_highlighting
                                                (GeditDocument       *doc,
                                                 gboolean             enable);
 
-G_DEPRECATED
+G_DEPRECATED_FOR (gtk_source_buffer_get_highlight_search)
 gboolean        gedit_document_get_enable_search_highlighting
                                                (GeditDocument       *doc);