diff --git a/configure.ac b/configure.ac
index d016c51f..4dfc946b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,6 +49,7 @@ PKG_CHECK_MODULES(PACKAGE, [
 	gthread-2.0
 	gtksourceview-2.0
 	gio-2.0
+	gio-unix-2.0
 	gmodule-2.0
 	gconf-2.0
 ])
diff --git a/gitg/gitg-commit-view.c b/gitg/gitg-commit-view.c
index a504c9f8..6ed16f24 100644
--- a/gitg/gitg-commit-view.c
+++ b/gitg/gitg-commit-view.c
@@ -161,6 +161,8 @@ icon_data_func(GtkTreeViewColumn *column, GtkCellRenderer *renderer, GtkTreeMode
 		case GITG_CHANGED_FILE_STATUS_DELETED:
 			g_object_set(renderer, "stock-id", staged ? GTK_STOCK_REMOVE : GTK_STOCK_DELETE, NULL);
 		break;
+		default:
+		break;
 	}
 	
 	g_object_unref(file);
diff --git a/gitg/gitg-commit.c b/gitg/gitg-commit.c
index 694aec4d..9ed99027 100644
--- a/gitg/gitg-commit.c
+++ b/gitg/gitg-commit.c
@@ -257,7 +257,7 @@ add_files(GitgCommit *commit, gchar **buffer, gboolean cached)
 {
 	gchar *line;
 	
-	while (line = *buffer++)
+	while ((line = *buffer++) != NULL)
 	{
 		gchar **parts = g_strsplit_set(line, " \t", 0);
 		guint len = g_strv_length(parts);
@@ -391,7 +391,7 @@ read_other_files_update(GitgRunner *runner, gchar **buffer, GitgCommit *commit)
 {
 	gchar *line;
 
-	while ((line = *buffer++))
+	while ((line = *buffer++) != NULL)
 	{
 		/* Skip empty lines */
 		if (!*line)
@@ -649,7 +649,7 @@ comment_parse_subject(gchar const *comment)
 	gchar *ptr;
 	gchar *subject;
 	
-	if (ptr = g_utf8_strchr(comment, g_utf8_strlen(comment, -1), '\n'))
+	if ((ptr = g_utf8_strchr(comment, g_utf8_strlen(comment, -1), '\n')) != NULL)
 	{
 		subject = g_strndup(comment, ptr - comment);
 	}
@@ -844,8 +844,8 @@ gitg_commit_revert(GitgCommit *commit, GitgChangedFile *file, gchar const *hunk,
 gboolean 
 gitg_commit_add_ignore(GitgCommit *commit, GitgChangedFile *file, GError **error)
 {
-	g_return_if_fail(GITG_IS_COMMIT(commit));
-	g_return_if_fail(GITG_IS_CHANGED_FILE(file));
+	g_return_val_if_fail(GITG_IS_COMMIT(commit), FALSE);
+	g_return_val_if_fail(GITG_IS_CHANGED_FILE(file), FALSE);
 	
 	GFile *f = gitg_changed_file_get_file(file);
 	gchar *path = gitg_repository_relative(commit->priv->repository, f);
@@ -872,6 +872,8 @@ gitg_commit_add_ignore(GitgCommit *commit, GitgChangedFile *file, GError **error
 	g_object_unref(f);	
 	g_free(ignore);
 	g_free(path);
+
+	return ret;
 }
 
 static void
diff --git a/gitg/gitg-diff-view.c b/gitg/gitg-diff-view.c
index 8064c4eb..caacc3f4 100644
--- a/gitg/gitg-diff-view.c
+++ b/gitg/gitg-diff-view.c
@@ -22,6 +22,7 @@
 
 #include "gitg-diff-view.h"
 #include <string.h>
+#include <stdlib.h>
 
 #define GITG_DIFF_VIEW_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GITG_TYPE_DIFF_VIEW, GitgDiffViewPrivate))
 
diff --git a/gitg/gitg-diff-view.h b/gitg/gitg-diff-view.h
index 77925dd4..a6c0e1fb 100644
--- a/gitg/gitg-diff-view.h
+++ b/gitg/gitg-diff-view.h
@@ -54,6 +54,7 @@ struct _GitgDiffViewClass
 GType gitg_diff_view_get_type(void) G_GNUC_CONST;
 GitgDiffView *gitg_diff_view_new(void);
 void gitg_diff_view_remove_hunk(GitgDiffView *view, GtkTextIter *iter);
+void gitg_diff_view_set_diff_enabled(GitgDiffView *view, gboolean enabled);
 
 G_END_DECLS
 
diff --git a/gitg/gitg-dirs.h b/gitg/gitg-dirs.h
index 88c05e87..ee7cafb0 100644
--- a/gitg/gitg-dirs.h
+++ b/gitg/gitg-dirs.h
@@ -27,5 +27,6 @@
 
 gchar const *gitg_dirs_get_data_dir();
 gchar *gitg_dirs_get_data_filename(gchar const *first, ...) G_GNUC_NULL_TERMINATED;
+void gitg_dirs_initialize(int argc, char **argv);
 
 #endif /* __GITG_DIRS_H__ */
diff --git a/gitg/gitg-lanes.c b/gitg/gitg-lanes.c
index fbfc0c6b..d941381a 100644
--- a/gitg/gitg-lanes.c
+++ b/gitg/gitg-lanes.c
@@ -284,7 +284,7 @@ gitg_lanes_reset(GitgLanes *lanes)
 	g_hash_table_remove_all(lanes->priv->collapsed);
 }
 
-static gboolean
+static void
 lane_container_next(LaneContainer *container, gint index)
 {
 	GitgLane *lane = gitg_lane_copy(container->lane);
diff --git a/gitg/gitg-preferences-dialog.c b/gitg/gitg-preferences-dialog.c
index c260bd4f..b4ce212b 100644
--- a/gitg/gitg-preferences-dialog.c
+++ b/gitg/gitg-preferences-dialog.c
@@ -24,6 +24,7 @@
 
 #include "gitg-preferences.h"
 #include "gitg-data-binding.h"
+#include "gitg-utils.h"
 
 #include <stdlib.h>
 #include <glib/gi18n.h>
diff --git a/gitg/gitg-repository.c b/gitg/gitg-repository.c
index 6c8ba7c9..e99cecc3 100644
--- a/gitg/gitg-repository.c
+++ b/gitg/gitg-repository.c
@@ -26,6 +26,7 @@
 #include "gitg-ref.h"
 #include "gitg-types.h"
 #include "gitg-preferences.h"
+#include "gitg-data-binding.h"
 
 #include <gio/gio.h>
 #include <glib/gi18n.h>
@@ -444,7 +445,7 @@ on_loader_update(GitgRunner *object, gchar **buffer, GitgRepository *self)
 {
 	gchar *line;
 	
-	while ((line = *buffer++))
+	while ((line = *buffer++) != NULL)
 	{
 		/* new line is read */
 		gchar **components = g_strsplit(line, "\01", 0);
@@ -501,7 +502,7 @@ repository_relane(GitgRepository *repository)
 	
 	for (i = 0; i < repository->priv->size; ++i)
 	{
-		guint8 mylane;
+		gint8 mylane;
 		GitgRevision *revision = repository->priv->storage[i];
 
 		GSList *lanes = gitg_lanes_next(repository->priv->lanes, revision, &mylane);
@@ -752,7 +753,7 @@ load_refs(GitgRepository *self)
 	gchar **buffer = refs;
 	gchar *buf;
 	
-	while (buf = *buffer++)
+	while ((buf = *buffer++) != NULL)
 	{
 		// each line will look like <name> <hash>
 		gchar **components = g_strsplit(buf, " ", 2);
@@ -1041,7 +1042,7 @@ parse_valist(va_list ap)
 	gchar const **ret = NULL;
 	guint num = 0;
 	
-	while (a = va_arg(ap, gchar const *))
+	while ((a = va_arg(ap, gchar const *)) != NULL)
 	{
 		ret = g_realloc(ret, sizeof(gchar const *) * (++num + 1));
 		ret[num - 1] = a;
diff --git a/gitg/gitg-repository.h b/gitg/gitg-repository.h
index ca6aec63..4fc5eb54 100644
--- a/gitg/gitg-repository.h
+++ b/gitg/gitg-repository.h
@@ -1,6 +1,5 @@
 /*
- * gitg-repository.h
- * This file is part of gitg - git repository viewer
+ * gitg-repository.h * This file is part of gitg - git repository viewer
  *
  * Copyright (C) 2009 - Jesse van den Kieboom
  *
@@ -105,6 +104,8 @@ gchar **gitg_repository_command_with_input_and_outputv(GitgRepository *repositor
 gchar *gitg_repository_parse_ref(GitgRepository *repository, gchar const *ref);
 gchar *gitg_repository_parse_head(GitgRepository *repository);
 
+void gitg_repository_reload(GitgRepository *repository);
+
 G_END_DECLS
 
 #endif /* __GITG_REPOSITORY_H__ */
diff --git a/gitg/gitg-revision-view.h b/gitg/gitg-revision-view.h
index 03f91f95..02aa4c0e 100644
--- a/gitg/gitg-revision-view.h
+++ b/gitg/gitg-revision-view.h
@@ -56,7 +56,7 @@ struct _GitgRevisionViewClass {
 GType gitg_revision_view_get_type (void) G_GNUC_CONST;
 
 void gitg_revision_view_update(GitgRevisionView *revision_view, GitgRepository *repository, GitgRevision *revision);
-
+void gitg_revision_view_set_repository(GitgRevisionView *view, GitgRepository *repository);
 
 G_END_DECLS
 
diff --git a/gitg/gitg-runner.c b/gitg/gitg-runner.c
index 0466b6db..5d6ad8f6 100644
--- a/gitg/gitg-runner.c
+++ b/gitg/gitg-runner.c
@@ -23,8 +23,14 @@
 #include "gitg-runner.h"
 #include "gitg-utils.h"
 #include <string.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 #include "gitg-debug.h"
 
+#include <gio/gio.h>
+#include <gio/gunixoutputstream.h>
+#include <gio/gunixinputstream.h>
+
 #define GITG_RUNNER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GITG_TYPE_RUNNER, GitgRunnerPrivate))
 
 /* Signals */
@@ -297,7 +303,7 @@ parse_lines(GitgRunner *runner, gchar *buffer, gssize size)
 	gchar *ptr = buffer;
 	gchar *newline;
 	gint i = 0;
-	
+
 	free_lines(runner);
 	
 	while ((newline = gitg_strnchr(ptr, size, '\n')))
@@ -379,7 +385,7 @@ run_sync(GitgRunner *runner, gchar const *input, GError **error)
 		g_output_stream_close(runner->priv->output_stream, NULL, NULL);
 	}
 	
-	gssize read = runner->priv->buffer_size;
+	gsize read = runner->priv->buffer_size;
 
 	while (read == runner->priv->buffer_size)
 	{
@@ -543,6 +549,7 @@ gitg_runner_run_streams(GitgRunner *runner, GInputStream *input_stream, GOutputS
 			start_reading(runner, data);
 		}
 	}
+	return TRUE;
 }
 
 gboolean
diff --git a/gitg/gitg-settings.c b/gitg/gitg-settings.c
index 7bc6670e..40abba1a 100644
--- a/gitg/gitg-settings.c
+++ b/gitg/gitg-settings.c
@@ -88,7 +88,7 @@ gitg_settings_save(GitgSettings *settings)
 	g_mkdir_with_parents(d, 0755);
 	g_free(d);
 	
-	gssize length;
+	gsize length;
 	gchar *data = g_key_file_to_data(settings->priv->file, &length, NULL);
 	
 	if (data)
diff --git a/gitg/gitg-utils.c b/gitg/gitg-utils.c
index ea5dd89c..2303c38e 100644
--- a/gitg/gitg-utils.c
+++ b/gitg/gitg-utils.c
@@ -359,7 +359,7 @@ gitg_utils_guess_content_type(GtkTextBuffer *buffer)
 	gtk_text_iter_forward_chars(&end, 256);
 	gchar *data = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
 
-	gchar *content_type = g_content_type_guess(NULL, data, strlen(data), NULL);
+	gchar *content_type = g_content_type_guess(NULL, (guchar *)data, strlen(data), NULL);
 	g_free(data);
 	
 	return content_type;
diff --git a/gitg/gitg-window.c b/gitg/gitg-window.c
index 55b94306..c0645f0c 100644
--- a/gitg/gitg-window.c
+++ b/gitg/gitg-window.c
@@ -883,6 +883,8 @@ on_window_state_event(GtkWidget *widget, GdkEventWindowState *event, GitgWindow
 	GitgSettings *settings = gitg_settings_get_default();
 	
 	gitg_settings_set_window_state(settings, event->new_window_state);
+
+	return FALSE;
 }
 
 void