merge in masons changes

1 files changed, 9 insertions, 8 deletions

diff --git a/uzbl-core.c b/uzbl-core.c
index f897b48..fd8ee41 100644
--- a/uzbl-core.c
+++ b/uzbl-core.c
@@ -266,6 +266,7 @@ expand(const char *s, guint recurse) {
                 }
                 else if(recurse != 1 &&
                         etype == EXP_EXPR) {
+
                     /* execute program directly */
                     if(ret[0] == '+') {
                         mycmd = expand(ret+1, 1);
@@ -284,6 +285,7 @@ expand(const char *s, guint recurse) {
                         g_free(quoted);
                         g_free(tmp);
                     }
+
                     if (err) {
                         g_printerr("error on running command: %s\n", err->message);
                         g_error_free (err);
@@ -361,7 +363,7 @@ itos(int val) {
 gchar*
 strfree(gchar *str) {
     g_free(str);
-    return NULL; 
+    return NULL;
 }
 
 gchar*
@@ -625,7 +627,6 @@ scroll_cmd(WebKitWebView* page, GArray *argv, GString *result) {
 }
 
 
-
 /* VIEW funcs (little webkit wrappers) */
 #define VIEWFUNC(name) void view_##name(WebKitWebView *page, GArray *argv, GString *result){(void)argv; (void)result; webkit_web_view_##name(page);}
 VIEWFUNC(reload)
@@ -913,11 +914,11 @@ void
 event(WebKitWebView *page, GArray *argv, GString *result) {
     (void) page; (void) result;
     GString *event_name;
-    gchar **split = NULL; 
-    
+    gchar **split = NULL;
+
     if(!argv_idx(argv, 0))
        return;
-    
+
     split = g_strsplit(argv_idx(argv, 0), " ", 2);
     if(split[0])
         event_name = g_string_ascii_up(g_string_new(split[0]));
@@ -1561,8 +1562,8 @@ parse_command(const char *cmd, const char *param, GString *result) {
                 send_event(COMMAND_EXECUTED, tmp->str, NULL);
                 g_string_free(tmp, TRUE);
             }
-    } 
-    else { 
+    }
+    else {
         gchar *tmp = g_strdup_printf("%s %s", cmd, param?param:"");
         send_event(COMMAND_ERROR, tmp, NULL);
         g_free(tmp);
@@ -2406,7 +2407,7 @@ retrieve_geometry() {
 void
 initialize(int argc, char *argv[]) {
     int i;
-    
+
     for(i=0; i<argc; ++i) {
         if(!strcmp(argv[i], "-s") || !strcmp(argv[i], "--socket")) {
             uzbl.state.plug_mode = TRUE;