[gitg] Fix for api breaks in libgit2-glib



commit 325c1306d96308a9fa370653be1adba7f8ccb6dc
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Wed Feb 13 12:42:20 2013 +0100

    Fix for api breaks in libgit2-glib

 libgitg-gtk/gitg-gtk-dash-view.vala      |    2 +-
 libgitg-gtk/gitg-gtk-diff-view.vala      |    8 ++++----
 libgitg/gitg-repository.vala             |    2 +-
 plugins/files/gitg-files-tree-store.vala |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/libgitg-gtk/gitg-gtk-dash-view.vala b/libgitg-gtk/gitg-gtk-dash-view.vala
index 3d34d51..7ed1576 100644
--- a/libgitg-gtk/gitg-gtk-dash-view.vala
+++ b/libgitg-gtk/gitg-gtk-dash-view.vala
@@ -145,7 +145,7 @@ namespace GitgGtk
 						{
 							Ref? reference = repo.lookup_reference("refs/heads/" + branch_name);
 
-							if (reference != null && reference.get_id().equal(head.get_id()))
+							if (reference != null && reference.get_target().equal(head.get_target()))
 							{
 								data.branch_label.set_text(branch_name);
 								return 1;
diff --git a/libgitg-gtk/gitg-gtk-diff-view.vala b/libgitg-gtk/gitg-gtk-diff-view.vala
index 6453fa4..f97974a 100644
--- a/libgitg-gtk/gitg-gtk-diff-view.vala
+++ b/libgitg-gtk/gitg-gtk-diff-view.vala
@@ -274,16 +274,16 @@ namespace GitgGtk
 						if (i == 0)
 						{
 							d_diff = new Ggit.Diff.tree_to_tree(repo,
-							                                    options,
 							                                    parent.get_tree(),
-							                                    d_commit.get_tree());
+							                                    d_commit.get_tree(),
+							                                    options);
 						}
 						else
 						{
 							var d = new Ggit.Diff.tree_to_tree(repo,
-							                                   options,
 							                                   parent.get_tree(),
-							                                   d_commit.get_tree());
+							                                   d_commit.get_tree(),
+							                                   options);
 
 							d_diff.merge(d);
 						}
diff --git a/libgitg/gitg-repository.vala b/libgitg/gitg-repository.vala
index 5b72805..d182db7 100644
--- a/libgitg/gitg-repository.vala
+++ b/libgitg/gitg-repository.vala
@@ -80,7 +80,7 @@ public class Repository : Ggit.Repository
 					return 0;
 				}
 
-				Ggit.OId? id = r.get_id();
+				Ggit.OId? id = r.get_target();
 
 				if (id == null)
 				{
diff --git a/plugins/files/gitg-files-tree-store.vala b/plugins/files/gitg-files-tree-store.vala
index fd9d896..2f15b27 100644
--- a/plugins/files/gitg-files-tree-store.vala
+++ b/plugins/files/gitg-files-tree-store.vala
@@ -119,7 +119,7 @@ public class TreeStore : Gtk.TreeStore
 
 		try
 		{
-			d_tree.walk((root, entry) => {
+			d_tree.walk(Ggit.TreeWalkMode.PRE, (root, entry) => {
 				var attr = entry.get_file_mode();
 				var isdir = attr == Ggit.FileMode.TREE;
 
@@ -175,7 +175,7 @@ public class TreeStore : Gtk.TreeStore
 				}
 
 				return 0;
-			}, Ggit.TreeWalkMode.PRE);
+			});
 		} catch (Error e) { }
 	}
 }


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