From 2518760dbfec5c7f7281f6ab94eeaa6ae9c598a4 Mon Sep 17 00:00:00 2001 From: Robert Manea Date: Mon, 18 May 2009 14:48:31 +0200 Subject: [PATCH] fixed failing to load argument to --uri --- uzbl.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/uzbl.c b/uzbl.c index 7d716bc..43178e9 100644 --- a/uzbl.c +++ b/uzbl.c @@ -995,8 +995,6 @@ set_var_value(gchar *name, gchar *val) { SOUP_SESSION_MAX_CONNS_PER_HOST, uzbl.net.max_conns_host, NULL); } else if (var_is("http_debug", name)) { - //soup_session_remove_feature - // (uzbl.net.soup_session, uzbl.net.soup_logger); soup_session_remove_feature (uzbl.net.soup_session, SOUP_SESSION_FEATURE(uzbl.net.soup_logger)); /* do we leak if this doesn't get freed? why does it occasionally crash if freed? */ @@ -1685,6 +1683,7 @@ main (int argc, char* argv[]) { g_option_context_add_main_entries (context, entries, NULL); g_option_context_add_group (context, gtk_get_option_group (TRUE)); g_option_context_parse (context, &argc, &argv, NULL); + g_option_context_free(context); /* initialize hash table */ uzbl.bindings = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, free_action); @@ -1717,7 +1716,6 @@ 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); //TODO: is this needed? gtk_widget_grab_focus (GTK_WIDGET (uzbl.gui.web_view)); gtk_widget_show_all (uzbl.gui.main_window); @@ -1745,6 +1743,10 @@ main (int argc, char* argv[]) { create_stdin(); + if(uzbl.state.uri) + load_uri (uzbl.gui.web_view, uzbl.state.uri); + + gtk_main (); clean_up(); -- 1.7.9.5