[gitg] Fix for latest api changes in libgit2-glib



commit 306ef8bfa41209f3de1e5dc7f423555efa0ea677
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Tue Jul 2 09:18:49 2013 +0200

    Fix for latest api changes in libgit2-glib

 libgitg/gitg-commit.vala                 |   28 ++++++++++++++--------------
 libgitg/gitg-diff-view-request-diff.vala |    8 ++++----
 libgitg/gitg-diff-view.vala              |    4 ++--
 3 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/libgitg/gitg-commit.vala b/libgitg/gitg-commit.vala
index eaf383f..33f1efc 100644
--- a/libgitg/gitg-commit.vala
+++ b/libgitg/gitg-commit.vala
@@ -140,9 +140,9 @@ public class Commit : Ggit.Commit
                }
        }
 
-       public Ggit.Diff get_diff(Ggit.DiffOptions? options)
+       public Ggit.DiffList get_diff(Ggit.DiffOptions? options)
        {
-               Ggit.Diff? diff = null;
+               Ggit.DiffList? diff = null;
 
                var repo = get_owner();
 
@@ -153,10 +153,10 @@ public class Commit : Ggit.Commit
                        // Create a new diff from the parents to the commit tree
                        if (parents.size() == 0)
                        {
-                               diff = new Ggit.Diff.tree_to_tree(repo,
-                                                                 null,
-                                                                 get_tree(),
-                                                                 options);
+                               diff = new Ggit.DiffList.tree_to_tree(repo,
+                                                                     null,
+                                                                     get_tree(),
+                                                                     options);
                        }
                        else
                        {
@@ -166,17 +166,17 @@ public class Commit : Ggit.Commit
 
                                        if (i == 0)
                                        {
-                                               diff = new Ggit.Diff.tree_to_tree(repo,
-                                                                                 parent.get_tree(),
-                                                                                 get_tree(),
-                                                                                 options);
+                                               diff = new Ggit.DiffList.tree_to_tree(repo,
+                                                                                     parent.get_tree(),
+                                                                                     get_tree(),
+                                                                                     options);
                                        }
                                        else
                                        {
-                                               var d = new Ggit.Diff.tree_to_tree(repo,
-                                                                                  parent.get_tree(),
-                                                                                  get_tree(),
-                                                                                  options);
+                                               var d = new Ggit.DiffList.tree_to_tree(repo,
+                                                                                      parent.get_tree(),
+                                                                                      get_tree(),
+                                                                                      options);
 
                                                diff.merge(d);
                                        }
diff --git a/libgitg/gitg-diff-view-request-diff.vala b/libgitg/gitg-diff-view-request-diff.vala
index 88eee30..8a0f1e5 100644
--- a/libgitg/gitg-diff-view-request-diff.vala
+++ b/libgitg/gitg-diff-view-request-diff.vala
@@ -28,7 +28,7 @@ namespace Gitg
                }
 
                private DiffType d_diff_type;
-               private Ggit.Diff? d_diff;
+               private Ggit.DiffList? d_diff;
                private Ggit.Commit? d_commit;
 
                public DiffViewRequestDiff(DiffView? view, WebKit.URISchemeRequest request, Soup.URI uri)
@@ -219,7 +219,7 @@ namespace Gitg
                        builder.end_object();
                }
 
-               private void build_diff(Ggit.Diff? diff, Json.Builder builder, Cancellable? cancellable) 
throws GLib.Error
+               private void build_diff(Ggit.DiffList? diff, Json.Builder builder, Cancellable? cancellable) 
throws GLib.Error
                {
                        DiffState state = new DiffState();
 
@@ -298,13 +298,13 @@ namespace Gitg
                        builder.set_member_name("maxlines").add_int_value(maxlines);
                }
 
-               private void build_commit(Ggit.Diff? diff, Json.Builder builder, Cancellable? cancellable)
+               private void build_commit(Ggit.DiffList? diff, Json.Builder builder, Cancellable? cancellable)
                {
                        builder.set_member_name("commit");
                        commit_to_json(builder, d_commit);
                }
 
-               private InputStream? run_diff(Ggit.Diff? diff, Cancellable? cancellable) throws GLib.Error
+               private InputStream? run_diff(Ggit.DiffList? diff, Cancellable? cancellable) throws GLib.Error
                {
                        if (diff == null)
                        {
diff --git a/libgitg/gitg-diff-view.vala b/libgitg/gitg-diff-view.vala
index 23125ef..4694b1e 100644
--- a/libgitg/gitg-diff-view.vala
+++ b/libgitg/gitg-diff-view.vala
@@ -21,7 +21,7 @@ namespace Gitg
 {
        public class DiffView : WebKit.WebView
        {
-               private Ggit.Diff? d_diff;
+               private Ggit.DiffList? d_diff;
                private Commit? d_commit;
                private Settings d_fontsettings;
 
@@ -36,7 +36,7 @@ namespace Gitg
                private bool d_loaded;
                private ulong d_diffid;
 
-               public Ggit.Diff? diff
+               public Ggit.DiffList? diff
                {
                        get { return d_diff; }
                        set


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