Merge branch 'dev/soup-cookied'

Conflicts:
	Makefile

1 files changed, 0 insertions, 21 deletions

diff --git a/src/uzbl-core.h b/src/uzbl-core.h
index 19a5887..a572d72 100644
--- a/src/uzbl-core.h
+++ b/src/uzbl-core.h
@@ -206,12 +206,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 {
@@ -230,15 +224,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);
 
@@ -263,9 +251,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);
 
@@ -351,12 +336,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 ();