[gitg] Use ggit vapi instead of gir
- From: Jesse van den Kieboom <jessevdk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gitg] Use ggit vapi instead of gir
- Date: Mon, 30 Jun 2014 21:03:37 +0000 (UTC)
commit d742af7951a093fd6b042105a1d859a819515e39
Author: Jesse van den Kieboom <jessevdk gnome org>
Date: Mon Jun 30 22:01:30 2014 +0200
Use ggit vapi instead of gir
configure.ac | 4 ++--
gitg/Makefile.am | 2 +-
gitg/commit/gitg-commit.vala | 16 ++++++++--------
libgitg-ext/Makefile.am | 2 +-
libgitg/Makefile.am | 2 +-
libgitg/gitg-diff-view.vala | 11 +++++++++--
libgitg/gitg-stage.vala | 36 ++++++++++++++++++++----------------
7 files changed, 42 insertions(+), 31 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6494526..f294d98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,7 +90,7 @@ GTK_REQUIRED_VERSION=3.12.0
GTKSOURCEVIEW_REQUIRED_VERSION=3.10
INTROSPECTION_REQUIRED=0.10.1
WEBKITGTK_REQUIRED_VERSION=2.2
-LIBGIT2_GLIB_REQUIRED_VERSION=0.0.18
+LIBGIT2_GLIB_REQUIRED_VERSION=0.0.19
PKG_CHECK_MODULES(LIBGITG, [
gthread-2.0 >= $GLIB_REQUIRED_VERSION
@@ -256,7 +256,7 @@ GITG_PLUGIN_LIBTOOL_FLAGS="-module -avoid-version"
AC_SUBST(GITG_PLUGIN_LIBTOOL_FLAGS)
GITG_PLUGIN_VALAFLAGS=" \
- --pkg Ggit-1.0 \
+ --pkg ggit-1.0 \
--pkg gio-2.0 \
--pkg gtk+-3.0 \
--pkg gtksourceview-3.0 \
diff --git a/gitg/Makefile.am b/gitg/Makefile.am
index 882739e..13b71cc 100644
--- a/gitg/Makefile.am
+++ b/gitg/Makefile.am
@@ -17,7 +17,7 @@ gitg_gitg_VALAFLAGS = \
--vapidir $(top_srcdir)/vapi \
$(GITG_VALAFLAGS) \
--pkg config \
- --pkg Ggit-1.0 \
+ --pkg ggit-1.0 \
--pkg gtk+-3.0 \
--pkg gio-2.0 \
--pkg libpeas-1.0 \
diff --git a/gitg/commit/gitg-commit.vala b/gitg/commit/gitg-commit.vala
index 0e0f848..a7e33fc 100644
--- a/gitg/commit/gitg-commit.vala
+++ b/gitg/commit/gitg-commit.vala
@@ -578,14 +578,14 @@ namespace GitgCommit
private async Ggit.Diff? index_diff()
{
- var opts = new Ggit.DiffOptions(Ggit.DiffOption.INCLUDE_UNTRACKED |
- Ggit.DiffOption.DISABLE_PATHSPEC_MATCH |
- Ggit.DiffOption.RECURSE_UNTRACKED_DIRS,
- 3,
- 3,
- null,
- null,
- null);
+ var opts = new Ggit.DiffOptions();
+
+ opts.flags = Ggit.DiffOption.INCLUDE_UNTRACKED |
+ Ggit.DiffOption.DISABLE_PATHSPEC_MATCH |
+ Ggit.DiffOption.RECURSE_UNTRACKED_DIRS;
+
+ opts.n_context_lines = 3;
+ opts.n_interhunk_lines = 3;
var stage = application.repository.stage;
diff --git a/libgitg-ext/Makefile.am b/libgitg-ext/Makefile.am
index 01352e7..7551259 100644
--- a/libgitg-ext/Makefile.am
+++ b/libgitg-ext/Makefile.am
@@ -13,7 +13,7 @@ libgitg_ext_libgitg_ext_1_0_la_CFLAGS = \
-w
libgitg_ext_libgitg_ext_1_0_la_VALAPKGS = \
- --pkg Ggit-1.0 \
+ --pkg ggit-1.0 \
--pkg gio-2.0 \
--pkg gtk+-3.0 \
--pkg libsoup-2.4 \
diff --git a/libgitg/Makefile.am b/libgitg/Makefile.am
index 3672372..213ec22 100644
--- a/libgitg/Makefile.am
+++ b/libgitg/Makefile.am
@@ -20,7 +20,7 @@ libgitg_libgitg_1_0_la_LDFLAGS = \
$(LIBGITG_LIBS)
libgitg_libgitg_1_0_la_VALAFLAGS = \
- --pkg Ggit-1.0 \
+ --pkg ggit-1.0 \
--pkg gtk+-3.0 \
--pkg gio-2.0 \
--pkg libsoup-2.4 \
diff --git a/libgitg/gitg-diff-view.vala b/libgitg/gitg-diff-view.vala
index 9d0c2c1..d0dde3e 100644
--- a/libgitg/gitg-diff-view.vala
+++ b/libgitg/gitg-diff-view.vala
@@ -52,13 +52,18 @@ namespace Gitg
private Commit? d_commit;
private Settings? d_fontsettings;
private bool d_has_selection;
+ private Ggit.DiffOptions d_options;
private static Gee.HashMap<string, DiffView> s_diff_map;
private static uint64 s_diff_id;
public File? custom_css { get; construct; }
public File? custom_js { get; construct; }
- public Ggit.DiffOptions? options { get; construct set; }
+
+ public Ggit.DiffOptions options
+ {
+ get { return d_options; }
+ }
[Notify]
public bool has_selection
@@ -300,6 +305,8 @@ namespace Gitg
{
base.constructed();
+ d_options = new Ggit.DiffOptions();
+
var settings = new WebKit.Settings();
var dbg = Environment.get_variable("GITG_GTK_DIFF_VIEW_DEBUG") != null;
@@ -385,7 +392,7 @@ namespace Gitg
if (d_commit != null)
{
- d_diff = d_commit.get_diff(options);
+ d_diff = d_commit.get_diff(d_options);
}
if (d_diff != null)
diff --git a/libgitg/gitg-stage.vala b/libgitg/gitg-stage.vala
index 18a4ebb..6dfb183 100644
--- a/libgitg/gitg-stage.vala
+++ b/libgitg/gitg-stage.vala
@@ -803,14 +803,16 @@ public class Stage : Object
public async Ggit.Diff? diff_index(StageStatusFile f) throws Error
{
- var opts = new Ggit.DiffOptions(Ggit.DiffOption.INCLUDE_UNTRACKED |
- Ggit.DiffOption.DISABLE_PATHSPEC_MATCH |
- Ggit.DiffOption.RECURSE_UNTRACKED_DIRS,
- 3,
- 3,
- null,
- null,
- new string[] {f.path});
+ var opts = new Ggit.DiffOptions();
+
+ opts.flags = Ggit.DiffOption.INCLUDE_UNTRACKED |
+ Ggit.DiffOption.DISABLE_PATHSPEC_MATCH |
+ Ggit.DiffOption.RECURSE_UNTRACKED_DIRS;
+
+ opts.n_context_lines = 3;
+ opts.n_interhunk_lines = 3;
+
+ opts.pathspec = new string[] {f.path};
var tree = yield get_head_tree();
@@ -822,14 +824,16 @@ public class Stage : Object
public async Ggit.Diff? diff_workdir(StageStatusFile f) throws Error
{
- var opts = new Ggit.DiffOptions(Ggit.DiffOption.INCLUDE_UNTRACKED |
- Ggit.DiffOption.DISABLE_PATHSPEC_MATCH |
- Ggit.DiffOption.RECURSE_UNTRACKED_DIRS,
- 3,
- 3,
- null,
- null,
- new string[] {f.path});
+ var opts = new Ggit.DiffOptions();
+
+ opts.flags = Ggit.DiffOption.INCLUDE_UNTRACKED |
+ Ggit.DiffOption.DISABLE_PATHSPEC_MATCH |
+ Ggit.DiffOption.RECURSE_UNTRACKED_DIRS;
+
+ opts.n_context_lines = 3;
+ opts.n_interhunk_lines = 3;
+
+ opts.pathspec = new string[] {f.path};
return new Ggit.Diff.index_to_workdir(d_repository,
d_repository.get_index(),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]