summaryrefslogtreecommitdiff
path: root/beryl-plugins/src/crashhandler.c
diff options
context:
space:
mode:
authorquinn <quinn@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-09-30 11:58:49 +0000
committerquinn <quinn@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-09-30 11:58:49 +0000
commit4de155464d8101b4dab13b659ae9054649fd015c (patch)
tree055f3de0d7e36ebff1477e5925d19a21b1188697 /beryl-plugins/src/crashhandler.c
parentdfdec57999b80a630e7cbc1a4aba4eeed091b8b7 (diff)
downloadmarex-dev-4de155464d8101b4dab13b659ae9054649fd015c.tar.gz
marex-dev-4de155464d8101b4dab13b659ae9054649fd015c.tar.bz2
major overhaul of keybindings system
bump VERSION to 0.1.1 bump ABI VERSION to 4 git-svn-id: file:///beryl/trunk@406 d7aaf104-2d23-0410-ae22-9d23157bf5a3
Diffstat (limited to 'beryl-plugins/src/crashhandler.c')
-rw-r--r--beryl-plugins/src/crashhandler.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/beryl-plugins/src/crashhandler.c b/beryl-plugins/src/crashhandler.c
index a383c26..d460920 100644
--- a/beryl-plugins/src/crashhandler.c
+++ b/beryl-plugins/src/crashhandler.c
@@ -139,7 +139,7 @@ crashhandlerSetDisplayOption (CompDisplay * display, char *name,
}
static void
-crashhandlerDisplayInitOptions (CrashhandlerDisplay * cd, Display * display)
+crashhandlerDisplayInitOptions (CrashhandlerDisplay * cd)
{
CompOption *o;
@@ -182,9 +182,7 @@ crashhandlerGetDisplayOptions (CompDisplay * display, int *count)
else
{
CrashhandlerDisplay * cd = malloc(sizeof(CrashhandlerDisplay));
- Display * d = XOpenDisplay(getenv("DISPLAY"));
- if (!d)exit(1);
- crashhandlerDisplayInitOptions(cd,d);
+ crashhandlerDisplayInitOptions(cd);
*count = NUM_OPTIONS(cd);
return cd->opt;
}
@@ -206,7 +204,7 @@ crashhandlerInitDisplay (CompPlugin * p, CompDisplay * d)
free (cd);
return FALSE;
}
- crashhandlerDisplayInitOptions (cd, d->display);
+ crashhandlerDisplayInitOptions (cd);
cDisplay = d;
if (cd->opt[CRASHHANDLER_DISPLAY_OPTION_ENABLED].value.b)