sync

diff --git a/GitRepo.vala b/GitRepo.vala
index 448345c..ab17558 100644 (file)
--- a/GitRepo.vala
+++ b/GitRepo.vala
@@ -16,6 +16,8 @@ public class GitRepo : Object
     public string gitdir;
     public string git_working_dir;
     public bool debug = false;
+    
+    public Gee.HashMap<string,bool> ignore_files;
 
     /**
     * index of.. matching gitpath..
@@ -124,7 +126,7 @@ public class GitRepo : Object
     public GitRepo(string path) {
         // cal parent?
         this.name =   File.new_for_path(path).get_basename();
-        
+        this.ignore_files = new Gee.HashMap<string,bool>();
         
         this.git_working_dir = path;
         this.gitdir = path + "/.git";

diff --git a/Makefile b/Makefile
index d7b3b94..37e27c1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -205,7 +205,7 @@ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = ${SHELL} /home/alan/gitlive/gitlive/missing aclocal-1.15
 AMTAR = $${TAR-tar}
-AM_DEFAULT_VERBOSITY = 1
+AM_DEFAULT_VERBOSITY = 0
 AUTOCONF = ${SHELL} /home/alan/gitlive/gitlive/missing autoconf
 AUTOHEADER = ${SHELL} /home/alan/gitlive/gitlive/missing autoheader
 AUTOMAKE = ${SHELL} /home/alan/gitlive/gitlive/missing automake-1.15
@@ -221,8 +221,8 @@ ECHO_C =
 ECHO_N = -n
 ECHO_T = 
 EXEEXT = 
-GITLIVE_CFLAGS = -pthread -I/usr/include/libwnck-3.0 -I/usr/include/startup-notification-1.0 -I/usr/include/gtk-3.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/usr/include/gtk-3.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/mirclient -I/usr/include/mircore -I/usr/include/mircookie -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include
-GITLIVE_LIBS = -lnotify -lwnck-3 -lgtk-3 -lgdk-3 -lpangocairo-1.0 -lpango-1.0 -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0
+GITLIVE_CFLAGS = -pthread -I/usr/include/gee-0.8 -I/usr/include/libwnck-3.0 -I/usr/include/startup-notification-1.0 -I/usr/include/gtk-3.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/usr/include/gtk-3.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include
+GITLIVE_LIBS = -lgee-0.8 -lnotify -lwnck-3 -lgtk-3 -lgdk-3 -lpangocairo-1.0 -lpango-1.0 -latk-1.0 -lcairo-gobject -lcairo -lgdk_pixbuf-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0
 INSTALL = /usr/bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
@@ -303,7 +303,8 @@ Gitlive_PKGS = \
                --pkg posix  \
                --pkg gtk+-3.0 \
                --pkg libnotify \
-               --pkg  libwnck-3.0 
+               --pkg  libwnck-3.0 \
+               --pkg gee-0.8 
 
 Gitlive_SOURCES = \
           Gitlive.vala \

diff --git a/Makefile.am b/Makefile.am
index 831d169..00a88fa 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,8 @@ Gitlive_PKGS = \
                --pkg posix  \
                --pkg gtk+-3.0 \
                --pkg libnotify \
-               --pkg  libwnck-3.0 
+               --pkg  libwnck-3.0 \
+               --pkg gee-0.8 
 
 Gitlive_SOURCES = \
           Gitlive.vala \

diff --git a/configure.ac b/configure.ac
index 689d980..605239d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,6 +21,7 @@ AC_CHECK_LIB([m],[cos])
 dnl we need to check these exist, then it will generate a compile string for them.
 
 PKG_CHECK_MODULES(GITLIVE, [
+                gee-0.8
          gio-2.0
                 glib-2.0 >= 2.24.1
                 gobject-2.0 >= 2.24.1