summaryrefslogtreecommitdiffstats
path: root/launcher
diff options
context:
space:
mode:
authorHuang Peng <shawn.p.huang@gmail.com>2008-08-13 15:42:26 +0800
committerHuang Peng <shawn.p.huang@gmail.com>2008-08-13 15:42:26 +0800
commita5f1cd6816b4179f8e236b6b8cc9aca374bfe76c (patch)
tree081fa3f105a016ba310cb5fcdf1a360a68331126 /launcher
parent1b0b4528869fe3b1a46e49a38385226dba228491 (diff)
downloadibus-a5f1cd6816b4179f8e236b6b8cc9aca374bfe76c.tar.gz
ibus-a5f1cd6816b4179f8e236b6b8cc9aca374bfe76c.tar.xz
ibus-a5f1cd6816b4179f8e236b6b8cc9aca374bfe76c.zip
Fix problem in archlinux.
Diffstat (limited to 'launcher')
-rw-r--r--launcher/ibus.in17
1 files changed, 10 insertions, 7 deletions
diff --git a/launcher/ibus.in b/launcher/ibus.in
index 9db50d7..0191988 100644
--- a/launcher/ibus.in
+++ b/launcher/ibus.in
@@ -29,15 +29,18 @@ import ibus
import dbus
import signal
-daemon = "@prefix@/libexec/ibus-daemon"
-x11 = "@prefix@/libexec/ibus-x11"
-panel = "@prefix@/libexec/ibus-panel"
-conf = "@prefix@/libexec/ibus-gconf"
+prefix = "@prefix@"
+exec_prefix = "@exec_prefix@".replace("${prefix}", prefix)
+libexecdir = "@libexecdir@".replace("${exec_prefix}", exec_prefix)
+daemon = "%s/ibus-daemon" % libexecdir
+x11 = "%s/ibus-x11" % libexecdir
+panel = "%s/ibus-panel" % libexecdir
+conf = "%s/ibus-gconf" % libexecdir
-class IBusLauncher(object):
+class Launcher(object):
def __init__(self):
- super(IBusLauncher, self).__init__()
+ super(Launcher, self).__init__()
self.__daemon_pid = 0
self.__panel_pid = 0
self.__x11_pid = 0
@@ -120,4 +123,4 @@ class IBusLauncher(object):
ibus.main()
if __name__ == "__main__":
- IBusLauncher().run()
+ Launcher().run()