3 files changed, 29 insertions, 5 deletions
diff --git a/tests/test-expand.c b/tests/test-expand.c
index 03b9b27..9b6bd95 100644
--- a/tests/test-expand.c
+++ b/tests/test-expand.c
@@ -138,6 +138,23 @@ test_COMMIT (void) {
     g_assert_cmpstr(expand_template("COMMIT", FALSE), ==, COMMIT);
 }
 
+void
+test_cmd_useragent (void) {
+    GString* expected = g_string_new("Uzbl (Webkit ");
+    g_string_append(expected, itos(WEBKIT_MAJOR_VERSION));
+    g_string_append(expected, ".");
+    g_string_append(expected, itos(WEBKIT_MINOR_VERSION));
+    g_string_append(expected, ".");
+    g_string_append(expected, itos(WEBKIT_MICRO_VERSION));
+    g_string_append(expected, " ");
+    g_string_append(expected, ARCH);
+    g_string_append(expected, ")");
+
+    set_var_value("useragent", "Uzbl (Webkit WEBKIT_MAJOR.WEBKIT_MINOR.WEBKIT_MICRO ARCH_UZBL)");
+    cmd_useragent();
+    g_assert_cmpstr(uzbl.net.useragent, ==, g_string_free(expected, FALSE));
+}
+
 int
 main (int argc, char *argv[]) {
     g_type_init();
@@ -159,7 +176,14 @@ main (int argc, char *argv[]) {
     /* g_test_add_func("/test-expand/DOMAINNAME", test_DOMAINNAME); */
     g_test_add_func("/test-expand/COMMIT", test_COMMIT);
 
+    g_test_add_func("/test-expand/cmd_useragent", test_cmd_useragent);
+
+    if (!g_thread_supported ())
+        g_thread_init (NULL);
+
+    uzbl.net.soup_session = webkit_get_default_session();
     setup_scanner();
+    make_var_to_name_hash();
 
     return g_test_run();
 }
diff --git a/uzbl.c b/uzbl.c
index 3a25cef..1d2a6c9 100644
--- a/uzbl.c
+++ b/uzbl.c
@@ -181,7 +181,7 @@ const struct {
 
 
 /* construct a hash from the var_name_to_ptr array for quick access */
-static void
+void
 make_var_to_name_hash() {
     uzbl.comm.proto_var = g_hash_table_new(g_str_hash, g_str_equal);
     while(n2v_p->name) {
@@ -1758,7 +1758,7 @@ cmd_modkey() {
     }
 }
 
-static void
+void
 cmd_useragent() {
     if (*uzbl.net.useragent == ' ') {
         g_free (uzbl.net.useragent);
@@ -1793,7 +1793,7 @@ move_statusbar() {
     return;
 }
 
-static gboolean
+gboolean
 set_var_value(gchar *name, gchar *val) {
     uzbl_cmdprop *c = NULL;
     char *endp = NULL;
diff --git a/uzbl.h b/uzbl.h
index 23409ab..daed44f 100644
--- a/uzbl.h
+++ b/uzbl.h
@@ -248,7 +248,7 @@ catch_sigterm(int s);
 static sigfunc *
 setup_signal(int signe, sigfunc *shandler);
 
-static gboolean
+gboolean
 set_var_value(gchar *name, gchar *val);
 
 static void
@@ -533,7 +533,7 @@ cmd_socket_dir();
 static void
 cmd_modkey();
 
-static void
+void
 cmd_useragent() ;
 
 static void