summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--surf.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/surf.c b/surf.c
index cd0a13c..93a1629 100644
--- a/surf.c
+++ b/surf.c
@@ -271,18 +271,20 @@ setup(void)
if (signal(SIGHUP, sighup) == SIG_ERR)
die("Can't install SIGHUP handler");
- gtk_init(NULL, NULL);
-
- gdpy = gdk_display_get_default();
- dpy = GDK_DISPLAY_XDISPLAY(gdpy);
-
- curconfig = defconfig;
+ if (!(dpy = XOpenDisplay(NULL)))
+ die("Can't open default display");
/* atoms */
atoms[AtomFind] = XInternAtom(dpy, "_SURF_FIND", False);
atoms[AtomGo] = XInternAtom(dpy, "_SURF_GO", False);
atoms[AtomUri] = XInternAtom(dpy, "_SURF_URI", False);
+ gtk_init(NULL, NULL);
+
+ gdpy = gdk_display_get_default();
+
+ curconfig = defconfig;
+
/* dirs and files */
cookiefile = buildfile(cookiefile);
scriptfile = buildfile(scriptfile);
@@ -901,6 +903,7 @@ cleanup(void)
g_free(scriptfile);
g_free(stylefile);
g_free(cachedir);
+ XCloseDisplay(dpy);
}
WebKitWebView *