Merge branch 'experimental' into cleaning-commenting

Conflicts:
	src/callbacks.c
	src/uzbl-core.c
	src/uzbl-core.h

1 files changed, 1 insertions, 7 deletions

diff --git a/src/util.c b/src/util.c
index 3cf6416..f56eb57 100644
--- a/src/util.c
+++ b/src/util.c
@@ -172,7 +172,7 @@ find_existing_file(gchar* path_list) {
         i++;
     }
 
-g_free(executable);
+    g_free(executable);
     g_strfreev(split);
     return NULL;
 }
@@ -187,12 +187,6 @@ itos(int val) {
 }
 
 gchar*
-strfree(gchar *str) {
-    g_free(str);
-    return NULL;
-}
-
-gchar*
 argv_idx(const GArray *a, const guint idx) {
     return g_array_index(a, gchar*, idx);
 }