summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gorse <mgorse@suse.com>2012-09-10 12:00:19 -0500
committerMike Gorse <mgorse@suse.com>2012-09-10 12:00:19 -0500
commit35e3205bf55c3c818524dcb009dae41620b57e96 (patch)
tree71ae5b7abc36239b6c56a7b1b6f28429a51e3c38
parent4c271819e4efc5a59b383e640c0592914c173585 (diff)
downloadat-spi2-core-35e3205bf55c3c818524dcb009dae41620b57e96.tar.gz
Exit without a SIGABRT when unable to open X display
At-spi2-registryd was calling g_error when unable to open the default display, which led to a SIGABRT and a core dump. This behavior is inconsistent with what is generally done by GNOME apps, so let's call g_warning() and exit(1) instead. https://bugzilla.gnome.org/show_bug.cgi?id=660407
-rw-r--r--registryd/display.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/registryd/display.c b/registryd/display.c
index 730b61c2..2ba781c4 100644
--- a/registryd/display.c
+++ b/registryd/display.c
@@ -43,8 +43,8 @@ Display *spi_set_display (const char *display_name)
default_display = XOpenDisplay (display_name);
if (!default_display)
{
- g_error ("AT-SPI: Cannot open default display");
- return NULL;
+ g_warning ("AT-SPI: Cannot open default display");
+ exit (1);
}
return default_display;
}