pool/ibus
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 838688 from home:hillwood:branches:M17N

Browse Source 
- Update version to 1.5.23
  * Generate simple.xml with denylist 6042974 508527d 37db75b 6879879 59b902a
    568d58d 6ed34f3 5959d6f 5d67a28 394d9a8 ed7bc8d e938846 3aa670e 0d90da4
    e4dd6d1
  * Accept xdigits only for Unicode typing a440942
  * Update emoji-parser with CLDR emoji annotation release-31-0-1 9a9f828
  * Update ibusunicodegen.h with unicode-ucd 13.0.0 e10fc89
  * Delete deprecated ENABLE_APPINDICATOR_ENGINE_ICON check aa3a9f0
  * Fix SEGV 02105c4 f591381
  * Fix some errors in ibus-desktop-testing-runner 7b0d091 8da0167
  * Refactor source files 0b9d936 0ad5e9a
  * Fix string formats in translatable strings 7caead1 f8c468a ce865f6
  * Use WAYLAND_DISPLAY on Wayland sessions to make up IBus socket name (Carlos
    Garnacho) 8ce2520
  * Skip parsing of compose sequence with invalid keysyms (Neil Shepperd)
    0da3cec
  * Tell Pango about the engine language in the candidate panel (Aaron Muir
    Hamilton) 3f098dc 79a09f1
  * Fix for several error spotted by static analyzer (ntfs.hard) 00adea6
  * Remove glib_check_version() in gtk immodule (Changwoo Ryu) 5765bfd
  * Build the Emoji dictionaries in parallel (Changwoo Ryu) 59d0de4
  * Update translation
- Drop 0001-Replace-the-Qt-check-for-appindicator-engine-icon-wi.patch,
  0001-Replace-the-Qt-check-for-appindicator-engine-icon-wi.patch,
  ibus-socket-name-compatibility.patch. Merged by upstream

OBS-URL: https://build.opensuse.org/request/show/838688
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=240
This commit is contained in:
Hillwood Yang 2020-09-30 07:09:17 +00:00 committed by Git OBS Bridge
parent 7b23e65698
commit a5514344b4
9 changed files with 56 additions and 411 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
0001-Replace-the-Qt-check-for-appindicator-engine-icon-wi.patch
View File

@ -1,69 +0,0 @@
From e257f551179d47cd603a72524444c1f56bc31eac Mon Sep 17 00:00:00 2001
From: Antonio Larrosa <antonio.larrosa@gmail.com>
Date: Wed, 11 Mar 2020 11:47:07 +0100
Subject: [PATCH] Replace the Qt check for appindicator-engine-icon with a flag
Instead of checking the Qt version installed in the system
at build time in order to guess the plasma version the user
will be running at runtime, use a configure flag to use
an engine icon in the panel or not.
This commit adds an --enable-appindicator-engine-icon flag that
is enabled if appindicator is enabled (the default) and can
be disabled with --disable-appindicator-engine-icon .
This flag (as well as the check it replace) only seems to
affect the code at:
https://github.com/ibus/ibus/commit/35d035bfc48e20eecb3b3b3b14712d73c5fc027b#diff-498e61e4c9c641bf36042acdbb2eee53R1251
---
configure.ac | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/configure.ac b/configure.ac
index 2917c10b..6eb6088b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -300,26 +300,27 @@ else
AC_SUBST(wayland_scanner_rules)
fi
-enable_appindicator_engine_icon="no"
if test x"$enable_appindicator" = x"yes"; then
enable_appindicator="yes (enabled, use --disable-appindicator to disable)"
- # Need qt5-qtbase-devel package
- # There is no way to check the version of KStatusNotifierItem and
- # check the version of qtbase here.
- AC_MSG_CHECKING([for KDE5 appindicator engine icon])
- PKG_CHECK_EXISTS([Qt5Gui >= 5.4],
- enable_appindicator_engine_icon="yes"
- )
- AC_MSG_RESULT([$enable_appindicator_engine_icon])
-
-fi
-if test x"$enable_appindicator_engine_icon" != x"yes" ; then
- enable_appindicator_engine_icon="no (disabled, need qtbase-devel 5.4 or later)"
+ # --enable-appindicator-engine-icon option.
+ AC_ARG_ENABLE(appindicator_engine_icon,
+ AS_HELP_STRING([--enable-appindicator_engine_icon],
+ [Build appindicator engine icon support]),
+ [enable_appindicator_engine_icon=$enableval],
+ [enable_appindicator_engine_icon=yes]
+ )
+else
+ enable_appindicator_engine_icon="no (disabled since appindicator is disabled)"
fi
+
AM_CONDITIONAL([ENABLE_APPINDICATOR_ENGINE_ICON],
[test x"$enable_appindicator_engine_icon" = x"yes"])
+if test x"$enable_appindicator_engine_icon" = x"yes"; then
+ enable_appindicator_engine_icon="yes (enabled, use --disable-appindicator-engine-icon to disable)"
+fi
+
# GObject introspection
GOBJECT_INTROSPECTION_CHECK([0.6.8])
--
2.25.1

