[gnome-builder] ide-source-view: fix move search

[Sébastien Lafargue <slafargue src gnome org>]

commit c7a97487b289bcb072d773991844b38b079ec112
Author: Fangwen Yu <yynyygy gmail com>
Date:   Sat Mar 19 20:43:57 2016 +0800

    ide-source-view: fix move search
    
    https://bugzilla.gnome.org/show_bug.cgi?id=763915

 data/keybindings/vim.css |    6 ++++--
 libide/ide-source-view.c |   12 +++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/data/keybindings/vim.css b/data/keybindings/vim.css
index d4c23c6..deabc1d 100644
--- a/data/keybindings/vim.css
+++ b/data/keybindings/vim.css
@@ -327,7 +327,8 @@
   bind "semicolon" { "movement" (next-match-search-char, 0, 0, 1)
                      "clear-count" () };
 
-  bind "n" { "move-search" (tab-forward, 0, 0, 1, 1, 0) };
+  bind "n" { "movement" (next-char, 0, 1, 0)
+             "move-search" (tab-forward, 0, 0, 1, 1, 0) };
   bind "<shift>n" { "move-search" (tab-backward, 0, 0, 0, 1, 0) };
 
   bind "numbersign" { "movement" (previous-word-end, 0, 1, 1)
@@ -1893,7 +1894,8 @@
   bind "b" { "movement" (previous-word-start, 1, 1, 1) };
   bind "<shift>b" { "movement" (previous-full-word-start, 1, 1, 1) };
 
-  bind "n" { "move-search" (tab-forward, 1, 0, 1, 1, 0) };
+  bind "n" { "movement" (next-char, 1, 1, 0)
+             "move-search" (tab-forward, 1, 0, 1, 1, 0) };
   bind "<shift>n" { "move-search" (tab-backward, 1, 0, 0, 1, 0) };
 
   bind "numbersign" { "save-insert-mark" ()
diff --git a/libide/ide-source-view.c b/libide/ide-source-view.c
index 0d41efa..0641594 100644
--- a/libide/ide-source-view.c
+++ b/libide/ide-source-view.c
@@ -3440,11 +3440,11 @@ ide_source_view__search_forward_cb (GObject      *object,
    */
   if (mv->count > 0)
     {
-      gtk_source_search_context_backward_async (search_context,
-                                                &end,
-                                                NULL,
-                                                ide_source_view__search_forward_cb,
-                                                search_movement_ref (mv));
+      gtk_source_search_context_forward_async (search_context,
+                                               &end,
+                                               NULL,
+                                               ide_source_view__search_forward_cb,
+                                               search_movement_ref (mv));
       return;
     }
 
@@ -3614,7 +3614,6 @@ ide_source_view_real_move_search (IdeSourceView    *self,
 
   if (is_forward)
     {
-      gtk_text_iter_forward_char (&end);
       gtk_source_search_context_forward_async (priv->search_context,
                                                &end,
                                                NULL,
@@ -3623,7 +3622,6 @@ ide_source_view_real_move_search (IdeSourceView    *self,
     }
   else
     {
-      gtk_text_iter_backward_char (&begin);
       gtk_source_search_context_backward_async (priv->search_context,
                                                 &begin,
                                                 NULL,