X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=uzbl.h;h=810076d8cf415886e0253f434d3b97ef7c058b3a;hb=a281f9aa82f4e54ed0c9c5f8ccacb97e0d32fc9d;hp=b6228a00bf4db834af218360054c139e438465d5;hpb=28ad8fa1418390966388e72cfc3a71d439d3a510;p=uzbl-mobile

diff --git a/uzbl.h b/uzbl.h
index b6228a0..810076d 100644
--- 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;
@@ -134,11 +134,8 @@ typedef struct {
     guint    caret_browsing;
     guint    mode;
     gchar*   base_url;
-    gchar*   html_endmarker;
     gchar*   insert_indicator;
     gchar*   cmd_indicator;
-    GString* html_buffer;
-    guint    html_timeout;
     gboolean print_version;
 
     /* command list: name -> Command  */
@@ -209,7 +206,7 @@ char *
 str_replace (const char* search, const char* replace, const char* string);
 
 GArray*
-read_file_by_line (gchar *path);
+read_file_by_line (const gchar *path);
 
 gchar*
 parseenv (char* string);
@@ -224,18 +221,21 @@ sigfunc *
 setup_signal(int signe, sigfunc *shandler);
 
 gboolean
-set_var_value(gchar *name, gchar *val);
+set_var_value(const gchar *name, gchar *val);
 
 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
 mime_policy_cb(WebKitWebView *web_view, WebKitWebFrame *frame, WebKitNetworkRequest *request, gchar *mime_type,  WebKitWebPolicyDecision *policy_decision, gpointer user_data);
 
-WebKitWebView*
+/*@null@*/ WebKitWebView*
 create_web_view_cb (WebKitWebView  *web_view, WebKitWebFrame *frame, gpointer user_data);
 
 gboolean
@@ -269,9 +269,6 @@ void
 destroy_cb (GtkWidget* widget, gpointer data);
 
 void
-log_history_cb ();
-
-void
 commands_hash(void);
 
 void
@@ -347,13 +344,13 @@ parse_command(const char *cmd, const char *param, GString *result);
 void
 parse_cmd_line(const char *ctl_line, GString *result);
 
-gchar*
+/*@null@*/ gchar*
 build_stream_name(int type, const gchar *dir);
 
 gboolean
 control_fifo(GIOChannel *gio, GIOCondition condition);
 
-gchar*
+/*@null@*/ gchar*
 init_fifo(gchar *dir);
 
 gboolean
@@ -362,7 +359,7 @@ control_stdin(GIOChannel *gio, GIOCondition condition);
 void
 create_stdin();
 
-gchar*
+/*@null@*/ gchar*
 init_socket(gchar *dir);
 
 gboolean
@@ -384,7 +381,7 @@ void
 exec_paramcmd(const Action* act, const guint i);
 
 void
-initialize ();
+initialize (int argc, char *argv[]);
 
 void
 create_browser ();
@@ -404,11 +401,11 @@ run_handler (const gchar *act, const gchar *args);
 void
 add_binding (const gchar *key, const gchar *act);
 
-gchar*
+/*@null@*/ gchar*
 get_xdg_var (XDG_Var xdg);
 
-gchar*
-find_xdg_file (int xdg_type, char* filename);
+/*@null@*/ gchar*
+find_xdg_file (int xdg_type, const char* filename);
 
 void
 settings_init ();
@@ -451,12 +448,6 @@ void
 act_dump_config();
 
 void
-render_html();
-
-void
-set_timeout(int seconds);
-
-void
 dump_var_hash(gpointer k, gpointer v, gpointer ud);
 
 void
@@ -497,7 +488,7 @@ void
 cmd_cookie_handler();
 
 void
-cmd_new_window();
+cmd_scheme_handler();
 
 void
 move_statusbar();