reorder some stuff to make more sense + allow up to 1k chars on a line

1 files changed, 7 insertions, 9 deletions

diff --git a/uzbl.c b/uzbl.c
index 9985b52..688c418 100644
--- a/uzbl.c
+++ b/uzbl.c
@@ -1476,13 +1476,13 @@ settings_init () {
 
     if (s->config_file) {
         FILE * conf;
-        char readbuf [300];
+        char readbuf [1000];
         conf = fopen (s->config_file, "r");
         if (conf == NULL) {
             fprintf(stderr, "uzbl: error loading file%s\n", s->config_file);
         } else {
             while(!feof(conf)) {
-                fgets (readbuf , 300 , conf);
+                fgets (readbuf , 1000 , conf);
                 parse_cmd_line(readbuf);
             }
             fclose (conf);
@@ -1492,6 +1492,8 @@ settings_init () {
     } else {
         printf ("No configuration file loaded.\n");
     }
+    if (!uzbl.behave.status_format)
+        uzbl.behave.status_format = g_strdup(STATUS_DEFAULT);
 
     g_signal_connect(n->soup_session, "request-queued", G_CALLBACK(handle_cookies), NULL);
 }
@@ -1574,8 +1576,8 @@ main (int argc, char* argv[]) {
 
     setup_regex();
     setup_scanner();
-    settings_init ();
     commands_hash ();
+    make_var_to_name_hash();
 	
 
     uzbl.gui.vbox = gtk_vbox_new (FALSE, 0);
@@ -1590,7 +1592,7 @@ main (int argc, char* argv[]) {
     uzbl.gui.main_window = create_window ();
     gtk_container_add (GTK_CONTAINER (uzbl.gui.main_window), uzbl.gui.vbox);
 
-    load_uri (uzbl.gui.web_view, uzbl.state.uri);
+    load_uri (uzbl.gui.web_view, uzbl.state.uri); //TODO: is this needed?
 
     gtk_widget_grab_focus (GTK_WIDGET (uzbl.gui.web_view));
     gtk_widget_show_all (uzbl.gui.main_window);
@@ -1605,17 +1607,13 @@ main (int argc, char* argv[]) {
     uzbl.gui.bar_h = gtk_range_get_adjustment((GtkRange*) uzbl.gui.scbar_h);
     gtk_widget_set_scroll_adjustments ((GtkWidget*) uzbl.gui.web_view, uzbl.gui.bar_h, uzbl.gui.bar_v);
 
+    settings_init ();
 
-
-
-    if (!uzbl.behave.status_format)
-        uzbl.behave.status_format = g_strdup(STATUS_DEFAULT);
     if (!uzbl.behave.show_status)
         gtk_widget_hide(uzbl.gui.mainbar);
     else
         update_title();
 
-    make_var_to_name_hash();
     create_stdin();
 
     gtk_main ();