diff options
author | 2009-04-29 20:54:22 +0100 | |
---|---|---|
committer | 2009-04-29 20:54:22 +0100 | |
commit | e8913d04b7aed414ed05b17be57bc222938fa430 (patch) | |
tree | fd4a864528f2a16a308e917403091c00f9c75cfa /uzbl.c | |
parent | 7fde3fdc62f5134759935ca1a8f3e8dbe8ac9425 (diff) | |
parent | 8337a50dcb30a0e1b5fb5654fc69d52383a14bae (diff) |
Merge branch 'dieter/experimental' into experimental
Conflicts:
uzbl.c
Diffstat (limited to 'uzbl.c')
-rw-r--r-- | uzbl.c | 21 |
1 files changed, 7 insertions, 14 deletions
@@ -360,12 +360,12 @@ run_command(const char *command, const char *args) { static void parse_command(const char *cmd) { - Command *c = NULL; - char buffer[512]; - strcpy (buffer, cmd); - char * saveptr; - char * command_name = strtok_r (buffer, " ", &saveptr); - gchar * command_param = strtok_r (NULL, " ,", &saveptr); + Command *c = NULL; + char buffer[512]; + strcpy (buffer, cmd); + char * saveptr; + char * command_name = strtok_r (buffer, " ", &saveptr); + gchar * command_param = strtok_r (NULL, " ,", &saveptr); if((c = g_hash_table_lookup(commands, command_name)) != NULL){ if (c->func_2_params != NULL) { @@ -515,17 +515,10 @@ key_press_cb (WebKitWebView* page, GdkEventKey* event) //EXTERNAL BINDINGS if((act = g_hash_table_lookup(external_bindings, event->string)) != NULL) -<<<<<<< HEAD:uzbl.c if (!insert_mode || (event->state == modmask)) { - run_command(act, NULL); + run_command (act, NULL); result = TRUE; } -======= - if (!insert_mode || (event->state == modmask)) { - run_command (act, NULL); - result = TRUE; - } ->>>>>>> dieter/experimental:uzbl.c if (!result) result = (insert_mode ? FALSE : TRUE); |