projects
/
platform
/
upstream
/
ibus.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
14bf7bd
)
ibus-x11 does not call g_error, when it connects to ibus-daemon failed.
author
Peng Huang
<shawn.p.huang@gmail.com>
Sun, 2 May 2010 07:44:13 +0000
(15:44 +0800)
committer
Peng Huang
<shawn.p.huang@gmail.com>
Sun, 2 May 2010 07:44:13 +0000
(15:44 +0800)
client/x11/main.c
patch
|
blob
|
history
diff --git
a/client/x11/main.c
b/client/x11/main.c
index
984f2ae
..
c320e1e
100644
(file)
--- a/
client/x11/main.c
+++ b/
client/x11/main.c
@@
-898,14
+898,11
@@
_init_ibus (void)
{
if (_bus != NULL)
return;
+
ibus_init ();
_bus = ibus_bus_new ();
- if (!ibus_bus_is_connected (_bus)) {
- g_error ("Can not connect to ibus-daemon!");
- }
-
g_signal_connect (_bus, "disconnected",
G_CALLBACK (_bus_disconnected_cb), NULL);
}
@@
-977,7
+974,7
@@
_xim_init_IMdkit ()
if (!ibus_bus_is_connected (_bus)) {
g_warning ("Can not connect to ibus daemon");
- exit (
1
);
+ exit (
EXIT_FAILURE
);
}
}