--- dialogs/keyboard-settings/xfce-keyboard-settings.c	2018-06-18 21:29:31.000000000 -0400
+++ dialogs/keyboard-settings/xfce-keyboard-settings.c	2019-05-01 15:55:51.787455000 -0400
@@ -1292,16 +1292,16 @@ xfce_keyboard_settings_reset_button_clic
 #ifdef HAVE_LIBXKLAVIER
 
-static gchar *
+static const gchar *
 xfce_keyboard_settings_xkb_description (XklConfigItem *config_item)
 {
   gchar *ci_description;
-  gchar *description;
+  const gchar *description;
 
   ci_description = g_strstrip (config_item->description);
 
   if (ci_description[0] == 0)
-    description = g_strdup (config_item->name);
+    description = config_item->name;
   else
-    description = g_strdup (ci_description);
+    description = ci_description;
 
   return description;
@@ -1528,5 +1528,5 @@ xfce_keyboard_settings_layouts_combo_add
   GtkListStore *store = GTK_LIST_STORE (user_data);
   GtkTreeIter   iter;
-  gchar        *description;
+  const gchar  *description;
 
   description = xfce_keyboard_settings_xkb_description ((XklConfigItem *) config_item);
@@ -1536,5 +1536,4 @@ xfce_keyboard_settings_layouts_combo_add
                       XKB_LAYOUTS_COMBO_DESCRIPTION, description,
                       XKB_LAYOUTS_COMBO_VALUE, config_item->name, -1);
-  g_free (description);
 }
 
@@ -1877,5 +1876,5 @@ xfce_keyboard_settings_add_variant_to_li
   GtkTreeIter   iter;
   GObject      *treeview;
-  gchar        *variant;
+  const gchar  *variant;
 
   variant = xfce_keyboard_settings_xkb_description (config_item);
@@ -1886,5 +1885,4 @@ xfce_keyboard_settings_add_variant_to_li
                       XKB_AVAIL_LAYOUTS_TREE_DESCRIPTION, variant,
                       XKB_AVAIL_LAYOUTS_TREE_ID, config_item->name, -1);
-  g_free (variant);
 }
 
@@ -1898,5 +1896,5 @@ xfce_keyboard_settings_add_layout_to_lis
   GtkTreeStore *treestore;
   GObject      *treeview;
-  gchar        *layout;
+  const gchar  *layout;
 
   layout = xfce_keyboard_settings_xkb_description (config_item);
@@ -1907,5 +1905,4 @@ xfce_keyboard_settings_add_layout_to_lis
                       XKB_AVAIL_LAYOUTS_TREE_DESCRIPTION, layout,
                       XKB_AVAIL_LAYOUTS_TREE_ID, config_item->name, -1);
-  g_free (layout);
 
   xkl_config_registry_foreach_layout_variant (config_registry, config_item->name,