[gnome-builder] vim: move vim command parser into command-bar plugin

[Christian Hergert <chergert src gnome org>]

commit 723c1e62fa7ad0462c13c8e5a45f7c2fc2fcd8e6
Author: Christian Hergert <christian hergert me>
Date:   Mon Jun 8 12:55:13 2015 -0700

    vim: move vim command parser into command-bar plugin

 plugins/command-bar/Makefile.am           |    3 ++-
 {src/vim => plugins/command-bar}/gb-vim.c |   12 ++++++------
 {src/vim => plugins/command-bar}/gb-vim.h |    0
 src/Makefile.am                           |    3 ---
 4 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/plugins/command-bar/Makefile.am b/plugins/command-bar/Makefile.am
index e31cbcd..d120a2c 100644
--- a/plugins/command-bar/Makefile.am
+++ b/plugins/command-bar/Makefile.am
@@ -26,6 +26,8 @@ libcommand_bar_la_SOURCES = \
        gb-command-vim.h \
        gb-command.c \
        gb-command.h \
+       gb-vim.c \
+       gb-vim.h \
        $(NULL)
 
 libcommand_bar_la_CFLAGS = \
@@ -36,7 +38,6 @@ libcommand_bar_la_CFLAGS = \
        -I$(top_srcdir)/src/documents \
        -I$(top_srcdir)/src/gd \
        -I$(top_srcdir)/src/editor \
-       -I$(top_srcdir)/src/vim \
        -I$(top_srcdir)/src/util \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/contrib/nautilus \
diff --git a/src/vim/gb-vim.c b/plugins/command-bar/gb-vim.c
similarity index 98%
rename from src/vim/gb-vim.c
rename to plugins/command-bar/gb-vim.c
index 67a6fa7..5003fef 100644
--- a/src/vim/gb-vim.c
+++ b/plugins/command-bar/gb-vim.c
@@ -30,13 +30,13 @@
 G_DEFINE_QUARK (gb-vim-error-quark, gb_vim_error)
 
 typedef gboolean (*GbVimSetFunc)     (GtkSourceView  *source_view,
-                                       const gchar    *key,
-                                       const gchar    *value,
-                                       GError        **error);
+                                      const gchar    *key,
+                                      const gchar    *value,
+                                      GError        **error);
 typedef gboolean (*GbVimCommandFunc) (GtkSourceView  *source_view,
-                                       const gchar    *command,
-                                       const gchar    *options,
-                                       GError        **error);
+                                      const gchar    *command,
+                                      const gchar    *options,
+                                      GError        **error);
 
 typedef struct
 {
diff --git a/src/vim/gb-vim.h b/plugins/command-bar/gb-vim.h
similarity index 100%
rename from src/vim/gb-vim.h
rename to plugins/command-bar/gb-vim.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 187101b..c1efbf0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -134,8 +134,6 @@ libgnome_builder_la_SOURCES = \
        views/gb-view-stack.h \
        views/gb-view.c \
        views/gb-view.h \
-       vim/gb-vim.c \
-       vim/gb-vim.h \
        workbench/gb-workbench-actions.c \
        workbench/gb-workbench-actions.h \
        workbench/gb-workbench-addin.c \
@@ -195,7 +193,6 @@ libgnome_builder_la_CFLAGS = \
        -I$(srcdir)/tree \
        -I$(srcdir)/util \
        -I$(srcdir)/views \
-       -I$(srcdir)/vim \
        -I$(srcdir)/workbench \
        -I$(srcdir)/workspace \
        -I$(top_builddir)/libide \