727f9412b9
Updated ibus-HEAD.patch for upstream #1747, #1748, #1753 and gnome #703020, gnome #730628
85 lines
4.3 KiB
Diff
85 lines
4.3 KiB
Diff
--- ibus-1.5.8/bus/global.c.orig 2014-10-24 11:39:02.992359855 +0900
|
|
+++ ibus-1.5.8/bus/global.c 2014-12-01 19:11:11.311759112 +0900
|
|
@@ -28,4 +28,4 @@ gchar *g_address = "unix:tmpdir=/tmp";
|
|
gchar *g_cache = "auto";
|
|
gboolean g_mempro = FALSE;
|
|
gboolean g_verbose = FALSE;
|
|
-gint g_gdbus_timeout = 5000;
|
|
+gint g_gdbus_timeout = 15000;
|
|
--- ibus-1.5.8/bus/ibusimpl.c.orig 2014-10-14 12:15:30.547369108 +0900
|
|
+++ ibus-1.5.8/bus/ibusimpl.c 2014-10-14 12:16:23.182396247 +0900
|
|
@@ -1390,11 +1390,12 @@ _ibus_set_global_engine_ready_cb (BusInp
|
|
|
|
GError *error = NULL;
|
|
if (!bus_input_context_set_engine_by_desc_finish (context, res, &error)) {
|
|
- g_error_free (error);
|
|
g_dbus_method_invocation_return_error (data->invocation,
|
|
G_DBUS_ERROR,
|
|
G_DBUS_ERROR_FAILED,
|
|
- "Set global engine failed.");
|
|
+ "Set global engine failed: %s",
|
|
+ error->message);
|
|
+ g_error_free (error);
|
|
}
|
|
else {
|
|
g_dbus_method_invocation_return_value (data->invocation, NULL);
|
|
--- ibus-1.5.8/bus/main.c.orig 2014-10-24 11:41:32.579140912 +0900
|
|
+++ ibus-1.5.8/bus/main.c 2014-12-01 19:12:17.235109849 +0900
|
|
@@ -64,7 +64,7 @@ static const GOptionEntry entries[] =
|
|
{ "address", 'a', 0, G_OPTION_ARG_STRING, &g_address, "specify the address of ibus daemon.", "address" },
|
|
{ "replace", 'r', 0, G_OPTION_ARG_NONE, &replace, "if there is an old ibus-daemon is running, it will be replaced.", NULL },
|
|
{ "cache", 't', 0, G_OPTION_ARG_STRING, &g_cache, "specify the cache mode. [auto/refresh/none]", NULL },
|
|
- { "timeout", 'o', 0, G_OPTION_ARG_INT, &g_gdbus_timeout, "gdbus reply timeout in milliseconds. pass -1 to use the default timeout of gdbus.", "timeout [default is 5000]" },
|
|
+ { "timeout", 'o', 0, G_OPTION_ARG_INT, &g_gdbus_timeout, "gdbus reply timeout in milliseconds. pass -1 to use the default timeout of gdbus.", "timeout [default is 15000]" },
|
|
{ "mem-profile", 'm', 0, G_OPTION_ARG_NONE, &g_mempro, "enable memory profile, send SIGUSR2 to print out the memory profile.", NULL },
|
|
{ "restart", 'R', 0, G_OPTION_ARG_NONE, &restart, "restart panel and config processes when they die.", NULL },
|
|
{ "verbose", 'v', 0, G_OPTION_ARG_NONE, &g_verbose, "verbose.", NULL },
|
|
--- ibus-1.5.8/src/ibusshare.c.orig 2014-10-22 11:49:55.386913376 +0900
|
|
+++ ibus-1.5.8/src/ibusshare.c 2014-12-01 19:13:01.135009323 +0900
|
|
@@ -158,8 +158,9 @@ ibus_get_socket_path (void)
|
|
gint
|
|
ibus_get_timeout (void)
|
|
{
|
|
- /* 6000 ms is the default timeout on the ibus-daemon side (5 sec) plus 1. */
|
|
- static const gint default_timeout = 6000;
|
|
+ /* 16000 ms is the default timeout on the ibus-daemon side
|
|
+ * (15 sec) plus 1. */
|
|
+ static const gint default_timeout = 16000;
|
|
|
|
static gint64 timeout = -2;
|
|
if (timeout == -2) {
|
|
--- ibus-1.5.8/ui/gtk3/panel.vala.orig 2014-10-22 12:00:37.017604825 +0900
|
|
+++ ibus-1.5.8/ui/gtk3/panel.vala 2014-11-28 18:49:49.878234966 +0900
|
|
@@ -65,6 +65,8 @@ class Panel : IBus.PanelService {
|
|
red = 0.0, green = 0.0, blue = 0.0, alpha = 1.0 };
|
|
private XKBLayout m_xkblayout = new XKBLayout();
|
|
private bool inited_engines_order = true;
|
|
+ private uint m_preload_engines_id;
|
|
+ private const uint PRELOAD_ENGINES_DELAY_TIME = 30000;
|
|
|
|
private GLib.List<Keybinding> m_keybindings = new GLib.List<Keybinding>();
|
|
|
|
@@ -764,8 +766,21 @@ class Panel : IBus.PanelService {
|
|
return;
|
|
}
|
|
|
|
+ if (m_preload_engines_id != 0) {
|
|
+ GLib.Source.remove(m_preload_engines_id);
|
|
+ m_preload_engines_id = 0;
|
|
+ }
|
|
+
|
|
names += engines[index].get_name();
|
|
- m_bus.preload_engines_async.begin(names, -1, null);
|
|
+ m_preload_engines_id =
|
|
+ Timeout.add(
|
|
+ PRELOAD_ENGINES_DELAY_TIME,
|
|
+ () => {
|
|
+ m_bus.preload_engines_async.begin(names,
|
|
+ -1,
|
|
+ null);
|
|
+ return false;
|
|
+ });
|
|
}
|
|
|
|
private void update_engines(string[]? unowned_engine_names,
|