Merge commit 'remotes/holizz/bf2'

[uzbl-mobile] / uzbl.h

diff --git a/uzbl.h b/uzbl.h
index b175ccb..810076d 100644 (file)
--- a/uzbl.h
+++ b/uzbl.h
@@ -93,7 +93,6 @@ typedef struct {
     gchar*   title_format_short;
     gchar*   title_format_long;
     gchar*   status_background;
-    gchar*   history_handler;
     gchar*   fifo_dir;
     gchar*   socket_dir;
     gchar*   download_handler;
@@ -105,6 +104,7 @@ typedef struct {
     gchar*   serif_font_family;
     gchar*   fantasy_font_family;
     gchar*   cursive_font_family;
+    gchar*   scheme_handler;
     gboolean always_insert_mode;
     gboolean show_status;
     gboolean insert_mode;
@@ -227,6 +227,9 @@ void
 print(WebKitWebView *page, GArray *argv, GString *result);
 
 gboolean
+navigation_decision_cb (WebKitWebView *web_view, WebKitWebFrame *frame, WebKitNetworkRequest *request, WebKitWebNavigationAction *navigation_action, WebKitWebPolicyDecision *policy_decision, gpointer user_data);
+
+gboolean
 new_window_cb (WebKitWebView *web_view, WebKitWebFrame *frame, WebKitNetworkRequest *request, WebKitWebNavigationAction *navigation_action, WebKitWebPolicyDecision *policy_decision, gpointer user_data);
 
 gboolean
@@ -266,9 +269,6 @@ void
 destroy_cb (GtkWidget* widget, gpointer data);
 
 void
-log_history_cb ();
-
-void
 commands_hash(void);
 
 void
@@ -448,9 +448,6 @@ void
 act_dump_config();
 
 void
-set_timeout(int seconds);
-
-void
 dump_var_hash(gpointer k, gpointer v, gpointer ud);
 
 void
@@ -491,7 +488,7 @@ void
 cmd_cookie_handler();
 
 void
-cmd_new_window();
+cmd_scheme_handler();
 
 void
 move_statusbar();