Merge branch 'master' into feat/core/9119-marker-core-epic-ldml

Author: srl295

HISTORY.md

@@ -1,5 +1,9 @@
 # Keyman Version History
 
+## 17.0.157 alpha 2023-08-08
+
+* fix(linux): fix memory leaks and method name (#9413)
+
 ## 17.0.156 alpha 2023-08-07
 
 * epic: kmc-kmw KeymanWeb compiler in Typescript (#8954)

VERSION.md

@@ -1 +1 @@
-17.0.157
+17.0.158

linux/ibus-keyman/src/keymanutil.c

@@ -170,7 +170,7 @@ ibus_keyman_add_engines(GList * engines, GList * kmpdir_list)
             for (e=engines; e != NULL && alreadyexists == FALSE; e = e->next) {
                 IBusEngineDesc *engine_desc = (IBusEngineDesc *) e->data;
                 const gchar *version = ibus_engine_desc_get_version(engine_desc);
-                const gchar *engine_name = ibus_engine_desc_get_version(engine_desc);
+                const gchar *engine_name = ibus_engine_desc_get_name(engine_desc);
                 gchar *kmx_file = g_path_get_basename(engine_name);
                 if (g_strcmp0(kmx_file, keyboard->kmx_file) == 0  && g_strcmp0(version, keyboard->version) >= 0) {
                     alreadyexists = TRUE;

linux/ibus-keyman/src/main.c

@@ -48,13 +48,16 @@ static const GOptionEntry entries[] =
 // Add an environment variable to see debug messages: export G_MESSAGES_DEBUG=all
 
 static void
-ibus_disconnected_cb (IBusBus  *bus,
-                      gpointer  user_data)
+ibus_disconnected_cb (IBusBus  *unused_bus,
+                      gpointer  unused_data)
 {
     g_debug ("bus disconnected");
     KeymanService *service = km_service_get_default(NULL);
     g_clear_object(&service);
 
+    g_object_unref(factory);
+    g_object_unref(bus);
+
     ibus_quit ();
 }
 
@@ -114,7 +117,7 @@ print_engines_xml (void)
     fprintf (stdout, "%s", output->str);
 
     g_string_free (output, TRUE);
-
+    g_object_unref(component);
 }
 
 int

linux/scripts/launchpad.sh

@@ -33,7 +33,8 @@ else
 fi
 echo "ppa: ${ppa}"
 
-distributions="${DIST:-focal jammy lunar mantic}"
+# distributions="${DIST:-focal jammy lunar mantic}"
+distributions="${DIST:-focal jammy lunar}"
 packageversion="${PACKAGEVERSION:-1~sil1}"
 
 BASEDIR=$(pwd)