merge with Dieterbe/experimental

diff --cc README
Simple merge

diff --cc uzbl.c
index 404355d,eb815d0..0871fcc
--- 1/uzbl.c
--- 2/uzbl.c
+++ b/uzbl.c
@@@ -636,14 -635,14 +636,14 @@@ link_hover_cb (WebKitWebView* page, con
      update_title();
  }
  
 -static void
 +void
- title_change_cb (WebKitWebView* web_view, WebKitWebFrame* web_frame, const gchar* title, gpointer data) {
+ title_change_cb (WebKitWebView* web_view, GParamSpec param_spec) {
      (void) web_view;
-     (void) web_frame;
-     (void) data;
+     (void) param_spec;
+     const gchar *title = webkit_web_view_get_title(web_view);
      if (uzbl.gui.main_title)
          g_free (uzbl.gui.main_title);
-     uzbl.gui.main_title = g_strdup (title);
+     uzbl.gui.main_title = title ? g_strdup (title) : g_strdup ("(no title)");
      update_title();
  }
  

diff --cc uzbl.h
index 2f58786,d19ceb3..b40684a
--- 1/uzbl.h
--- 2/uzbl.h
+++ b/uzbl.h
@@@ -266,40 -263,40 +266,40 @@@ mime_policy_cb(WebKitWebView *web_view
  WebKitWebView*
  create_web_view_cb (WebKitWebView  *web_view, WebKitWebFrame *frame, gpointer user_data);
  
 -static gboolean
 +gboolean
  download_cb (WebKitWebView *web_view, GObject *download, gpointer user_data);
  
 -static void
 +void
  toggle_zoom_type (WebKitWebView* page, GArray *argv, GString *result);
  
 -static void
 +void
  toggle_status_cb (WebKitWebView* page, GArray *argv, GString *result);
  
 -static void
 +void
  link_hover_cb (WebKitWebView* page, const gchar* title, const gchar* link, gpointer data);
  
 -static void
 +void
- title_change_cb (WebKitWebView* web_view, WebKitWebFrame* web_frame, const gchar* title, gpointer data);
+ title_change_cb (WebKitWebView* web_view, GParamSpec param_spec);
  
 -static void
 +void
  progress_change_cb (WebKitWebView* page, gint progress, gpointer data);
  
 -static void
 +void
  load_commit_cb (WebKitWebView* page, WebKitWebFrame* frame, gpointer data);
  
 -static void
 +void
  load_start_cb (WebKitWebView* page, WebKitWebFrame* frame, gpointer data);
  
 -static void
 +void
  load_finish_cb (WebKitWebView* page, WebKitWebFrame* frame, gpointer data);
  
 -static void
 +void
  destroy_cb (GtkWidget* widget, gpointer data);
  
 -static void
 +void
  log_history_cb ();
  
 -static void
 +void
  commands_hash(void);
  
  void