|
 |
a63a730 |
From e9bf85e48e204392ba26fcb5767a02ac31486583 Mon Sep 17 00:00:00 2001
|
|
|
a63a730 |
From: Daiki Ueno <ueno@unixuser.org>
|
|
|
a63a730 |
Date: Mon, 28 Oct 2013 17:28:26 +0900
|
|
|
a63a730 |
Subject: [PATCH] Invoke ibus-setup-hangul with the absolute path
|
|
|
a63a730 |
|
|
|
a63a730 |
Partially 8d3735e4, which installs ibus-setup-hangul under bindir.
|
|
|
a63a730 |
---
|
|
|
a63a730 |
src/engine.c | 13 +++++++++++--
|
|
|
a63a730 |
1 file changed, 11 insertions(+), 2 deletions(-)
|
|
|
a63a730 |
|
|
|
a63a730 |
diff --git a/src/engine.c b/src/engine.c
|
|
|
a63a730 |
index 602f073..e918a15 100644
|
|
|
a63a730 |
--- a/src/engine.c
|
|
|
a63a730 |
+++ b/src/engine.c
|
|
|
a63a730 |
@@ -1201,10 +1201,19 @@ ibus_hangul_engine_property_activate (IBusEngine *engine,
|
|
|
a63a730 |
if (strcmp(prop_name, "setup") == 0) {
|
|
|
a63a730 |
GError *error = NULL;
|
|
|
a63a730 |
gchar *argv[2] = { NULL, };
|
|
|
a63a730 |
+ gchar *path;
|
|
|
a63a730 |
+ const char* libexecdir;
|
|
|
a63a730 |
|
|
|
a63a730 |
- argv[0] = "ibus-setup-hangul";
|
|
|
a63a730 |
+ libexecdir = g_getenv("LIBEXECDIR");
|
|
|
a63a730 |
+ if (libexecdir == NULL)
|
|
|
a63a730 |
+ libexecdir = LIBEXECDIR;
|
|
|
a63a730 |
+
|
|
|
a63a730 |
+ path = g_build_filename(libexecdir, "ibus-setup-hangul", NULL);
|
|
|
a63a730 |
+ argv[0] = path;
|
|
|
a63a730 |
argv[1] = NULL;
|
|
|
a63a730 |
- g_spawn_async (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &error);
|
|
|
a63a730 |
+ g_spawn_async (NULL, argv, NULL, 0, NULL, NULL, NULL, &error);
|
|
|
a63a730 |
+
|
|
|
a63a730 |
+ g_free(path);
|
|
|
a63a730 |
} else if (strcmp(prop_name, "hanja_mode") == 0) {
|
|
|
a63a730 |
IBusHangulEngine *hangul = (IBusHangulEngine *) engine;
|
|
|
a63a730 |
|
|
|
a63a730 |
--
|
|
|
a63a730 |
1.8.3.1
|
|
|
a63a730 |
|