Merge branch 'helmut' into helmutexp

[uzbl-mobile] / uzbl.h

diff --git a/uzbl.h b/uzbl.h
index 40bfe79..a8d76eb 100644 (file)
--- a/uzbl.h
+++ b/uzbl.h
@@ -20,7 +20,7 @@ enum {
 };
 
 const struct {
-    gchar *symbol_name;
+    /*@null@*/ gchar *symbol_name;
     guint symbol_token;
 } symbols[] = {
     {"KEYCMD",               SYM_KEYCMD},
@@ -344,6 +344,9 @@ char*
 build_progressbar_ascii(int percent);
 
 void
+talk_to_socket(WebKitWebView *web_view, GArray *argv, GString *result);
+
+void
 spawn(WebKitWebView *web_view, GArray *argv, GString *result);
 
 void
@@ -398,9 +401,9 @@ void
 exec_paramcmd(const Action* act, const guint i);
 
 void
-initialize ();
+initialize (int argc, char *argv[]);
 
-GtkWidget*
+void
 create_browser ();
 
 GtkWidget*