merge from Uli Schlachter: policy callback + experimental Makefile + tiny fixes

[uzbl-mobile] / uzbl.h

diff --git a/uzbl.h b/uzbl.h
index d2364de..1a22513 100644 (file)
--- a/uzbl.h
+++ b/uzbl.h
@@ -93,9 +93,6 @@ typedef struct {
     gchar          *socket_path;
     /* stores (key)"variable name" -> (value)"pointer to this var*/
     GHashTable     *proto_var;
-    /* command parsing regexes */
-    GRegex         *act_regex;
-    GRegex         *bind_regex;
     gchar          *sync_stdout;
 } Communication;
 
@@ -245,12 +242,15 @@ setup_signal(int signe, sigfunc *shandler);
 static gboolean
 set_var_value(gchar *name, gchar *val);
 
-static gboolean
-get_var_value(const gchar *name);
+static void
+print(WebKitWebView *page, GArray *argv);
 
 static gboolean
 new_window_cb (WebKitWebView *web_view, WebKitWebFrame *frame, WebKitNetworkRequest *request, WebKitWebNavigationAction *navigation_action, WebKitWebPolicyDecision *policy_decision, gpointer user_data);
 
+static gboolean
+mime_policy_cb(WebKitWebView *web_view, WebKitWebFrame *frame, WebKitNetworkRequest *request, gchar *mime_type,  WebKitWebPolicyDecision *policy_decision, gpointer user_data);
+
 WebKitWebView*
 create_web_view_cb (WebKitWebView  *web_view, WebKitWebFrame *frame, gpointer user_data);
 
@@ -340,9 +340,6 @@ static void
 parse_command(const char *cmd, const char *param);
 
 static void
-runcmd(WebKitWebView *page, GArray *argv);
-
-static void
 parse_cmd_line(const char *ctl_line);
 
 static gchar*
@@ -431,7 +428,7 @@ static void
 set_var(WebKitWebView *page, GArray *argv);
 
 static void
-get_var(WebKitWebView *page, GArray *argv);
+act_bind(WebKitWebView *page, GArray *argv);
 
 static void
 act_dump_config();