From 46da0c91288a9c9d20af3a92c58b1dc6a00de4f4 Mon Sep 17 00:00:00 2001 From: Tom Adams Date: Sun, 23 Aug 2009 20:16:25 +0100 Subject: [PATCH 1/1] Remove redundant history_handler. --- examples/config/uzbl/config | 3 +-- examples/data/uzbl/scripts/history.sh | 3 +-- uzbl.c | 15 --------------- uzbl.h | 4 ---- 4 files changed, 2 insertions(+), 23 deletions(-) diff --git a/examples/config/uzbl/config b/examples/config/uzbl/config index ab2cf7f..86f4268 100644 --- a/examples/config/uzbl/config +++ b/examples/config/uzbl/config @@ -4,14 +4,13 @@ # keyboard behavior in this sample config is sort of vimstyle # Handlers -set history_handler = spawn $XDG_DATA_HOME/uzbl/scripts/history.sh set download_handler = spawn $XDG_DATA_HOME/uzbl/scripts/download.sh set cookie_handler = spawn $XDG_DATA_HOME/uzbl/scripts/cookies.py #set new_window = sh 'echo uri "$8" > $4' # open in same window set new_window = sh 'uzbl -u $8' # equivalent to the default behaviour set load_start_handler = set status_message = wait set load_commit_handler = set status_message = recv -set load_finish_handler = set status_message = done +set load_finish_handler = chain 'set status_message = done' 'spawn $XDG_DATA_HOME/uzbl/scripts/history.sh' diff --git a/examples/data/uzbl/scripts/history.sh b/examples/data/uzbl/scripts/history.sh index d726f9c..7c83aa6 100755 --- a/examples/data/uzbl/scripts/history.sh +++ b/examples/data/uzbl/scripts/history.sh @@ -1,6 +1,5 @@ #!/bin/sh -#TODO: strip 'http://' part file=${XDG_DATA_HOME:-$HOME/.local/share}/uzbl/history [ -d `dirname $file` ] || exit 1 -echo "$8 $6 $7" >> $file +echo `date +'%Y-%m-%d %H:%M:%S'`" $6 $7" >> $file diff --git a/uzbl.c b/uzbl.c index e90d220..76f1416 100644 --- a/uzbl.c +++ b/uzbl.c @@ -137,7 +137,6 @@ const struct var_name_to_ptr_t { { "load_finish_handler", PTR_V_STR(uzbl.behave.load_finish_handler, 1, NULL)}, { "load_start_handler", PTR_V_STR(uzbl.behave.load_start_handler, 1, NULL)}, { "load_commit_handler", PTR_V_STR(uzbl.behave.load_commit_handler, 1, NULL)}, - { "history_handler", PTR_V_STR(uzbl.behave.history_handler, 1, NULL)}, { "download_handler", PTR_V_STR(uzbl.behave.download_handler, 1, NULL)}, { "cookie_handler", PTR_V_STR(uzbl.behave.cookie_handler, 1, cmd_cookie_handler)}, { "new_window", PTR_V_STR(uzbl.behave.new_window, 1, cmd_new_window)}, @@ -750,19 +749,6 @@ destroy_cb (GtkWidget* widget, gpointer data) { gtk_main_quit (); } -void -log_history_cb () { - if (uzbl.behave.history_handler) { - time_t rawtime; - struct tm * timeinfo; - char date [80]; - time ( &rawtime ); - timeinfo = localtime ( &rawtime ); - strftime (date, 80, "\"%Y-%m-%d %H:%M:%S\"", timeinfo); - run_handler(uzbl.behave.history_handler, date); - } -} - /* 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);} @@ -2318,7 +2304,6 @@ create_browser () { g_signal_connect (G_OBJECT (g->web_view), "load-progress-changed", G_CALLBACK (progress_change_cb), g->web_view); g_signal_connect (G_OBJECT (g->web_view), "load-committed", G_CALLBACK (load_commit_cb), g->web_view); g_signal_connect (G_OBJECT (g->web_view), "load-started", G_CALLBACK (load_start_cb), g->web_view); - g_signal_connect (G_OBJECT (g->web_view), "load-finished", G_CALLBACK (log_history_cb), g->web_view); g_signal_connect (G_OBJECT (g->web_view), "load-finished", G_CALLBACK (load_finish_cb), g->web_view); g_signal_connect (G_OBJECT (g->web_view), "hovering-over-link", G_CALLBACK (link_hover_cb), g->web_view); g_signal_connect (G_OBJECT (g->web_view), "new-window-policy-decision-requested", G_CALLBACK (new_window_cb), g->web_view); diff --git a/uzbl.h b/uzbl.h index 658eae4..f43eaad 100644 --- a/uzbl.h +++ b/uzbl.h @@ -93,7 +93,6 @@ typedef struct { gchar* title_format_short; gchar* title_format_long; gchar* status_background; - gchar* history_handler; gchar* fifo_dir; gchar* socket_dir; gchar* download_handler; @@ -266,9 +265,6 @@ void destroy_cb (GtkWidget* widget, gpointer data); void -log_history_cb (); - -void commands_hash(void); void -- 1.7.9.5