Merge branch 'experimental' of git://github.com/Dieterbe/uzbl

Conflicts:
	uzbl.c
	uzbl.h

diff --cc uzbl.c
index 8390a47,84e496a..cc5f125
--- 1/uzbl.c
--- 2/uzbl.c
+++ b/uzbl.c
@@@ -640,10 -639,10 +639,10 @@@ cmd_set_geometry() 
         the above setting and we don't want to end up with
         wrong geometry information
      */
 -    retreive_geometry();
 +    retrieve_geometry();
  }
  
- static void
+ void
  cmd_set_status() {
      if (!uzbl.behave.show_status) {
          gtk_widget_hide(uzbl.gui.mainbar);
@@@ -1665,12 -1672,8 +1672,12 @@@ cmd_useragent() 
      }
  }
  
- static void
+ void
  move_statusbar() {
 +    if (!uzbl.gui.scrolled_win &&
 +            !uzbl.gui.mainbar)
 +        return;
 +
      gtk_widget_ref(uzbl.gui.scrolled_win);
      gtk_widget_ref(uzbl.gui.mainbar);
      gtk_container_remove(GTK_CONTAINER(uzbl.gui.vbox), uzbl.gui.scrolled_win);
@@@ -2732,9 -2735,11 +2739,11 @@@ main (int argc, char* argv[]) 
      if(uzbl.gui.geometry)
          cmd_set_geometry();
      else
 -        retreive_geometry();
 +        retrieve_geometry();
  
      gchar *uri_override = (uzbl.state.uri ? g_strdup(uzbl.state.uri) : NULL);
+     if (argc > 1 && !uzbl.state.uri)
+         uri_override = g_strdup(argv[1]);
      gboolean verbose_override = uzbl.state.verbose;
  
      settings_init ();