[gitg: 5/5] Merge branch 'webkit2'

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

commit f5791a9cefa56e7cfcf6787676108e2f30b93400
Merge: e4efaf5 d67116e
Author: Jesse van den Kieboom <jesse vandenkieboom epfl ch>
Date:   Mon Oct 29 17:00:05 2012 +0100

    Merge branch 'webkit2'

 configure.ac                                       |    7 +-
 libgitg-gtk/Makefile.am                            |    3 +-
 libgitg-gtk/gitg-gtk-diff-view-request-diff.vala   |    8 +-
 .../gitg-gtk-diff-view-request-resource.vala       |    8 +-
 libgitg-gtk/gitg-gtk-diff-view-request.vala        |  173 +-
 libgitg-gtk/gitg-gtk-diff-view.vala                |  130 +-
 libgitg-gtk/resources/base.css                     |    2 +-
 libgitg-gtk/resources/base.html                    |    2 +
 libgitg-gtk/resources/base.js                      |   79 +-
 plugins/diff/gitg-diff.vala                        |    8 +-
 vapi/WebKit-3.0.gir                                |27139 --------------------
 vapi/{webkitgtk-3.0.deps => webkit2gtk-3.0.deps}   |    0
 vapi/webkit2gtk-3.0.vapi                           |  732 +
 vapi/webkitgtk-3.0.vapi                            | 4818 ----
 14 files changed, 922 insertions(+), 32187 deletions(-)
---
diff --cc configure.ac
index fd9be46,eb2be6b..00fddc2
--- a/configure.ac
+++ b/configure.ac
@@@ -244,8 -244,10 +244,9 @@@ GITG_PLUGIN_VALAFLAGS="				
  	--pkg libpeas-1.0			\
  	--pkg gee-1.0				\
  	--pkg json-glib-1.0			\
- 	--pkg webkitgtk-3.0			\
+ 	--pkg libsoup-2.4			\
+ 	--pkg webkit2gtk-3.0			\
  	--pkg config				\
 -	--pkg posix				\
  	\$(GITG_VALAFLAGS)			\
  	--vapidir \$(top_srcdir)/vapi		\
  	--vapidir \$(top_builddir)/libgitg	\
diff --cc plugins/diff/gitg-diff.vala
index a3bd2ff,d2bf82a..479fc3a
--- a/plugins/diff/gitg-diff.vala
+++ b/plugins/diff/gitg-diff.vala
@@@ -32,16 -31,7 +31,11 @@@ namespace GitgDif
  		construct
  		{
  			d_diff = new GitgGtk.DiffView(null);
- 			d_sw = new Gtk.ScrolledWindow(null, null);
- 
- 			d_sw.show();
  			d_diff.show();
 +
- 			d_sw.add(d_diff);
- 
 +			application.notify["current_view"].connect((a, v) => {
 +				notify_property("available");
 +			});
  		}
  
  		public string id