Stage 2: refactor expand system, get rid of superfluous expand() calls

1 files changed, 12 insertions, 8 deletions

diff --git a/uzbl-core.c b/uzbl-core.c
index 451c6ac..e9135bc 100644
--- a/uzbl-core.c
+++ b/uzbl-core.c
@@ -2005,21 +2005,24 @@ set_var_value(const gchar *name, gchar *val) {
 
         /* check for the variable type */
         if (c->type == TYPE_STR) {
-            buf = expand(val, 0);
+            //buf = expand(val, 0);
+            buf = g_strdup(val);
             g_free(*c->ptr.s);
             *c->ptr.s = buf;
             g_string_append_printf(msg, " str %s", buf);
 
         } else if(c->type == TYPE_INT) {
-            buf = expand(val, 0);
-            *c->ptr.i = (int)strtoul(buf, &endp, 10);
-            g_free(buf);
+            //buf = expand(val, 0);
+            //*c->ptr.i = (int)strtoul(buf, &endp, 10);
+            *c->ptr.i = (int)strtoul(val, &endp, 10);
+            //g_free(buf);
             g_string_append_printf(msg, " int %d", *c->ptr.i);
 
         } else if (c->type == TYPE_FLOAT) {
-            buf = expand(val, 0);
-            *c->ptr.f = strtod(buf, &endp);
-            g_free(buf);
+            //buf = expand(val, 0);
+            //*c->ptr.f = strtod(buf, &endp);
+            *c->ptr.f = strtod(val, &endp);
+            //g_free(buf);
             g_string_append_printf(msg, " float %f", *c->ptr.f);
         }
 
@@ -2042,7 +2045,8 @@ set_var_value(const gchar *name, gchar *val) {
         c->dump = 0;
         c->func = NULL;
         c->writeable = 1;
-        buf = expand(val, 0);
+        //buf = expand(val, 0);
+        buf = g_strdup(val);
         c->ptr.s = malloc(sizeof(char *));
         *c->ptr.s = buf;
         g_hash_table_insert(uzbl.comm.proto_var,