Merge branch 'dieter/experimental' into experimental

Conflicts:
	uzbl.c
	uzbl.h

1 files changed, 3 insertions, 4 deletions

diff --git a/uzbl.h b/uzbl.h
index 7ff6584..a40e8d6 100644
--- a/uzbl.h
+++ b/uzbl.h
@@ -104,11 +104,10 @@ typedef struct {
     gchar    *uri;
     gchar    *config_file;
     char    *instance_name;
-    gchar    config_file_path[500];
-    gchar    selected_url[500];
-    char     executable_path[500];
+    gchar    *selected_url;
+    gchar    *executable_path;
     GString* keycmd;
-    gchar    searchtx[500];
+    gchar    *searchtx;
     gchar*   searchold;
     struct utsname unameinfo; /* system info */
     gboolean verbose;