Merge commit 'rob/config-refactor' into experimental

2 files changed, 4 insertions, 4 deletions

diff --git a/uzbl.c b/uzbl.c
index a2a5f88..ae8def0 100644
--- a/uzbl.c
+++ b/uzbl.c
@@ -1001,14 +1001,14 @@ build_stream_name(int type, const gchar* dir) {
     return str;
 }
 
-static void
+static gboolean
 control_fifo(GIOChannel *gio, GIOCondition condition) {
     printf("triggered\n");
     gchar *ctl_line;
     GIOStatus ret;
     GError *err = NULL;
 
-    if (condition & G_IO_HUP)
+    if (condition & G_IO_HUP) 
         g_error ("Fifo: Read end of pipe died!\n");
 
     if(!gio)
@@ -1021,7 +1021,7 @@ control_fifo(GIOChannel *gio, GIOCondition condition) {
     parse_cmd_line(ctl_line);
     g_free(ctl_line);
 
-    return;
+    return TRUE;
 }
 
 static gchar*
diff --git a/uzbl.h b/uzbl.h
index 085977e..6f38052 100644
--- a/uzbl.h
+++ b/uzbl.h
@@ -264,7 +264,7 @@ var_is(const char *x, const char *y);
 static gchar*
 set_useragent(gchar *val);
 
-static void
+static gboolean
 control_fifo(GIOChannel *gio, GIOCondition condition);
 
 static gchar*