projects
/
platform
/
core
/
uifw
/
at-spi2-atk.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
221c035
)
Change remaining g_error calls to g_warning
author
Mike Gorse
<mgorse@novell.com>
Tue, 3 Aug 2010 12:31:13 +0000
(08:31 -0400)
committer
Mike Gorse
<mgorse@novell.com>
Tue, 3 Aug 2010 12:31:13 +0000
(08:31 -0400)
atk-adaptor/bridge.c
patch
|
blob
|
history
diff --git
a/atk-adaptor/bridge.c
b/atk-adaptor/bridge.c
index
55ac68b
..
571d8e1
100644
(file)
--- a/
atk-adaptor/bridge.c
+++ b/
atk-adaptor/bridge.c
@@
-119,7
+119,10
@@
spi_atk_bridge_get_bus (void)
bridge_display = XOpenDisplay (spi_display_name ());
if (!bridge_display)
bridge_display = XOpenDisplay (spi_display_name ());
if (!bridge_display)
- g_error ("AT_SPI: Could not get the display\n");
+ {
+ g_warning ("AT_SPI: Could not get the display\n");
+ return NULL;
+ }
AT_SPI_BUS = XInternAtom (bridge_display, "AT_SPI_BUS", False);
XGetWindowProperty (bridge_display,
AT_SPI_BUS = XInternAtom (bridge_display, "AT_SPI_BUS", False);
XGetWindowProperty (bridge_display,
@@
-137,19
+140,26
@@
spi_atk_bridge_get_bus (void)
("AT-SPI: Accessibility bus not found - Using session bus.\n");
bus = dbus_bus_get (DBUS_BUS_SESSION, &error);
if (!bus)
("AT-SPI: Accessibility bus not found - Using session bus.\n");
bus = dbus_bus_get (DBUS_BUS_SESSION, &error);
if (!bus)
- g_error ("AT-SPI: Couldn't connect to bus: %s\n", error.message);
+ {
+ g_warning ("AT-SPI: Couldn't connect to bus: %s\n", error.message);
+ return NULL;
+ }
}
else
{
bus = dbus_connection_open (data, &error);
if (!bus)
{
}
else
{
bus = dbus_connection_open (data, &error);
if (!bus)
{
- g_error ("AT-SPI: Couldn't connect to bus: %s\n", error.message);
+ g_warning ("AT-SPI: Couldn't connect to bus: %s\n", error.message);
+ return NULL;
}
else
{
if (!dbus_bus_register (bus, &error))
}
else
{
if (!dbus_bus_register (bus, &error))
- g_error ("AT-SPI: Couldn't register with bus: %s\n", error.message);
+ {
+ g_warning ("AT-SPI: Couldn't register with bus: %s\n", error.message);
+ return NULL;
+ }
}
}
}
}