Merge commit 'Dieterbe/experimental' into experimental

Conflicts:
	uzbl.c

1 files changed, 4 insertions, 0 deletions

diff --git a/uzbl.h b/uzbl.h
index 419e5a3..27293f9 100644
--- a/uzbl.h
+++ b/uzbl.h
@@ -78,6 +78,7 @@ typedef struct {
     GtkAdjustment* bar_h; // and scrolling position
     WebKitWebView* web_view;
     gchar*         main_title;
+    gchar*         icon;
 
     /* WebInspector */
     GtkWidget *inspector_window;
@@ -466,6 +467,9 @@ static void
 set_proxy_url();
 
 static void
+set_icon();
+
+static void
 cmd_cookie_handler();
 
 static void