26
README.SUSE
View File

@ -4,11 +4,11 @@ How to start using ibus
English:
0:Note: ibus don't support QT3 immodule,
If you use qt3-base applications, modify your /etc/X11/xim.d/ibus to
If you use qt3-base applications, modify your /usr/etc/X11/xim.d/ibus to
export QT_IM_MODULE=xim
1.openSUSE can start ibus automatically when your locale is set to en, zh_TW, zh_CN, zh_HK, zh_SG, ko_KR and ja_JP.
The setup script is a link in /etc/X11/xim.d/YOUR-LOCALE/40-ibus which link to /etc/X11/xim.d/ibus.
The setup script is a link in /usr/etc/X11/xim.d/YOUR-LOCALE/40-ibus which link to /usr/etc/X11/xim.d/ibus.
The number "40" makes ibus have priority over other input-method (e.g 50-scim or 90-xcin ).
If you prefer not using ibus, mv 40-ibus to 80-ibus (for example). Or see 2.
@ -22,27 +22,27 @@ copy this file to ~/.xim, then you can use ibus next login X.
3.You want to use your own input-method other than system setting
(1)System setting:
Edit /etc/sysconfig/language , set INPUT_METHOD="scim-bridge", or whatever you want,Make sure your start-up script is put in /etc/X11/xim.d/ with same name ypu mention.
Edit /etc/sysconfig/language , set INPUT_METHOD="scim-bridge", or whatever you want,Make sure your start-up script is put in /usr/etc/X11/xim.d/ with same name ypu mention.
(2)For specific language setting:
Link a start-up script in /etc/X11/xim.d/ to your locale with a higher priority (smaller number), eg
ln -s /etc/X11/xim.d/scim-bridge /etc/X11/xim.d/zh_TW/20-scim-bridge
Link a start-up script in /usr/etc/X11/xim.d/ to your locale with a higher priority (smaller number), eg
ln -s /usr/etc/X11/xim.d/scim-bridge /usr/etc/X11/xim.d/zh_TW/20-scim-bridge
(3)Personal setting:
Edit ~/.profile add
export INPUT_METHOD="scim-bridge" or whatever script in /etc/X11/xim.d/
export INPUT_METHOD="scim-bridge" or whatever script in /usr/etc/X11/xim.d/
or white your own ~/.xim, see ~/.xim.template for more informations.
4.Bug report or any suggestion to
http://code.google.com/p/ibus/
https://github.com/ibus/ibus/issues
Chinese:
0:注意：ibus 不支援 QT3 immodule,
若您使用 qt3-based 應用程式，請修改 /etc/X11/xim.d/ibus 設定
若您使用 qt3-based 應用程式，請修改 /usr/etc/X11/xim.d/ibus 設定
export QT_IM_MODULE=xim
1.當您使用的語系是en 或zh_*時，SuSE 會自動啟動ibus
啟動的script是/etc/X11/xim.d/YOUR-LOCALE/40-ibus，這是一個到上層目錄ibus的連結
啟動的script是/usr/etc/X11/xim.d/YOUR-LOCALE/40-ibus，這是一個到上層目錄ibus的連結
"40"這個數字使他的優先順序高於90-xcin及50-scim
如果您不喜歡這個順序，修改連結的名稱為(例如：80-ibus)，或參考2.
@ -57,16 +57,16 @@ export INPUT_METHOD="ibus"
3.如果您想要自己選擇輸入法而非使用系統設定
(1)全系統設定：
編輯 /etc/sysconfig/language, 設定 INPUT_METHOD="ibus" 或其他你想用的輸入法，
請注意你的啟動程序必須位於 /etc/X11/xim.d/，並和您指定的名稱相同
請注意你的啟動程序必須位於 /usr/etc/X11/xim.d/，並和您指定的名稱相同
(2)針對特定語言：
將您的啟動程序連結到你的語系中，並前置較高的優先順序(較小數字)，例如
ln -s /etc/X11/xim.d/ibus /etc/X11/xim.d/zh_TW/20-ibus
ln -s /usr/etc/X11/xim.d/ibus /usr/etc/X11/xim.d/zh_TW/20-ibus
(3)個人設定：
編輯 ~/.profile 加入
export INPUT_METHOD="ibus" 或其他在 /etc/X11/xim.d/ 的啟動程序
export INPUT_METHOD="ibus" 或其他在 /usr/etc/X11/xim.d/ 的啟動程序
或自行編寫啟動程序 ~/.xim，請參考 ~/.xim.template
5.臭蟲回報或建議請至
http://code.google.com/p/ibus/
https://github.com/ibus/ibus/issues

