1 files changed, 10 insertions, 26 deletions
diff --git a/src/uzbl-core.h b/src/uzbl-core.h
index 0c5061a..d957d68 100644
--- a/src/uzbl-core.h
+++ b/src/uzbl-core.h
@@ -40,6 +40,8 @@
 #include <sys/ioctl.h>
 #include <assert.h>
 
+#include "cookie-jar.h"
+
 #define LENGTH(x) (sizeof x / sizeof x[0])
 
 /* gui elements */
@@ -104,8 +106,8 @@ typedef struct {
 
 /* networking */
 typedef struct {
-    SoupSession *soup_session;
-    SoupCookieJar *soup_cookie_jar;
+    SoupSession   *soup_session;
+    UzblCookieJar *soup_cookie_jar;
     SoupLogger *soup_logger;
     char *proxy_url;
     char *useragent;
@@ -205,12 +207,6 @@ extern UzblCore uzbl;
 
 typedef void sigfunc(int);
 
-/* XDG Stuff */
-typedef struct {
-    gchar* environmental;
-    gchar* default_value;
-} XDG_Var;
-
 /* uzbl variables */
 enum ptr_type {TYPE_INT, TYPE_STR, TYPE_FLOAT};
 typedef struct {
@@ -229,15 +225,9 @@ typedef struct {
 char *
 itos(int val);
 
-char *
-str_replace (const char* search, const char* replace, const char* string);
-
 gchar*
 strfree(gchar *str);
 
-GArray*
-read_file_by_line (const gchar *path);
-
 gchar*
 parseenv (gchar* string);
 
@@ -262,9 +252,6 @@ print(WebKitWebView *page, GArray *argv, GString *result);
 void
 commands_hash(void);
 
-bool
-file_exists (const char * filename);
-
 void
 load_uri (WebKitWebView * web_view, GArray *argv, GString *result);
 
@@ -275,13 +262,13 @@ void
 close_uzbl (WebKitWebView *page, GArray *argv, GString *result);
 
 gboolean
+uzbl_setup_environ();
+
+gboolean
 run_command(const gchar *command, const guint npre,
             const gchar **args, const gboolean sync, char **output_stdout);
 
 void
-talk_to_socket(WebKitWebView *web_view, GArray *argv, GString *result);
-
-void
 spawn(WebKitWebView *web_view, GArray *argv, GString *result);
 
 void
@@ -350,12 +337,6 @@ create_plug ();
 void
 run_handler (const gchar *act, const gchar *args);
 
-/*@null@*/ gchar*
-get_xdg_var (XDG_Var xdg);
-
-/*@null@*/ gchar*
-find_xdg_file (int xdg_type, const char* filename);
-
 void
 settings_init ();
 
@@ -473,6 +454,9 @@ void
 include(WebKitWebView *page, GArray *argv, GString *result);
 
 void
+show_inspector(WebKitWebView *page, GArray *argv, GString *result);
+
+void
 builtins();
 
 typedef void (*Command)(WebKitWebView*, GArray *argv, GString *result);