[gedit] search: use forward_finish2() and backward_finish2()



commit d3391e58dfec3bc76119274d86807845e7daa412
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Sat Jun 11 15:51:59 2016 +0200

    search: use forward_finish2() and backward_finish2()
    
    gtk_source_search_context_forward_finish() and
    gtk_source_search_context_backward_finish() are deprecated.

 gedit/gedit-commands-search.c |   22 ++++++++++++----------
 gedit/gedit-view-frame.c      |   33 ++++++++++++++++++---------------
 2 files changed, 30 insertions(+), 25 deletions(-)
---
diff --git a/gedit/gedit-commands-search.c b/gedit/gedit-commands-search.c
index 72016ae..2b6e479 100644
--- a/gedit/gedit-commands-search.c
+++ b/gedit/gedit-commands-search.c
@@ -174,11 +174,12 @@ forward_search_finished (GtkSourceSearchContext *search_context,
        GtkTextIter match_start;
        GtkTextIter match_end;
 
-       found = gtk_source_search_context_forward_finish (search_context,
-                                                         result,
-                                                         &match_start,
-                                                         &match_end,
-                                                         NULL);
+       found = gtk_source_search_context_forward_finish2 (search_context,
+                                                          result,
+                                                          &match_start,
+                                                          &match_end,
+                                                          NULL,
+                                                          NULL);
 
        buffer = gtk_source_search_context_get_buffer (search_context);
 
@@ -279,11 +280,12 @@ backward_search_finished (GtkSourceSearchContext *search_context,
        GtkTextIter match_end;
        GtkSourceBuffer *buffer;
 
-       found = gtk_source_search_context_backward_finish (search_context,
-                                                          result,
-                                                          &match_start,
-                                                          &match_end,
-                                                          NULL);
+       found = gtk_source_search_context_backward_finish2 (search_context,
+                                                           result,
+                                                           &match_start,
+                                                           &match_end,
+                                                           NULL,
+                                                           NULL);
 
        buffer = gtk_source_search_context_get_buffer (search_context);
 
diff --git a/gedit/gedit-view-frame.c b/gedit/gedit-view-frame.c
index e54f32a..059232f 100644
--- a/gedit/gedit-view-frame.c
+++ b/gedit/gedit-view-frame.c
@@ -323,11 +323,12 @@ start_search_finished (GtkSourceSearchContext *search_context,
        gboolean found;
        GtkSourceBuffer *buffer;
 
-       found = gtk_source_search_context_forward_finish (search_context,
-                                                         result,
-                                                         &match_start,
-                                                         &match_end,
-                                                         NULL);
+       found = gtk_source_search_context_forward_finish2 (search_context,
+                                                          result,
+                                                          &match_start,
+                                                          &match_end,
+                                                          NULL,
+                                                          NULL);
 
        buffer = gtk_source_search_context_get_buffer (search_context);
 
@@ -386,11 +387,12 @@ forward_search_finished (GtkSourceSearchContext *search_context,
        GtkTextIter match_end;
        gboolean found;
 
-       found = gtk_source_search_context_forward_finish (search_context,
-                                                         result,
-                                                         &match_start,
-                                                         &match_end,
-                                                         NULL);
+       found = gtk_source_search_context_forward_finish2 (search_context,
+                                                          result,
+                                                          &match_start,
+                                                          &match_end,
+                                                          NULL,
+                                                          NULL);
 
        if (found)
        {
@@ -443,11 +445,12 @@ backward_search_finished (GtkSourceSearchContext *search_context,
        gboolean found;
        GtkSourceBuffer *buffer;
 
-       found = gtk_source_search_context_backward_finish (search_context,
-                                                          result,
-                                                          &match_start,
-                                                          &match_end,
-                                                          NULL);
+       found = gtk_source_search_context_backward_finish2 (search_context,
+                                                           result,
+                                                           &match_start,
+                                                           &match_end,
+                                                           NULL,
+                                                           NULL);
 
        buffer = gtk_source_search_context_get_buffer (search_context);
 


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