diff options
| -rwxr-xr-x | examples/scripts/load_url_from_bookmarks.sh | 1 | ||||
| -rwxr-xr-x | examples/scripts/load_url_from_history.sh | 1 | ||||
| -rw-r--r-- | uzbl.c | 21 |
3 files changed, 9 insertions, 14 deletions
diff --git a/examples/scripts/load_url_from_bookmarks.sh b/examples/scripts/load_url_from_bookmarks.sh index 428695b..d13b990 100755 --- a/examples/scripts/load_url_from_bookmarks.sh +++ b/examples/scripts/load_url_from_bookmarks.sh @@ -9,4 +9,5 @@ else fi goto=`awk '{print $1}' $file | dmenu -i` #NOTE: it's the job of the script that inserts bookmarks to make sure there are no dupes. +#[ -n "$goto" ] && echo "uri $goto" > $4 [ -n "$goto" ] && uzblctrl -s $4 -c "uri $goto" diff --git a/examples/scripts/load_url_from_history.sh b/examples/scripts/load_url_from_history.sh index ec8334d..cab4529 100755 --- a/examples/scripts/load_url_from_history.sh +++ b/examples/scripts/load_url_from_history.sh @@ -3,4 +3,5 @@ history_file=/tmp/uzbl.history goto=`awk '{print $3}' $history_file | sort | uniq | dmenu -i` +#[ -n "$goto" ] && echo "uri $goto" > $4 [ -n "$goto" ] && uzblctrl -s $4 -c "uri $goto" @@ -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); |