Merge branch 'escaped_events' into experimental

2 files changed, 4 insertions, 4 deletions

diff --git a/src/inspector.c b/src/inspector.c
index de3dbcd..4c8c890 100644
--- a/src/inspector.c
+++ b/src/inspector.c
@@ -49,7 +49,7 @@ inspector_show_window_cb (WebKitWebInspector* inspector){
     (void) inspector;
     gtk_widget_show(uzbl.gui.inspector_window);
 
-    send_event(WEBINSPECTOR, "open", NULL);
+    send_event(WEBINSPECTOR, NULL, TYPE_NAME, "open", NULL);
     return TRUE;
 }
 
@@ -57,7 +57,7 @@ inspector_show_window_cb (WebKitWebInspector* inspector){
 gboolean
 inspector_close_window_cb (WebKitWebInspector* inspector){
     (void) inspector;
-    send_event(WEBINSPECTOR, "close", NULL);
+    send_event(WEBINSPECTOR, NULL, TYPE_NAME, "close", NULL);
     return TRUE;
 }
 
diff --git a/src/io.c b/src/io.c
index 80a7337..3f8fa2f 100644
--- a/src/io.c
+++ b/src/io.c
@@ -61,7 +61,7 @@ attach_fifo(gchar *path) {
         if (g_io_add_watch(chan, G_IO_IN|G_IO_HUP, (GIOFunc) control_fifo, NULL)) {
             if (uzbl.state.verbose)
                 printf ("attach_fifo: created successfully as %s\n", path);
-            send_event(FIFO_SET, path, NULL);
+            send_event(FIFO_SET, NULL, TYPE_STR, path, NULL);
             uzbl.comm.fifo_path = path;
             g_setenv("UZBL_FIFO", uzbl.comm.fifo_path, TRUE);
             return TRUE;
@@ -287,7 +287,7 @@ attach_socket(gchar *path, struct sockaddr_un *local) {
         if( (chan = g_io_channel_unix_new(sock)) ) {
             g_io_add_watch(chan, G_IO_IN|G_IO_HUP, (GIOFunc) control_socket, chan);
             uzbl.comm.socket_path = path;
-            send_event(SOCKET_SET, path, NULL);
+            send_event(SOCKET_SET, NULL, TYPE_STR, path, NULL);
             g_setenv("UZBL_SOCKET", uzbl.comm.socket_path, TRUE);
             return TRUE;
         }