3
ibus-1.5.22.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8170eba58c28aa4818970751ebdeada728ebb63d535967a5c5f5c21b0017be4a
size 3578251

3
ibus-1.5.23.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b7e8d5bdb7d71a5ba4ee43cdf374675f77121a71c1679c9b9e7e02875bd0e150
size 3557661

245
ibus-socket-name-compatibility.patch
View File

@ -1,245 +0,0 @@
Description: compatibility for use-wayland-display-for-socket-name.patch
This writes ~/.config/ibus/bus/SOCKETPATH with the old name.
Author: Changwoo Ryu
Last-Update: 2020-05-01
Bug: https://bugreports.qt.io/browse/QTBUG-82910
Forwarded: not-needed, workaround
--- a/src/ibusshare.c
+++ b/src/ibusshare.c
@@ -90,79 +90,132 @@
return g_getenv("IBUS_SESSION_ID");
}
+static const gchar *ibus_get_socket_path_internal (gboolean compat, gchar *client_display);
+
const gchar *
ibus_get_socket_path (void)
{
static gchar *path = NULL;
if (path == NULL) {
- gchar *hostname = "unix";
- gchar *display;
- gchar *displaynumber = "0";
- /* gchar *screennumber = "0"; */
- gboolean is_wayland = FALSE;
- gchar *p;
-
- path = g_strdup (g_getenv ("IBUS_ADDRESS_FILE"));
- if (path != NULL) {
- return path;
+ path = ibus_get_socket_path_internal (FALSE, NULL);
+ }
+ return path;
+}
+
+static const gchar *
+ibus_get_socket_path_x11_compat (void)
+{
+ static gchar *path = NULL;
+ if (path == NULL)
+ path = ibus_get_socket_path_internal (TRUE, NULL);
+ return path;
+}
+
+static const gchar *
+ibus_get_socket_path_gnome_xwayland_compat (void)
+{
+ static gchar *path = NULL;
+ if (path == NULL) {
+ gint setup_display_number;
+ gchar *client_display;
+ gchar **tokens;
+
+ tokens = g_strsplit (ibus_get_socket_path_x11_compat (), "-", 3);
+ if (tokens[0] != NULL && tokens[1] != NULL && tokens[2] != NULL) {
+ setup_display_number = g_strtod(tokens[2], NULL);
+ if (setup_display_number > 0) {
+ client_display = g_strdup_printf (":%d", setup_display_number - 1);
+ path = ibus_get_socket_path_internal (TRUE, client_display);
+ }
}
- if (_display == NULL) {
+ g_strfreev (tokens);
+ }
+ return path;
+}
+
+static const gchar *
+ibus_get_socket_path_internal (gboolean compat, gchar *client_display)
+{
+ gchar *path = NULL;
+
+ gchar *hostname = "unix";
+ gchar *display;
+ gchar *displaynumber = "0";
+ /* gchar *screennumber = "0"; */
+ gboolean is_wayland = FALSE;
+ gchar *p;
+
+ path = g_strdup (g_getenv ("IBUS_ADDRESS_FILE"));
+ if (path != NULL) {
+ return path;
+ }
+
+ if (_display == NULL) {
+ if (compat) {
+ if (client_display == NULL)
+ display = g_strdup (g_getenv ("DISPLAY"));
+ else
+ display = client_display;
+ } else {
display = g_strdup (g_getenv ("WAYLAND_DISPLAY"));
if (display)
is_wayland = TRUE;
- else
+ else if (client_display == NULL)
display = g_strdup (g_getenv ("DISPLAY"));
+ else
+ display = client_display;
}
- else {
- display = g_strdup (_display);
- }
-
- if (is_wayland) {
- displaynumber = display;
- } else if (display) {
- p = display;
- hostname = display;
- for (; *p != ':' && *p != '\0'; p++);
+ }
+ else {
+ display = g_strdup (_display);
+ }
- if (*p == ':') {
- *p = '\0';
- p++;
- displaynumber = p;
- }
+ if (is_wayland) {
+ displaynumber = display;
+ } else if (display) {
+ p = display;
+ hostname = display;
+ for (; *p != ':' && *p != '\0'; p++);
+
+ if (*p == ':') {
+ *p = '\0';
+ p++;
+ displaynumber = p;
+ }
- for (; *p != '.' && *p != '\0'; p++);
+ for (; *p != '.' && *p != '\0'; p++);
- if (*p == '.') {
- *p = '\0';
- p++;
- /* Do not use screennumber
- screennumber = p; */
- }
+ if (*p == '.') {
+ *p = '\0';
+ p++;
+ /* Do not use screennumber
+ screennumber = p; */
}
+ }
- if (hostname[0] == '\0')
- hostname = "unix";
+ if (hostname[0] == '\0')
+ hostname = "unix";
+
+ p = g_strdup_printf ("%s-%s-%s",
+ ibus_get_local_machine_id (),
+ hostname,
+ displaynumber);
+ /* Qt5 IBus module has a hard-coded path and we cannot change this
+ * for the back compatibility.
+ * XDG_RUNTIME_DIR is not useful because it's generated by
+ * login but not `su` command and ibus-daemon can be run with `su`
+ * and we may change the path to XDG_CACHE_HOME in the future.
+ */
+ path = g_build_filename (g_get_user_config_dir (),
+ "ibus",
+ "bus",
+ p,
+ NULL);
+ g_free (p);
+ g_free (display);
- p = g_strdup_printf ("%s-%s-%s",
- ibus_get_local_machine_id (),
- hostname,
- displaynumber);
- /* Qt5 IBus module has a hard-coded path and we cannot change this
- * for the back compatibility.
- * XDG_RUNTIME_DIR is not useful because it's generated by
- * login but not `su` command and ibus-daemon can be run with `su`
- * and we may change the path to XDG_CACHE_HOME in the future.
- */
- path = g_build_filename (g_get_user_config_dir (),
- "ibus",
- "bus",
- p,
- NULL);
- g_free (p);
- g_free (display);
- }
return path;
}
@@ -248,19 +301,45 @@
return address;
}
+static void ibus_write_address_internal (const gchar *address, const gchar *socket_path);
+
void
ibus_write_address (const gchar *address)
{
+ const gchar *socket_path;
+ const gchar *socket_path_compat;
+
+ socket_path = ibus_get_socket_path ();
+ ibus_write_address_internal (address, socket_path);
+
+ if (g_getenv ("WAYLAND_DISPLAY") != NULL) {
+ socket_path_compat = ibus_get_socket_path_x11_compat ();
+ ibus_write_address_internal (address, socket_path_compat);
+
+ if (g_getenv ("GNOME_SETUP_DISPLAY") != NULL &&
+ strcmp (g_getenv ("GNOME_SETUP_DISPLAY"), g_getenv ("DISPLAY")) == 0) {
+ /* Running from gnome-shell with the setup display; write the socket
+ * address to an additional path for X11 clients */
+ socket_path_compat = ibus_get_socket_path_gnome_xwayland_compat ();
+ if (socket_path_compat != NULL)
+ ibus_write_address_internal (address, socket_path_compat);
+ }
+ }
+}
+
+static void
+ibus_write_address_internal (const gchar *address, const gchar *socket_path)
+{
FILE *pf;
gchar *path;
g_return_if_fail (address != NULL);
- path = g_path_get_dirname (ibus_get_socket_path ());
+ path = g_path_get_dirname (socket_path);
g_mkdir_with_parents (path, 0700);
g_free (path);
- g_unlink (ibus_get_socket_path ());
- pf = fopen (ibus_get_socket_path (), "w");
+ g_unlink (socket_path);
+ pf = fopen (socket_path, "w");
g_return_if_fail (pf != NULL);
fprintf (pf,

60
ibus-use-wayland-display-for-socket-name.patch
View File

@ -1,60 +0,0 @@
Author: Carlos Garnacho <carlosg@gnome.org>
Date: Thu Mar 12 16:02:16 2020 +0900
src: Use WAYLAND_DISPLAY on Wayland sessions to make up IBus socket name
In Wayland sessions, GNOME Shell 3.36 is leveraging 2 X11 Display
connections so one is used to set up all services for a "X11 session"
before user applications connected to the other display might require it.
This allows seamlessly starting Xwayland on demand to X11 user applications.
IBus here belongs to the first described connection, it is started
explicitly on that display by GNOME Shell as it is necessary to set up
ibus-x11 before any other X11 client might want to use it.
However the use of this "secondary" display results in IBus daemon left
unable to talk to applications, as the socket name is dependent on the
DISPLAY envvar and ibus/applications don't agree on its content.
For wayland sessions, make it look for WAYLAND_DISPLAY, as that'll have
the similar "per session bus" behavior that this seems to look after.
BUG=https://gitlab.gnome.org/GNOME/gnome-shell/issues/2341
Forwarded: https://github.com/ibus/ibus/commit/8ce25208c3f4adfd290a032c6aa739d2b7580eb1
Last-Update: 2020-04-06
diff --git a/src/ibusshare.c b/src/ibusshare.c
index 0d50d3f5..e0ef2ce0 100644
--- a/src/ibusshare.c
+++ b/src/ibusshare.c
@@ -100,6 +100,7 @@ ibus_get_socket_path (void)
gchar *display;
gchar *displaynumber = "0";
/* gchar *screennumber = "0"; */
+ gboolean is_wayland = FALSE;
gchar *p;
path = g_strdup (g_getenv ("IBUS_ADDRESS_FILE"));
@@ -108,13 +109,19 @@ ibus_get_socket_path (void)
}
if (_display == NULL) {
- display = g_strdup (g_getenv ("DISPLAY"));
+ display = g_strdup (g_getenv ("WAYLAND_DISPLAY"));
+ if (display)
+ is_wayland = TRUE;
+ else
+ display = g_strdup (g_getenv ("DISPLAY"));
}
else {
display = g_strdup (_display);
}
- if (display) {
+ if (is_wayland) {
+ displaynumber = display;
+ } else if (display) {
p = display;
hostname = display;
for (; *p != ':' && *p != '\0'; p++);

29
ibus.changes
View File

@ -1,3 +1,32 @@
-------------------------------------------------------------------
Wed Sep 30 06:02:24 UTC 2020 - Hillwood Yang <hillwood@opensuse.org>
- Update version to 1.5.23
* Generate simple.xml with denylist 6042974 508527d 37db75b 6879879 59b902a
568d58d 6ed34f3 5959d6f 5d67a28 394d9a8 ed7bc8d e938846 3aa670e 0d90da4
e4dd6d1
* Accept xdigits only for Unicode typing a440942
* Update emoji-parser with CLDR emoji annotation release-31-0-1 9a9f828
* Update ibusunicodegen.h with unicode-ucd 13.0.0 e10fc89
* Delete deprecated ENABLE_APPINDICATOR_ENGINE_ICON check aa3a9f0
* Fix SEGV 02105c4 f591381
* Fix some errors in ibus-desktop-testing-runner 7b0d091 8da0167
* Refactor source files 0b9d936 0ad5e9a
* Fix string formats in translatable strings 7caead1 f8c468a ce865f6
* Use WAYLAND_DISPLAY on Wayland sessions to make up IBus socket name (Carlos
Garnacho) 8ce2520
* Skip parsing of compose sequence with invalid keysyms (Neil Shepperd)
0da3cec
* Tell Pango about the engine language in the candidate panel (Aaron Muir
Hamilton) 3f098dc 79a09f1
* Fix for several error spotted by static analyzer (ntfs.hard) 00adea6
* Remove glib_check_version() in gtk immodule (Changwoo Ryu) 5765bfd
* Build the Emoji dictionaries in parallel (Changwoo Ryu) 59d0de4
* Update translation
- Drop 0001-Replace-the-Qt-check-for-appindicator-engine-icon-wi.patch,
0001-Replace-the-Qt-check-for-appindicator-engine-icon-wi.patch,
ibus-socket-name-compatibility.patch. Merged by upstream
-------------------------------------------------------------------
Thu Sep 24 07:01:32 UTC 2020 - Cliff Zhao <qzhao@suse.com>

18
ibus.spec
View File

@ -25,7 +25,7 @@
%endif
Name: ibus
Version: 1.5.22
Version: 1.5.23
Release: 0
Summary: The "Intelligent Input Bus" input method
License: LGPL-2.1-or-later
@ -59,15 +59,6 @@ Patch11: setup-switch-im.patch
# PATCH-FIX-SLE ibus-disable-engines-preload-in-GNOME.patch bnc#1036729 qzhao@suse.com
# Disable ibus engines preload in GNOME for These works are handled by gnome-shell.
Patch12: ibus-disable-engines-preload-in-GNOME.patch
# PATCH-FIX-UPSTREAM alarrosa@suse.com
# Remove unnecessary qt5 dependency https://github.com/ibus/ibus/pull/2194
Patch13: 0001-Replace-the-Qt-check-for-appindicator-engine-icon-wi.patch
# PATCH-FIX-UPSTREAM ibus-use-wayland-display-for-socket-name.patch bsc#1171442, gh#ibus/ibus#2195 qkzhu@suse.com
# Use WAYLAND_DISPLAY on Wayland sessions to make up IBus socket name
Patch14: ibus-use-wayland-display-for-socket-name.patch
# PATCH-FIX-UPSTREAM ibus-socket-name-compatibility.patch bsc#1171442, gh#ibus/ibus#2195 qkzhu@suse
# Compatibility workaround for ibus-use-wayland-display-for-socket-name.patch
Patch15: ibus-socket-name-compatibility.patch
BuildRequires: fdupes
BuildRequires: gettext-devel
BuildRequires: gobject-introspection-devel >= 0.9.6
@ -204,12 +195,9 @@ cp -r %{SOURCE11} .
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
%build
autoreconf -fi
# autoreconf -fi
%configure --disable-static \
--enable-gtk3 \
--enable-vala \
@ -306,6 +294,8 @@ dconf update
%license COPYING
%{_rpmmacrodir}/macros.ibus
%if %{defined use_usretc}
%dir %{_distconfdir}/X11
%dir %{_distconfdir}/X11/xim.d
%{_distconfdir}/X11/xim.d/*
%else
%config %{_sysconfdir}/X11/xim.d/*

14
setup-switch-im.patch
View File

@ -1,14 +1,14 @@
diff -Nura ibus-1.5.8/setup/main.py ibus-1.5.8_new/setup/main.py
--- ibus-1.5.8/setup/main.py 2014-07-24 04:24:25.000000000 +0000
+++ ibus-1.5.8_new/setup/main.py 2015-10-27 10:41:56.648379582 +0000
@@ -361,11 +361,16 @@
diff -Nur ibus-1.5.23/setup/main.py ibus-1.5.23-new/setup/main.py
--- ibus-1.5.23/setup/main.py 2020-09-29 18:58:24.000000000 +0800
+++ ibus-1.5.23-new/setup/main.py 2020-09-30 13:44:05.023868829 +0800
@@ -508,11 +508,16 @@
self.__engine_setup_exec_list[name] = os.spawnl(os.P_NOWAIT, *args)
def __init_bus(self):
+ method_name="ibus"
+ filename=".i18n"
+ usr_home =os.path.expanduser('~')
+
+
self.__bus = IBus.Bus()
if self.__bus.is_connected():
return
@ -19,7 +19,7 @@ diff -Nura ibus-1.5.8/setup/main.py ibus-1.5.8_new/setup/main.py
dlg = Gtk.MessageDialog(message_type = Gtk.MessageType.QUESTION,
buttons = Gtk.ButtonsType.YES_NO,
text = message)
@@ -375,39 +380,12 @@
@@ -522,39 +527,12 @@
if id != Gtk.ResponseType.YES:
sys.exit(0)
@ -48,7 +48,7 @@ diff -Nura ibus-1.5.8/setup/main.py ibus-1.5.8_new/setup/main.py
- self.__flush_gtk_events()
- else:
- # Translators: %d == 5 currently
- message = _("IBus daemon could not be started in %d seconds")
- message = _("IBus daemon could not be started in %d seconds.")
- dlg = Gtk.MessageDialog(message_type = Gtk.MessageType.INFO,
- buttons = Gtk.ButtonsType.OK,
- text = message % timeout)