Adapt print()

[surf.git] / surf.c

diff --git a/surf.c b/surf.c
index f227d4c..9444982 100644 (file)
--- a/surf.c
+++ b/surf.c
@@ -164,7 +164,7 @@ static void showview(WebKitWebView *v, Client *c);
 static void newwindow(Client *c, const Arg *arg, gboolean noembed);
 static GtkWidget *createwindow(Client *c);
 static void pasteuri(GtkClipboard *clipboard, const char *text, gpointer d);
-static void print(Client *c, const Arg *arg);
+static void print(Client *c, const Arg *a);
 static GdkFilterReturn processx(GdkXEvent *xevent, GdkEvent *event,
                                 gpointer d);
 static gboolean winevent(GtkWidget *w, GdkEvent *e, Client *c);
@@ -1152,9 +1152,10 @@ pasteuri(GtkClipboard *clipboard, const char *text, gpointer d)
 }
 
 void
-print(Client *c, const Arg *arg)
+print(Client *c, const Arg *a)
 {
-       webkit_web_frame_print(webkit_web_view_get_main_frame(c->view));
+       webkit_print_operation_run_dialog(webkit_print_operation_new(c->view),
+           GTK_WINDOW(c->win));
 }
 
 GdkFilterReturn
@@ -1263,7 +1264,6 @@ void
 setup(void)
 {
        int i;
-       char *styledirfile, *stylepath;
        WebKitWebContext *context;
        GError *error = NULL;
 
@@ -1282,6 +1282,7 @@ setup(void)
        cookiefile = buildfile(cookiefile);
        scriptfile = buildfile(scriptfile);
        cachedir   = buildpath(cachedir);
+
        if (stylefile == NULL) {
                styledir = buildpath(styledir);
                for (i = 0; i < LENGTH(styles); i++) {
@@ -1292,19 +1293,12 @@ setup(void)
                                        styles[i].regex);
                                styles[i].regex = NULL;
                        }
-                       styledirfile    = g_strconcat(styledir, "/",
-                                                     styles[i].style, NULL);
-                       stylepath       = buildfile(styledirfile);
-                       styles[i].style = g_strconcat("file://", stylepath,
-                                                     NULL);
-                       g_free(styledirfile);
-                       g_free(stylepath);
+                       styles[i].style = g_strconcat(styledir, "/",
+                           styles[i].style, NULL);
                }
                g_free(styledir);
        } else {
-               stylepath = buildfile(stylefile);
-               stylefile = g_strconcat("file://", stylepath, NULL);
-               g_free(stylepath);
+               stylefile = buildfile(stylefile);
        }
 }