[gitg] Fixed hiding part of diff header and stage/unstage hunks

[Jesse van den Kieboom <jessevdk src gnome org>]

commit 5e6e2f4af138499c812c3d77671774e062b5052c
Author: Jesse van den Kieboom <jessevdk gnome org>
Date:   Sun Jan 17 14:29:04 2010 +0100

    Fixed hiding part of diff header and stage/unstage hunks

 gitg/gitg-commit-view.c |    6 +++---
 gitg/gitg-diff-view.c   |    7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/gitg/gitg-commit-view.c b/gitg/gitg-commit-view.c
index 7393055..3f7e177 100644
--- a/gitg/gitg-commit-view.c
+++ b/gitg/gitg-commit-view.c
@@ -594,7 +594,7 @@ get_patch_header(GitgCommitView *view, GtkTextBuffer *buffer, GtkTextIter const
 		GtkTextIter lineend = begin;
 		gtk_text_iter_forward_line(&lineend);
 
-		gchar *text = gtk_text_buffer_get_text(buffer, &begin, &lineend, FALSE);
+		gchar *text = gtk_text_buffer_get_text(buffer, &begin, &lineend, TRUE);
 
 		if (g_str_has_prefix(text, "+++ "))
 		{
@@ -612,7 +612,7 @@ get_patch_header(GitgCommitView *view, GtkTextBuffer *buffer, GtkTextIter const
 	if (!foundstart || !foundend)
 		return NULL;
 
-	return gtk_text_buffer_get_text(buffer, &begin, &end, FALSE);
+	return gtk_text_buffer_get_text(buffer, &begin, &end, TRUE);
 }
 
 static gchar *
@@ -631,7 +631,7 @@ get_patch_contents(GitgCommitView *view, GtkTextBuffer *buffer, GtkTextIter cons
 		GtkTextIter lineend = end;
 		gtk_text_iter_forward_to_line_end(&lineend);
 
-		gchar *text = gtk_text_buffer_get_text(buffer, &end, &lineend, FALSE);
+		gchar *text = gtk_text_buffer_get_text(buffer, &end, &lineend, TRUE);
 		gboolean isend = g_str_has_prefix(text, "@@") || g_str_has_prefix(text, "diff --git ");
 		g_free(text);
 
diff --git a/gitg/gitg-diff-view.c b/gitg/gitg-diff-view.c
index 3fc411c..7f853ca 100644
--- a/gitg/gitg-diff-view.c
+++ b/gitg/gitg-diff-view.c
@@ -363,10 +363,13 @@ hide_header_details (GitgDiffView *view,
 	GtkTextIter startiter;
 	GtkTextIter enditer;
 
-	gtk_text_buffer_get_iter_at_line (buffer, &startiter, region->line + 2);
+	gint line = region->line + 2;
+
+	gtk_text_buffer_get_iter_at_line (buffer, &startiter, line);
 
 	enditer = startiter;
-	gtk_text_iter_forward_lines (&enditer, region->next->line - region->line);
+	gtk_text_iter_forward_lines (&enditer, region->next->line - line);
+
 	gtk_text_buffer_apply_tag (buffer, view->priv->subheader_tag, &startiter, &enditer);
 }