Merge branch 'experimental' of git://github.com/Dieterbe/uzbl into experimental

4 files changed, 5 insertions, 31 deletions

diff --git a/examples/config/config b/examples/config/config
index cc42c54..cd6a0c0 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
 
@@ -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 -'
 
@@ -331,11 +331,12 @@ set formfiller = spawn @scripts_dir/formfiller
 
 # --- 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 c95c0f1..145bc19 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -692,23 +692,7 @@ gboolean
 download_cb (WebKitWebView *web_view, GObject *download, gpointer user_data) {
     (void) web_view;
     (void) user_data;
-    if (uzbl.behave.download_handler) {
-        const gchar* uri = webkit_download_get_uri ((WebKitDownload*)download);
-        if (uzbl.state.verbose)
-            printf("Download -> %s\n",uri);
-
-        /* if urls not escaped, we may have to escape and quote uri before this call */
-        GString *args = g_string_new(uri);
-
-        if (uzbl.net.proxy_url) {
-           g_string_append_c(args, ' ');
-           g_string_append(args, uzbl.net.proxy_url);
-        }
-
-        run_handler(uzbl.behave.download_handler, args->str);
 
-        g_string_free(args, TRUE);
-    }
     send_event(DOWNLOAD_REQ, webkit_download_get_uri ((WebKitDownload*)download), NULL);
     return (FALSE);
 }
diff --git a/src/uzbl-core.c b/src/uzbl-core.c
index 6cf8b10..6d90d09 100644
--- a/src/uzbl-core.c
+++ b/src/uzbl-core.c
@@ -90,7 +90,6 @@ const struct var_name_to_ptr_t {
     { "print_events",           PTR_V_INT(uzbl.state.events_stdout,             1,   NULL)},
     { "inject_html",            PTR_V_STR(uzbl.behave.inject_html,              0,   cmd_inject_html)},
     { "geometry",               PTR_V_STR(uzbl.gui.geometry,                    1,   cmd_set_geometry)},
-    { "keycmd",                 PTR_V_STR(uzbl.state.keycmd,                    1,   NULL)},
     { "show_status",            PTR_V_INT(uzbl.behave.show_status,              1,   cmd_set_status)},
     { "status_top",             PTR_V_INT(uzbl.behave.status_top,               1,   move_statusbar)},
     { "status_format",          PTR_V_STR(uzbl.behave.status_format,            1,   NULL)},
@@ -99,7 +98,6 @@ const struct var_name_to_ptr_t {
     { "title_format_short",     PTR_V_STR(uzbl.behave.title_format_short,       1,   NULL)},
     { "icon",                   PTR_V_STR(uzbl.gui.icon,                        1,   set_icon)},
     { "forward_keys",           PTR_V_INT(uzbl.behave.forward_keys,             1,   NULL)},
-    { "download_handler",       PTR_V_STR(uzbl.behave.download_handler,         1,   NULL)},
     { "cookie_handler",         PTR_V_STR(uzbl.behave.cookie_handler,           1,   NULL)},
     { "authentication_handler", PTR_V_STR(uzbl.behave.authentication_handler,   1,   set_authentication_handler)},
     { "new_window",             PTR_V_STR(uzbl.behave.new_window,               1,   NULL)},
@@ -2533,7 +2531,6 @@ initialize(int argc, char *argv[]) {
     }
 
     uzbl.net.soup_session = webkit_get_default_session();
-    uzbl.state.keycmd = g_strdup("");
 
     for(i=0; sigs[i]; i++) {
         if(setup_signal(sigs[i], catch_signal) == SIG_ERR)
diff --git a/src/uzbl-core.h b/src/uzbl-core.h
index 23072e4..73ec7c1 100644
--- a/src/uzbl-core.h
+++ b/src/uzbl-core.h
@@ -92,7 +92,6 @@ typedef struct {
     gchar    *selected_url;
     gchar    *last_selected_url;
     gchar    *executable_path;
-    gchar*   keycmd;
     gchar*   searchtx;
     gboolean verbose;
     gboolean events_stdout;
@@ -122,7 +121,6 @@ typedef struct {
     gchar*   status_background;
     gchar*   fifo_dir;
     gchar*   socket_dir;
-    gchar*   download_handler;
     gchar*   cookie_handler;
     gchar*   authentication_handler;
     gchar*   new_window;
@@ -266,9 +264,6 @@ bool
 file_exists (const char * filename);
 
 void
-set_keycmd();
-
-void
 load_uri (WebKitWebView * web_view, GArray *argv, GString *result);
 
 void
@@ -339,9 +334,6 @@ gboolean
 key_release_cb (GtkWidget* window, GdkEventKey* event);
 
 void
-run_keycmd(const gboolean key_ret);
-
-void
 initialize (int argc, char *argv[]);
 
 void