got rid of my fifo fix for now - it needs more TLC

diff --git a/uzbl.c b/uzbl.c
index 01eb502..41ec84e 100644 (file)
--- a/uzbl.c
+++ b/uzbl.c
@@ -613,7 +613,6 @@ static struct {char *name; Command command[2];} cmdlist[] =
     { "stop",               {view_stop_loading, 0},        },
     { "zoom_in",            {view_zoom_in, 0},             }, //Can crash (when max zoom reached?).
     { "zoom_out",           {view_zoom_out, 0},            },
-    { "reset_zoom",         {reset_zoom_level, 0},         },
     { "uri",                {load_uri, NOSPLIT}            },
     { "js",                 {run_js, NOSPLIT}              },
     { "script",             {run_external_js, 0}           },
@@ -814,12 +813,6 @@ search_reverse_text (WebKitWebView *page, GArray *argv) {
 }
 
 static void
-reset_zoom_level (WebKitWebView *page, GArray *argv) {
-    (void) argv;
-    webkit_web_view_set_zoom_level (page, 1.0);
-}
-
-static void
 dehilight (WebKitWebView *page, GArray *argv) {
     (void) argv;
     webkit_web_view_set_highlight_text_matches (page, FALSE);
@@ -1693,12 +1686,6 @@ init_fifo(gchar *dir) { /* return dir or, on error, free dir and return NULL */
     GError *error = NULL;
     gchar *path = build_stream_name(FIFO, dir);
 
-    // This extra check is an alternative to recursively calling init_fifo() or using goto 
-    if (file_exists(path)) {
-        if (unlink(path))
-            g_warning ("init_fifo: can't delete %s: %s", path, strerror(errno));
-    }
-
     if (!file_exists(path)) {
         if (mkfifo (path, 0666) == 0) {
             // we don't really need to write to the file, but if we open the file as 'r' we will block here, waiting for a writer to open the file.

diff --git a/uzbl.h b/uzbl.h
index 666343a..f238c1a 100644 (file)
--- a/uzbl.h
+++ b/uzbl.h
@@ -410,9 +410,6 @@ static void
 search_reverse_text (WebKitWebView *page, GArray *argv);
 
 static void
-reset_zoom_level (WebKitWebView *page, GArray *argv);
-
-static void
 dehilight (WebKitWebView *page, GArray *argv);
 
 static void