tidy up move to expand()

3 files changed, 7 insertions, 6 deletions

diff --git a/config.h b/config.h
index ab6e195..c6e3f35 100644
--- a/config.h
+++ b/config.h
@@ -2,8 +2,8 @@ const struct {
     char *command;
 } default_config[] = {
 { "set reset_command_mode = 1"},
-{ "set status_format = <span background=\"darkblue\" foreground=\"white\"> MODE </span> <span background=\"red\" foreground=\"white\">KEYCMD</span> (LOAD_PROGRESS%)  <b>TITLE</b>  - Uzbl browser"},
-{ "set title_format_long = KEYCMD MODE TITLE - Uzbl browser <NAME> > SELECTED_URI"},
-{ "set title_format_short = TITLE - Uzbl browser <NAME>"},
+{ "set status_format = <span background=\"darkblue\" foreground=\"white\"> \\@MODE </span> <span background=\"red\" foreground=\"white\">\\@[\\@keycmd]\\@</span> (\\@LOAD_PROGRESS%)  <b>\\@[\\@TITLE]\\@</b>  - Uzbl browser"},
+{ "set title_format_long = \\@keycmd \\@MODE \\@TITLE - Uzbl browser <\\@NAME> > \\@SELECTED_URI"},
+{ "set title_format_short = \\@TITLE - Uzbl browser <\\@NAME>"},
 { NULL   }
 };
diff --git a/examples/config/uzbl/config b/examples/config/uzbl/config
index 126df49..e75789d 100644
--- a/examples/config/uzbl/config
+++ b/examples/config/uzbl/config
@@ -68,7 +68,7 @@ set shell_cmd         = sh -c
 set show_status       = 1
 # you can optionally use this setting to override the background color of the statusbar from your GTK theme.
 set status_background = #303030
-set status_format     = <span font_family="monospace"><span background="khaki"            foreground="black">[\@[\@MODE]\@]</span> [<span weight="bold" foreground="red">\@[\@      keycmd]\@</span>] <span foreground="#606060"> \@[\@LOAD_PROGRESSBAR]\@ </span><span       foreground="#99FF66">\@[\@uri]\@</span> <span foreground="khaki">\@[\@NAME]\@</span>      <span foreground="orange">\@status_message</span><span foreground="#606060">\@[\@         SELECTED_URI]\@</span></span>
+set status_format     = <span font_family="monospace"><span background="khaki" foreground="black">[\@[\@MODE]\@]</span> [<span weight="bold" foreground="red">\@[\@keycmd]\@</span>] <span foreground="#606060"> \@[\@LOAD_PROGRESSBAR]\@ </span><span foreground="#99FF66">\@[\@uri]\@</span> <span foreground="khaki">\@[\@NAME]\@</span>   <span foreground="orange">\@status_message</span><span foreground="#606060"> \@[\@SELECTED_URI]\@</span></span>
 set status_top        = 0
 # define how your titlebar should look like. (short = statusbar is also shown, long = show everything you must see if statusbar is off)
 set title_format_short = \@TITLE - Uzbl browser <\@NAME>
@@ -91,7 +91,7 @@ set always_insert_mode = 0
 #set  http_debug      = 0
 #set  useragent       = uzbl (Webkit @WEBKIT_MAJOR.@WEBKIT_MINOR.@WEBKIT_MICRO)
 # Example user agent containing everything:
-set  useragent       = Uzbl (Webkit @WEBKIT_MAJOR.@WEBKIT_MINOR.@WEBKIT_MICRO) (@(uname-s)@ @(uname -n)@ @(uname -r)@ @(uname -v)@ @(uname -m)@ [@ARCH_UZBL]) (Commit @COMMIT)
+set  useragent       = Uzbl (Webkit @WEBKIT_MAJOR.@WEBKIT_MINOR.@WEBKIT_MICRO) (@(uname -s)@ @(uname -n)@ @(uname -r)@ @(uname -v)@ @(uname -m)@ [@ARCH_UZBL]) (Commit @COMMIT)
 #set  max_conns	      = 0
 #set  max_conns_host  = 0
 
diff --git a/uzbl.c b/uzbl.c
index 5b2ece7..9e833d6 100644
--- a/uzbl.c
+++ b/uzbl.c
@@ -143,6 +143,7 @@ const struct {
     { "max_conns",           PTR_V(uzbl.net.max_conns,              INT,  1,   cmd_max_conns)},
     { "max_conns_host",      PTR_V(uzbl.net.max_conns_host,         INT,  1,   cmd_max_conns_host)},
     { "useragent",           PTR_V(uzbl.net.useragent,              STR,  1,   cmd_useragent)},
+
     /* exported WebKitWebSettings properties */
     { "zoom_level",          PTR_V(uzbl.behave.zoom_level,          FLOAT,1,   cmd_zoom_level)},
     { "font_size",           PTR_V(uzbl.behave.font_size,           INT,  1,   cmd_font_size)},
@@ -2665,7 +2666,6 @@ initialize(int argc, char *argv[]) {
     /* default mode indicators */
     uzbl.behave.insert_indicator = g_strdup("I");
     uzbl.behave.cmd_indicator    = g_strdup("C");
-    set_insert_mode(FALSE);
 
     uzbl.info.webkit_major = WEBKIT_MAJOR_VERSION;
     uzbl.info.webkit_minor = WEBKIT_MINOR_VERSION;
@@ -2734,6 +2734,7 @@ main (int argc, char* argv[]) {
     gboolean verbose_override = uzbl.state.verbose;
 
     settings_init ();
+    set_insert_mode(FALSE);
 
     if (!uzbl.behave.show_status)
         gtk_widget_hide(uzbl.gui.mainbar);