aboutsummaryrefslogtreecommitdiffhomepage
path: root/uzbl.c
diff options
context:
space:
mode:
Diffstat (limited to 'uzbl.c')
-rw-r--r--uzbl.c20
1 files changed, 3 insertions, 17 deletions
diff --git a/uzbl.c b/uzbl.c
index d0b2a64..1bb5ee2 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, NULL)},
@@ -772,7 +771,6 @@ load_start_cb (WebKitWebView* page, WebKitWebFrame* frame, gpointer data) {
(void) frame;
(void) data;
uzbl.gui.sbar.load_progress = 0;
- clear_keycmd(); // don't need old commands to remain on new page?
if (uzbl.behave.load_start_handler)
run_handler(uzbl.behave.load_start_handler, "");
}
@@ -799,19 +797,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);}
@@ -2369,7 +2354,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), "navigation-policy-decision-requested", G_CALLBACK (navigation_decision_cb), g->web_view);
@@ -2933,7 +2917,9 @@ main (int argc, char* argv[]) {
gboolean verbose_override = uzbl.state.verbose;
settings_init ();
- set_insert_mode(FALSE);
+
+ if (!uzbl.behave.always_insert_mode)
+ set_insert_mode(FALSE);
if (!uzbl.behave.show_status)
gtk_widget_hide(uzbl.gui.mainbar);