diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | examples/config/config | 13 | ||||
| -rw-r--r-- | src/callbacks.c | 2 | ||||
| -rw-r--r-- | src/uzbl-core.c | 2 |
4 files changed, 10 insertions, 9 deletions
@@ -50,7 +50,7 @@ RUN_PREFIX?=$(PREFIX) force: # When compiling unit tests, compile uzbl as a library first -tests: ${OBJ} force +tests: ${TOBJ} force $(CC) -shared -Wl ${OBJ} -o ./tests/libuzbl-core.so cd ./tests/; $(MAKE) diff --git a/examples/config/config b/examples/config/config index c83948d..418ced3 100644 --- a/examples/config/config +++ b/examples/config/config @@ -60,7 +60,7 @@ set new_window = sh 'uzbl-browser -u $8' # Load commit handlers @on_event LOAD_COMMIT @set_status <span foreground="green">recv</span> -@on_event LOAD_COMMIT script @scripts_dir/scroll-percentage.js +#@on_event LOAD_COMMIT script @scripts_dir/scroll-percentage.js # Reset the keycmd on navigation @on_event LOAD_COMMIT @set_mode @@ -219,8 +219,8 @@ set ebind = @mode_bind global,-insert @cbind + = zoom_in @cbind - = zoom_out @cbind T = toggle_zoom_type -@cbind 1 = set zoom_level 1.0 -@cbind 2 = set zoom_level 2.0 +@cbind 1 = set zoom_level = 1.0 +@cbind 2 = set zoom_level = 2.0 # --- Appearance binds --- @cbind t = toggle_status @@ -267,7 +267,7 @@ set preset = event PRESET_TABS @cbind !dump = sh "echo dump_config > $4" # Reload config @cbind !reload = sh "sed '/^# === Post-load misc commands/,$d' $1 > $4" -# Uzbl Terminal. TODO explain why this is useful +# If you want to see all events being triggered: @cbind <Ctrl><Alt>t = sh 'xterm -e "socat unix-connect:$5 -"' #@cbind <Ctrl><Alt>t = sh 'urxvt -e socat unix-connect:$5 -' @@ -338,11 +338,12 @@ set eFormFiller = spawn @scripts_dir/eFormFiller.sh # --- External edit script configuration & binds --- # Edit form input fields in an external editor (gvim, emacs, urxvt -e vim, ..) +# disabled since Uzbl object is gone set external_editor = gvim #set external_editor = xterm -e vim -@cbind E = script @scripts_dir/extedit.js +#@cbind E = script @scripts_dir/extedit.js # And add menu option. -menu_editable_add Open in @external_editor = script @scripts_dir/extedit.js +#menu_editable_add Open in @external_editor = script @scripts_dir/extedit.js # --- Examples --- # Example showing how to use uzbl's fifo to execute a command. diff --git a/src/callbacks.c b/src/callbacks.c index 9b90d3c..c95c0f1 100644 --- a/src/callbacks.c +++ b/src/callbacks.c @@ -33,7 +33,7 @@ set_authentication_handler() { guint feature_is_set = g_slist_length(flist); g_slist_free(flist); - if (uzbl.behave.authentication_handler == NULL || *uzbl.behave.authentication_handler == NULL) { + if (uzbl.behave.authentication_handler == NULL || *uzbl.behave.authentication_handler == 0) { if (!feature_is_set) soup_session_add_feature_by_type (uzbl.net.soup_session, (GType) WEBKIT_TYPE_SOUP_AUTH_DIALOG); diff --git a/src/uzbl-core.c b/src/uzbl-core.c index ebd8ef8..6cf8b10 100644 --- a/src/uzbl-core.c +++ b/src/uzbl-core.c @@ -2341,7 +2341,7 @@ void handle_authentication (SoupSession *session, SoupMessage *msg, SoupAuth *au (void) user_data; - if(uzbl.behave.authentication_handler && *uzbl.behave.authentication_handler != NULL) { + if(uzbl.behave.authentication_handler && *uzbl.behave.authentication_handler != 0) { gchar *info, *host, *realm; gchar *p; |