Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Plasma
Plasma Desktop
Commits
3862d853
Commit
3862d853
authored
Jan 03, 2019
by
Xuetian Weng
Browse files
kimpanel: check engine_desc before use
parent
9371a7c9
Changes
1
Hide whitespace changes
Inline
Side-by-side
applets/kimpanel/backend/ibus/ibus15/panel.cpp
View file @
3862d853
...
...
@@ -1066,9 +1066,11 @@ ibus_panel_impanel_focus_in (IBusPanelService *panel,
return
;
}
IBusEngineDesc
*
engine_desc
=
ibus_bus_get_global_engine
(
impanel
->
bus
);
impanel_update_logo_by_engine
(
impanel
,
engine_desc
);
g_object_unref
(
engine_desc
);
auto
engine_desc
=
ibus_bus_get_global_engine
(
impanel
->
bus
);
if
(
engine_desc
)
{
impanel_update_logo_by_engine
(
impanel
,
engine_desc
);
g_object_unref
(
engine_desc
);
}
impanel
->
engineManager
->
setCurrentContext
(
input_context_path
);
if
(
!
impanel
->
engineManager
->
useGlobalEngine
())
{
...
...
@@ -1120,9 +1122,13 @@ ibus_panel_impanel_real_register_properties(IBusPanelImpanel* impanel)
QByteArray
propstr
=
ibus_engine_desc_to_logo_propstr
(
engine_desc
);
g_variant_builder_add
(
&
builder
,
"s"
,
propstr
.
constData
());
}
else
{
QByteArray
propstr
;
auto
engine_desc
=
ibus_bus_get_global_engine
(
impanel
->
bus
);
QByteArray
propstr
=
ibus_engine_desc_to_logo_propstr
(
engine_desc
);
g_variant_builder_add
(
&
builder
,
"s"
,
propstr
.
constData
());
if
(
engine_desc
)
{
propstr
=
ibus_engine_desc_to_logo_propstr
(
engine_desc
);
g_variant_builder_add
(
&
builder
,
"s"
,
propstr
.
constData
());
g_object_unref
(
engine_desc
);
}
IBusPropList
*
prop_list
=
impanel
->
propManager
->
properties
();
if
(
prop_list
)
{
...
...
@@ -1132,7 +1138,6 @@ ibus_panel_impanel_real_register_properties(IBusPanelImpanel* impanel)
++
i
;
}
}
g_object_unref
(
engine_desc
);
}
g_dbus_connection_emit_signal
(
impanel
->
conn
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment