From 7ca43bde2de171f4378049dff54691542bf3b1e6 Mon Sep 17 00:00:00 2001
From: Brendan Taylor <whateley@gmail.com>
Date: Sun, 25 Oct 2009 13:59:28 -0600
Subject: expand arguments given to "set *_handler"

---
 uzbl-core.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'uzbl-core.c')

diff --git a/uzbl-core.c b/uzbl-core.c
index 1480491..4fe08ce 100644
--- a/uzbl-core.c
+++ b/uzbl-core.c
@@ -2051,10 +2051,15 @@ run_handler (const gchar *act, const gchar *args) {
         g_strfreev(chainparts);
 
     } else {
-        gchar **inparts = inject_handler_args(parts[0], parts[1], args);
+        /* expand the user-specified arguments */
+        gchar* expanded = expand(parts[1], 0);
+        gchar **inparts = inject_handler_args(parts[0], expanded, args);
+
         parse_command(inparts[0], inparts[1], NULL);
+
         g_free(inparts[0]);
         g_free(inparts[1]);
+        g_free(expanded);
     }
     g_strfreev(parts);
 }
-- 
cgit v1.2.3


From 1c28354f0e6e54395f494a79b4a43285f0dfa71f Mon Sep 17 00:00:00 2001
From: Brendan Taylor <whateley@gmail.com>
Date: Sun, 25 Oct 2009 14:08:35 -0600
Subject: remove pointless cmd_{cookie,scheme}_handler()

---
 callbacks.c                 | 26 --------------------------
 callbacks.h                 |  6 ------
 examples/config/uzbl/config |  2 +-
 uzbl-core.c                 |  4 ++--
 4 files changed, 3 insertions(+), 35 deletions(-)

(limited to 'uzbl-core.c')

diff --git a/callbacks.c b/callbacks.c
index 175f4a3..b986172 100644
--- a/callbacks.c
+++ b/callbacks.c
@@ -230,32 +230,6 @@ cmd_caret_browsing() {
             uzbl.behave.caret_browsing, NULL);
 }
 
-void
-cmd_cookie_handler() {
-    gchar **split = g_strsplit(uzbl.behave.cookie_handler, " ", 2);
-    /* pitfall: doesn't handle chain actions; must the sync_ action manually */
-    if ((g_strcmp0(split[0], "sh") == 0) ||
-        (g_strcmp0(split[0], "spawn") == 0)) {
-        g_free (uzbl.behave.cookie_handler);
-        uzbl.behave.cookie_handler =
-            g_strdup_printf("sync_%s %s", split[0], split[1]);
-    }
-    g_strfreev (split);
-}
-
-void
-cmd_scheme_handler() {
-    gchar **split = g_strsplit(uzbl.behave.scheme_handler, " ", 2);
-    /* pitfall: doesn't handle chain actions; must the sync_ action manually */
-    if ((g_strcmp0(split[0], "sh") == 0) ||
-        (g_strcmp0(split[0], "spawn") == 0)) {
-        g_free (uzbl.behave.scheme_handler);
-        uzbl.behave.scheme_handler =
-            g_strdup_printf("sync_%s %s", split[0], split[1]);
-    }
-    g_strfreev (split);
-}
-
 void
 cmd_fifo_dir() {
     uzbl.behave.fifo_dir = init_fifo(uzbl.behave.fifo_dir);
diff --git a/callbacks.h b/callbacks.h
index 72361ba..05dc618 100644
--- a/callbacks.h
+++ b/callbacks.h
@@ -15,12 +15,6 @@ set_proxy_url();
 void
 set_icon();
 
-void
-cmd_cookie_handler();
-
-void
-cmd_scheme_handler();
-
 void
 move_statusbar();
 
diff --git a/examples/config/uzbl/config b/examples/config/uzbl/config
index 07bf69a..d72be2c 100644
--- a/examples/config/uzbl/config
+++ b/examples/config/uzbl/config
@@ -28,7 +28,7 @@ set scripts_dir    = $XDG_DATA_HOME/uzbl:/usr/local/share/uzbl/examples/data/uzb
 
 set download_handler   = spawn @scripts_dir/download.sh
 set cookie_handler     = talk_to_socket $XDG_CACHE_HOME/uzbl/cookie_daemon_socket
-set scheme_handler     = spawn @scripts_dir/scheme.py
+set scheme_handler     = sync_spawn @scripts_dir/scheme.py
 
 # New window handler options
 #set new_window        = sh 'echo uri "$8" > $4' # open in same window
diff --git a/uzbl-core.c b/uzbl-core.c
index 3ece965..b09b727 100644
--- a/uzbl-core.c
+++ b/uzbl-core.c
@@ -103,9 +103,9 @@ const struct var_name_to_ptr_t {
     { "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)},
     { "download_handler",       PTR_V_STR(uzbl.behave.download_handler,         1,   NULL)},
-    { "cookie_handler",         PTR_V_STR(uzbl.behave.cookie_handler,           1,   cmd_cookie_handler)},
+    { "cookie_handler",         PTR_V_STR(uzbl.behave.cookie_handler,           1,   NULL)},
     { "new_window",             PTR_V_STR(uzbl.behave.new_window,               1,   NULL)},
-    { "scheme_handler",         PTR_V_STR(uzbl.behave.scheme_handler,           1,   cmd_scheme_handler)},
+    { "scheme_handler",         PTR_V_STR(uzbl.behave.scheme_handler,           1,   NULL)},
     { "fifo_dir",               PTR_V_STR(uzbl.behave.fifo_dir,                 1,   cmd_fifo_dir)},
     { "socket_dir",             PTR_V_STR(uzbl.behave.socket_dir,               1,   cmd_socket_dir)},
     { "http_debug",             PTR_V_INT(uzbl.behave.http_debug,               1,   cmd_http_debug)},
-- 
cgit v1.2.3