summaryrefslogtreecommitdiff
path: root/src/dwb.c
diff options
context:
space:
mode:
authorportix <portix@gmx.net>2013-02-12 16:36:22 +0100
committerportix <portix@gmx.net>2013-02-12 16:36:22 +0100
commitad0eaf659e4b62feb7bf6b42ac4f0f69cc574a64 (patch)
tree7c0fcd9e246ff1b4033897d9a1f1f2a7eb58784e /src/dwb.c
parent07f7882f265059305667d7eba3ca3959202f8e16 (diff)
downloaddwb-ad0eaf659e4b62feb7bf6b42ac4f0f69cc574a64.zip
Backed out changeset dfda54254c70
Diffstat (limited to 'src/dwb.c')
-rw-r--r--src/dwb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dwb.c b/src/dwb.c
index 8fc1459b..ffd6f119 100644
--- a/src/dwb.c
+++ b/src/dwb.c
@@ -2428,7 +2428,7 @@ dwb_load_uri(GList *gl, const char *arg)
if ( (script = dwb_test_userscript(tmpuri)) )
{
- Arg a = { .p = script };
+ Arg a = { .arg = script };
dwb_execute_user_script(NULL, &a);
g_free(script);
goto clean;
@@ -3181,7 +3181,7 @@ dwb_get_scripts()
map->key = "";
map->mod = 0;
}
- FunctionMap fm = { { n->first, n->first }, CP_DONT_SAVE | CP_COMMANDLINE | CP_USERSCRIPT, (Func)dwb_execute_user_script, NULL, POST_SM, { .p = path, .ro = true }, EP_NONE, {NULL} };
+ FunctionMap fm = { { n->first, n->first }, CP_DONT_SAVE | CP_COMMANDLINE | CP_USERSCRIPT, (Func)dwb_execute_user_script, NULL, POST_SM, { .p = path }, EP_NONE, {NULL} };
*fmap = fm;
map->map = fmap;
dwb.misc.userscripts = g_list_prepend(dwb.misc.userscripts, n);
@@ -4460,7 +4460,7 @@ dwb_parse_command_line(const char *line)
dwb_change_mode(NORMAL_MODE, true);
dwb.state.nummod = nummod;
- if (token[1])
+ if (token[1] && ! m->map->arg.ro)
{
g_strstrip(token[1]);
m->map->arg.arg = token[1];