Fix ibus-1385349-segv-bus-proxy.patch
This commit is contained in:
parent
cdb0156b54
commit
9b15cf9617
@ -159,10 +159,7 @@ diff --git a/bus/engineproxy.c b/bus/engineproxy.c
|
|||||||
index b3e16066..ba479b59 100644
|
index b3e16066..ba479b59 100644
|
||||||
--- a/bus/engineproxy.c
|
--- a/bus/engineproxy.c
|
||||||
+++ b/bus/engineproxy.c
|
+++ b/bus/engineproxy.c
|
||||||
@@ -693,10 +693,11 @@ bus_engine_proxy_g_signal (GDBusProxy *proxy,
|
@@ -696,7 +696,8 @@ bus_engine_proxy_g_signal (GDBusProxy *proxy,
|
||||||
g_return_if_reached ();
|
|
||||||
}
|
|
||||||
|
|
||||||
static BusEngineProxy *
|
static BusEngineProxy *
|
||||||
bus_engine_proxy_new_internal (const gchar *path,
|
bus_engine_proxy_new_internal (const gchar *path,
|
||||||
IBusEngineDesc *desc,
|
IBusEngineDesc *desc,
|
||||||
@ -207,13 +204,6 @@ index b3e16066..ba479b59 100644
|
|||||||
const gchar *layout = ibus_engine_desc_get_layout (desc);
|
const gchar *layout = ibus_engine_desc_get_layout (desc);
|
||||||
if (layout != NULL && layout[0] != '\0') {
|
if (layout != NULL && layout[0] != '\0') {
|
||||||
engine->keymap = ibus_keymap_get (layout);
|
engine->keymap = ibus_keymap_get (layout);
|
||||||
@@ -756,6 +771,6 @@ bus_engine_proxy_new_internal (const gchar *path,
|
|
||||||
|
|
||||||
return engine;
|
|
||||||
}
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
GTask *task;
|
|
||||||
@@ -818,23 +833,30 @@ create_engine_ready_cb (BusFactoryProxy *factory,
|
@@ -818,23 +833,30 @@ create_engine_ready_cb (BusFactoryProxy *factory,
|
||||||
GAsyncResult *res,
|
GAsyncResult *res,
|
||||||
EngineProxyNewData *data)
|
EngineProxyNewData *data)
|
||||||
|
Loading…
Reference in New Issue
Block a user