diff options
Diffstat (limited to 'uzbl-core.c')
-rw-r--r-- | uzbl-core.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/uzbl-core.c b/uzbl-core.c index 42e274e..5da987c 100644 --- a/uzbl-core.c +++ b/uzbl-core.c @@ -269,8 +269,8 @@ expand(const char *s, guint recurse) { mycmd = expand(ret, 1); gchar *quoted = g_shell_quote(mycmd); - gchar *tmp = g_strdup_printf("%s %s", - uzbl.behave.shell_cmd?uzbl.behave.shell_cmd:"/bin/sh -c", + gchar *tmp = g_strdup_printf("%s %s", + uzbl.behave.shell_cmd?uzbl.behave.shell_cmd:"/bin/sh -c", quoted); g_spawn_command_line_sync(tmp, &cmd_stdout, NULL, NULL, &err); g_free(mycmd); @@ -354,7 +354,7 @@ itos(int val) { gchar* strfree(gchar *str) { g_free(str); - return NULL; + return NULL; } gchar* @@ -618,7 +618,6 @@ scroll_cmd(WebKitWebView* page, GArray *argv, GString *result) { } - /* VIEW funcs (little webkit wrappers) */ #define VIEWFUNC(name) void view_##name(WebKitWebView *page, GArray *argv, GString *result){(void)argv; (void)result; webkit_web_view_##name(page);} VIEWFUNC(reload) @@ -906,11 +905,11 @@ void event(WebKitWebView *page, GArray *argv, GString *result) { (void) page; (void) result; GString *event_name; - gchar **split = NULL; - + gchar **split = NULL; + if(!argv_idx(argv, 0)) return; - + split = g_strsplit(argv_idx(argv, 0), " ", 2); if(split[0]) event_name = g_string_ascii_up(g_string_new(split[0])); @@ -1554,8 +1553,8 @@ parse_command(const char *cmd, const char *param, GString *result) { send_event(COMMAND_EXECUTED, tmp->str, NULL); g_string_free(tmp, TRUE); } - } - else { + } + else { gchar *tmp = g_strdup_printf("%s %s", cmd, param?param:""); send_event(COMMAND_ERROR, tmp, NULL); g_free(tmp); @@ -2399,7 +2398,7 @@ retrieve_geometry() { void initialize(int argc, char *argv[]) { int i; - + for(i=0; i<argc; ++i) { if(!strcmp(argv[i], "-s") || !strcmp(argv[i], "--socket")) { uzbl.state.plug_mode = TRUE; |