Skip to content

Commit 93731db

Browse files
authored
Merge pull request #9413 from keymanapp/fix/linux/smallfixes
fix(linux): fix memory leaks and method name
2 parents 574e850 + 5a03371 commit 93731db

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

linux/ibus-keyman/src/keymanutil.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ ibus_keyman_add_engines(GList * engines, GList * kmpdir_list)
170170
for (e=engines; e != NULL && alreadyexists == FALSE; e = e->next) {
171171
IBusEngineDesc *engine_desc = (IBusEngineDesc *) e->data;
172172
const gchar *version = ibus_engine_desc_get_version(engine_desc);
173-
const gchar *engine_name = ibus_engine_desc_get_version(engine_desc);
173+
const gchar *engine_name = ibus_engine_desc_get_name(engine_desc);
174174
gchar *kmx_file = g_path_get_basename(engine_name);
175175
if (g_strcmp0(kmx_file, keyboard->kmx_file) == 0 && g_strcmp0(version, keyboard->version) >= 0) {
176176
alreadyexists = TRUE;

linux/ibus-keyman/src/main.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,16 @@ static const GOptionEntry entries[] =
4848
// Add an environment variable to see debug messages: export G_MESSAGES_DEBUG=all
4949

5050
static void
51-
ibus_disconnected_cb (IBusBus *bus,
52-
gpointer user_data)
51+
ibus_disconnected_cb (IBusBus *unused_bus,
52+
gpointer unused_data)
5353
{
5454
g_debug ("bus disconnected");
5555
KeymanService *service = km_service_get_default(NULL);
5656
g_clear_object(&service);
5757

58+
g_object_unref(factory);
59+
g_object_unref(bus);
60+
5861
ibus_quit ();
5962
}
6063

@@ -114,7 +117,7 @@ print_engines_xml (void)
114117
fprintf (stdout, "%s", output->str);
115118

116119
g_string_free (output, TRUE);
117-
120+
g_object_unref(component);
118121
}
119122

120123
int

0 commit comments

Comments
 (0)