[libgit2-glib] Fix cherry pick api break

[Ignacio Casal Quinteiro <icq src gnome org>]

commit 115a1bf0a101c6bc5a8020ad0ba65e0ec1cd35c0
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Sun Jan 18 16:04:46 2015 +0100

    Fix cherry pick api break

 libgit2-glib/ggit-cherry-pick-options.c |    6 +++---
 libgit2-glib/ggit-cherry-pick-options.h |    2 +-
 libgit2-glib/ggit-repository.c          |   18 +++++++++---------
 3 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/libgit2-glib/ggit-cherry-pick-options.c b/libgit2-glib/ggit-cherry-pick-options.c
index 27211ac..5f0a0c0 100644
--- a/libgit2-glib/ggit-cherry-pick-options.c
+++ b/libgit2-glib/ggit-cherry-pick-options.c
@@ -7,7 +7,7 @@
 
 struct _GgitCherryPickOptionsPrivate
 {
-       git_cherry_pick_options options;
+       git_cherrypick_options options;
 
        GgitCheckoutOptions *checkout_options;
        GgitMergeOptions *merge_options;
@@ -128,7 +128,7 @@ ggit_cherry_pick_options_init (GgitCherryPickOptions *self)
 {
        self->priv = GGIT_CHERRY_PICK_OPTIONS_GET_PRIVATE (self);
 
-       git_cherry_pick_init_options (&self->priv->options, GIT_CHERRY_PICK_OPTIONS_VERSION);
+       git_cherrypick_init_options (&self->priv->options, GIT_CHERRY_PICK_OPTIONS_VERSION);
 }
 
 /**
@@ -145,7 +145,7 @@ ggit_cherry_pick_options_new ()
        return g_object_new (GGIT_TYPE_CHERRY_PICK_OPTIONS, NULL);
 }
 
-const git_cherry_pick_options *
+const git_cherrypick_options *
 _ggit_cherry_pick_options_get_cherry_pick_options (GgitCherryPickOptions *options)
 {
        if (options != NULL)
diff --git a/libgit2-glib/ggit-cherry-pick-options.h b/libgit2-glib/ggit-cherry-pick-options.h
index 41a27f5..7a4ee9b 100644
--- a/libgit2-glib/ggit-cherry-pick-options.h
+++ b/libgit2-glib/ggit-cherry-pick-options.h
@@ -53,7 +53,7 @@ struct _GgitCherryPickOptionsClass
 
 GType                  ggit_cherry_pick_options_get_type (void) G_GNUC_CONST;
 
-const git_cherry_pick_options *
+const git_cherrypick_options *
                       _ggit_cherry_pick_options_get_cherry_pick_options (
                                                               GgitCherryPickOptions  *options);
 
diff --git a/libgit2-glib/ggit-repository.c b/libgit2-glib/ggit-repository.c
index 77c543d..49c77f7 100644
--- a/libgit2-glib/ggit-repository.c
+++ b/libgit2-glib/ggit-repository.c
@@ -2989,9 +2989,9 @@ ggit_repository_cherry_pick (GgitRepository         *repository,
        g_return_val_if_fail (options == NULL || GGIT_IS_CHERRY_PICK_OPTIONS (options), FALSE);
        g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
-       ret = git_cherry_pick (_ggit_native_get (repository),
-                              _ggit_native_get (commit),
-                              _ggit_cherry_pick_options_get_cherry_pick_options (options));
+       ret = git_cherrypick (_ggit_native_get (repository),
+                             _ggit_native_get (commit),
+                             _ggit_cherry_pick_options_get_cherry_pick_options (options));
 
        if (ret != GIT_OK)
        {
@@ -3033,12 +3033,12 @@ ggit_repository_cherry_pick_commit (GgitRepository    *repository,
        g_return_val_if_fail (GGIT_IS_COMMIT (our_commit), NULL);
        g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
-       ret = git_cherry_pick_commit (&idx,
-                                     _ggit_native_get (repository),
-                                     _ggit_native_get (commit),
-                                     _ggit_native_get (our_commit),
-                                     mainline,
-                                     _ggit_merge_options_get_merge_options (merge_options));
+       ret = git_cherrypick_commit (&idx,
+                                    _ggit_native_get (repository),
+                                    _ggit_native_get (commit),
+                                    _ggit_native_get (our_commit),
+                                    mainline,
+                                    _ggit_merge_options_get_merge_options (merge_options));
 
        if (ret != GIT_OK)
        {