summaryrefslogtreecommitdiff
blob: 5e0687547915d4e70605aa3ca6acb0ba7b097e16 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
From 63cda66c1665b8ccc9ae11a5a4fb341afb8c5ac0 Mon Sep 17 00:00:00 2001
From: OBATA Akio <obache@users.noreply.github.com>
Date: Mon, 30 Dec 2019 22:26:11 +0900
Subject: [PATCH] Fix to use pref tool with default toolkit (#151)

---
 configure.ac      | 1 +
 uim.desktop.in.in | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 472c67f02..d530bc081 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1188,6 +1188,7 @@ AM_CONDITIONAL(DEFAULT_TOOLKIT_GTK3, test "x$default_toolkit" = xgtk3)
 AM_CONDITIONAL(DEFAULT_TOOLKIT_QT,  test "x$default_toolkit" = xqt)
 AM_CONDITIONAL(DEFAULT_TOOLKIT_QT4, test "x$default_toolkit" = xqt4)
 AM_CONDITIONAL(DEFAULT_TOOLKIT_QT5, test "x$default_toolkit" = xqt5)
+AC_SUBST(default_toolkit)
 
 AC_ARG_ENABLE(fep,
   AC_HELP_STRING([--disable-fep],
diff --git a/uim.desktop.in.in b/uim.desktop.in.in
index b4a4d4f50..38c5c6d5e 100644
--- a/uim.desktop.in.in
+++ b/uim.desktop.in.in
@@ -3,7 +3,7 @@ Type=Application
 _Name=Input Method
 _Comment=Customize uim input method environment
 _Keywords=input;method;
-Exec=uim-pref-gtk
+Exec=uim-pref-@default_toolkit@
 Icon=@uim_pixmapsdir@/uim-icon.png
 Terminal=false
 Categories=Settings;X-GNOME-PersonalSettings;