[gtksourceview] SearchContext: rename forward_finish2() -> forward_finish()



commit 122673d57e1d363625302a14f2a6b3f2f669fdfd
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Tue Nov 15 18:16:07 2016 +0100

    SearchContext: rename forward_finish2() -> forward_finish()
    
    https://bugzilla.gnome.org/show_bug.cgi?id=773249

 docs/reference/gtksourceview-4.0-sections.txt |    2 +-
 gtksourceview/gtksourcesearchcontext.c        |   26 ++++++++++++------------
 gtksourceview/gtksourcesearchcontext.h        |    2 +-
 tests/test-search.c                           |   12 +++++-----
 testsuite/test-search-context.c               |   12 +++++-----
 5 files changed, 27 insertions(+), 27 deletions(-)
---
diff --git a/docs/reference/gtksourceview-4.0-sections.txt b/docs/reference/gtksourceview-4.0-sections.txt
index 41c7651..7e656c6 100644
--- a/docs/reference/gtksourceview-4.0-sections.txt
+++ b/docs/reference/gtksourceview-4.0-sections.txt
@@ -684,7 +684,7 @@ gtk_source_search_context_get_occurrences_count
 gtk_source_search_context_get_occurrence_position
 gtk_source_search_context_forward
 gtk_source_search_context_forward_async
-gtk_source_search_context_forward_finish2
+gtk_source_search_context_forward_finish
 gtk_source_search_context_backward2
 gtk_source_search_context_backward_async
 gtk_source_search_context_backward_finish2
diff --git a/gtksourceview/gtksourcesearchcontext.c b/gtksourceview/gtksourcesearchcontext.c
index 941e5dd..ad12058 100644
--- a/gtksourceview/gtksourcesearchcontext.c
+++ b/gtksourceview/gtksourcesearchcontext.c
@@ -3298,7 +3298,7 @@ gtk_source_search_context_forward_async (GtkSourceSearchContext *search,
 }
 
 /**
- * gtk_source_search_context_forward_finish2:
+ * gtk_source_search_context_forward_finish:
  * @search: a #GtkSourceSearchContext.
  * @result: a #GAsyncResult.
  * @match_start: (out) (optional): return location for start of match, or %NULL.
@@ -3317,12 +3317,12 @@ gtk_source_search_context_forward_async (GtkSourceSearchContext *search,
  * Since: 3.22
  */
 gboolean
-gtk_source_search_context_forward_finish2 (GtkSourceSearchContext  *search,
-                                          GAsyncResult            *result,
-                                          GtkTextIter             *match_start,
-                                          GtkTextIter             *match_end,
-                                          gboolean                *has_wrapped_around,
-                                          GError                 **error)
+gtk_source_search_context_forward_finish (GtkSourceSearchContext  *search,
+                                         GAsyncResult            *result,
+                                         GtkTextIter             *match_start,
+                                         GtkTextIter             *match_end,
+                                         gboolean                *has_wrapped_around,
+                                         GError                 **error)
 {
        ForwardBackwardData *data;
        gboolean found;
@@ -3517,12 +3517,12 @@ gtk_source_search_context_backward_finish2 (GtkSourceSearchContext  *search,
                                            gboolean                *has_wrapped_around,
                                            GError                 **error)
 {
-       return gtk_source_search_context_forward_finish2 (search,
-                                                         result,
-                                                         match_start,
-                                                         match_end,
-                                                         has_wrapped_around,
-                                                         error);
+       return gtk_source_search_context_forward_finish (search,
+                                                        result,
+                                                        match_start,
+                                                        match_end,
+                                                        has_wrapped_around,
+                                                        error);
 }
 
 /* If correctly replaced, returns %TRUE and @match_end is updated to point to
diff --git a/gtksourceview/gtksourcesearchcontext.h b/gtksourceview/gtksourcesearchcontext.h
index b15b377..cef2abb 100644
--- a/gtksourceview/gtksourcesearchcontext.h
+++ b/gtksourceview/gtksourcesearchcontext.h
@@ -108,7 +108,7 @@ void                         gtk_source_search_context_forward_async                
(GtkSourceSearchContext  *searc
                                                                                 gpointer                 
user_data);
 
 GTK_SOURCE_AVAILABLE_IN_3_22
-gboolean                gtk_source_search_context_forward_finish2              (GtkSourceSearchContext  
*search,
+gboolean                gtk_source_search_context_forward_finish               (GtkSourceSearchContext  
*search,
                                                                                 GAsyncResult            
*result,
                                                                                 GtkTextIter             
*match_start,
                                                                                 GtkTextIter             
*match_end,
diff --git a/tests/test-search.c b/tests/test-search.c
index 5c62598..61f7ef8 100644
--- a/tests/test-search.c
+++ b/tests/test-search.c
@@ -223,12 +223,12 @@ forward_search_finished (GtkSourceSearchContext *search_context,
        GtkTextIter match_start;
        GtkTextIter match_end;
 
-       if (gtk_source_search_context_forward_finish2 (search_context,
-                                                      result,
-                                                      &match_start,
-                                                      &match_end,
-                                                      NULL,
-                                                      NULL))
+       if (gtk_source_search_context_forward_finish (search_context,
+                                                     result,
+                                                     &match_start,
+                                                     &match_end,
+                                                     NULL,
+                                                     NULL))
        {
                select_search_occurrence (search, &match_start, &match_end);
        }
diff --git a/testsuite/test-search-context.c b/testsuite/test-search-context.c
index d84fbd1..e7ef896 100644
--- a/testsuite/test-search-context.c
+++ b/testsuite/test-search-context.c
@@ -490,12 +490,12 @@ finish_check_result (GtkSourceSearchContext *context,
 
        if (data->forward)
        {
-               found = gtk_source_search_context_forward_finish2 (context,
-                                                                  result,
-                                                                  &match_start,
-                                                                  &match_end,
-                                                                  &has_wrapped_around,
-                                                                  NULL);
+               found = gtk_source_search_context_forward_finish (context,
+                                                                 result,
+                                                                 &match_start,
+                                                                 &match_end,
+                                                                 &has_wrapped_around,
+                                                                 NULL);
        }
        else
        {


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