[gtksourceview] Don't use gtk_text_iter_begins_tag() (deprecated)



commit ddb6136a43b1d8450d87354439975af0d8b6d873
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Tue Dec 8 20:15:04 2015 +0100

    Don't use gtk_text_iter_begins_tag() (deprecated)
    
    Use gtk_text_iter_starts_tag() instead.
    It currently depends on GTK+ git master.

 README                                 |    2 +-
 configure.ac                           |    2 +-
 gtksourceview/gtksourcebuffer.c        |    2 +-
 gtksourceview/gtksourcesearchcontext.c |   20 ++++++++++----------
 4 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/README b/README
index 118c47f..8df8392 100644
--- a/README
+++ b/README
@@ -29,7 +29,7 @@ the GNU Lesser General Public License.
 Installation
 ============
 
-GtkSourceView requires GLib >= 2.47.0, GTK+ >= 3.19.3 and libxml2 >= 2.6.
+GtkSourceView requires GLib >= 2.47.0, GTK+ >= 3.19.4 and libxml2 >= 2.6.
 
 Simple install procedure:
 
diff --git a/configure.ac b/configure.ac
index 1863450..bfc04f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,7 @@ AC_SUBST(GSV_LT_VERSION)
 
 # Dependencies
 glib_req=2.47.0
-gtk_req=3.19.3
+gtk_req=3.19.4
 libxml_req=2.6.0
 gladeui_req=3.9
 
diff --git a/gtksourceview/gtksourcebuffer.c b/gtksourceview/gtksourcebuffer.c
index 8b28ba2..4312df2 100644
--- a/gtksourceview/gtksourcebuffer.c
+++ b/gtksourceview/gtksourcebuffer.c
@@ -3020,7 +3020,7 @@ _gtk_source_buffer_has_invalid_chars (GtkSourceBuffer *buffer)
 
        gtk_text_buffer_get_start_iter (GTK_TEXT_BUFFER (buffer), &start);
 
-       if (gtk_text_iter_begins_tag (&start, buffer->priv->invalid_char_tag) ||
+       if (gtk_text_iter_starts_tag (&start, buffer->priv->invalid_char_tag) ||
            gtk_text_iter_forward_to_tag_toggle (&start, buffer->priv->invalid_char_tag))
        {
                return TRUE;
diff --git a/gtksourceview/gtksourcesearchcontext.c b/gtksourceview/gtksourcesearchcontext.c
index d7f8f48..614c216 100644
--- a/gtksourceview/gtksourcesearchcontext.c
+++ b/gtksourceview/gtksourcesearchcontext.c
@@ -1045,7 +1045,7 @@ smart_forward_search_async_step (GtkSourceSearchContext *search,
        {
                gtk_text_iter_forward_to_tag_toggle (&iter, search->priv->found_tag);
        }
-       else if (!gtk_text_iter_begins_tag (&iter, search->priv->found_tag))
+       else if (!gtk_text_iter_starts_tag (&iter, search->priv->found_tag))
        {
                gtk_text_iter_backward_to_tag_toggle (&iter, search->priv->found_tag);
                region_start = iter;
@@ -1175,7 +1175,7 @@ smart_backward_search_async_step (GtkSourceSearchContext *search,
                return TRUE;
        }
 
-       if (gtk_text_iter_begins_tag (&iter, search->priv->found_tag) ||
+       if (gtk_text_iter_starts_tag (&iter, search->priv->found_tag) ||
            (!gtk_text_iter_has_tag (&iter, search->priv->found_tag) &&
             !gtk_text_iter_ends_tag (&iter, search->priv->found_tag)))
        {
@@ -1321,7 +1321,7 @@ adjust_subregion (GtkSourceSearchContext *search,
                        GtkTextIter tag_end = *start;
                        GtkTextRegion *region;
 
-                       if (!gtk_text_iter_begins_tag (&tag_start, search->priv->found_tag))
+                       if (!gtk_text_iter_starts_tag (&tag_start, search->priv->found_tag))
                        {
                                gtk_text_iter_backward_to_tag_toggle (&tag_start, search->priv->found_tag);
                        }
@@ -1363,7 +1363,7 @@ adjust_subregion (GtkSourceSearchContext *search,
                {
                        /* 'end' is in a correct match, we can skip it. */
 
-                       if (!gtk_text_iter_begins_tag (end, search->priv->found_tag))
+                       if (!gtk_text_iter_starts_tag (end, search->priv->found_tag))
                        {
                                gtk_text_iter_backward_to_tag_toggle (end, search->priv->found_tag);
                        }
@@ -1374,7 +1374,7 @@ adjust_subregion (GtkSourceSearchContext *search,
                        GtkTextIter tag_end = *end;
                        GtkTextRegion *region;
 
-                       if (!gtk_text_iter_begins_tag (&tag_start, search->priv->found_tag))
+                       if (!gtk_text_iter_starts_tag (&tag_start, search->priv->found_tag))
                        {
                                gtk_text_iter_backward_to_tag_toggle (&tag_start, search->priv->found_tag);
                        }
@@ -1449,7 +1449,7 @@ smart_forward_search_without_scanning (GtkSourceSearchContext *search,
                {
                        gtk_text_iter_forward_to_tag_toggle (&iter, search->priv->found_tag);
                }
-               else if (!gtk_text_iter_begins_tag (&iter, search->priv->found_tag))
+               else if (!gtk_text_iter_starts_tag (&iter, search->priv->found_tag))
                {
                        gtk_text_iter_backward_to_tag_toggle (&iter, search->priv->found_tag);
                }
@@ -1491,13 +1491,13 @@ remove_occurrences_in_range (GtkSourceSearchContext *search,
        GtkTextIter match_end;
 
        if (gtk_text_iter_has_tag (start, search->priv->found_tag) &&
-           !gtk_text_iter_begins_tag (start, search->priv->found_tag))
+           !gtk_text_iter_starts_tag (start, search->priv->found_tag))
        {
                gtk_text_iter_backward_to_tag_toggle (start, search->priv->found_tag);
        }
 
        if (gtk_text_iter_has_tag (end, search->priv->found_tag) &&
-           !gtk_text_iter_begins_tag (end, search->priv->found_tag))
+           !gtk_text_iter_starts_tag (end, search->priv->found_tag))
        {
                gtk_text_iter_forward_to_tag_toggle (end, search->priv->found_tag);
        }
@@ -2173,7 +2173,7 @@ smart_forward_search_step (GtkSourceSearchContext *search,
        {
                gtk_text_iter_forward_to_tag_toggle (&iter, search->priv->found_tag);
        }
-       else if (!gtk_text_iter_begins_tag (&iter, search->priv->found_tag))
+       else if (!gtk_text_iter_starts_tag (&iter, search->priv->found_tag))
        {
                gtk_text_iter_backward_to_tag_toggle (&iter, search->priv->found_tag);
                region_start = iter;
@@ -2266,7 +2266,7 @@ smart_backward_search_step (GtkSourceSearchContext *search,
        GtkTextIter region_end = *start_at;
        GtkTextRegion *region = NULL;
 
-       if (gtk_text_iter_begins_tag (&iter, search->priv->found_tag) ||
+       if (gtk_text_iter_starts_tag (&iter, search->priv->found_tag) ||
            (!gtk_text_iter_has_tag (&iter, search->priv->found_tag) &&
             !gtk_text_iter_ends_tag (&iter, search->priv->found_tag)))
        {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]