summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2012-03-26 10:43:13 -0400
committerSergey V. Udaltsov <svu@gnome.org>2012-03-26 20:11:15 +0100
commitffaf5489fad6588b50384e944c56284e9edef222 (patch)
tree954d1832070203f657fe58545dfbb8c734f287a3
parent6ada8d3a0ff9c720e9936f31013c15cadc28680d (diff)
downloadlibgnomekbd-ffaf5489fad6588b50384e944c56284e9edef222.tar.gz
Fix up split_items usage
commit c9d3c0e939c21230d6088aaf915d9b7d965d97d8 introduced a couple of calls to gkbd_keyboard_config_split_items with the incorrect assumption that those calls return newly allocated memory. This commit drops the wrong free calls. https://bugzilla.gnome.org/show_bug.cgi?id=670164
-rw-r--r--libgnomekbd/gkbd-keyboard-config.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/libgnomekbd/gkbd-keyboard-config.c b/libgnomekbd/gkbd-keyboard-config.c
index 8ae216b..2f15a42 100644
--- a/libgnomekbd/gkbd-keyboard-config.c
+++ b/libgnomekbd/gkbd-keyboard-config.c
@@ -526,18 +526,12 @@ gkbd_keyboard_config_options_equals (GkbdKeyboardConfig * kbd_config1,
if (!gkbd_keyboard_config_split_items (kbd_config1->options[i], &group1, &option1))
continue;
- g_free (group1);
-
for (j = 0; j < num_options && !are_equal; j++) {
if (gkbd_keyboard_config_split_items (kbd_config2->options[j], &group2, &option2)) {
are_equal = strcmp (option1, option2) == 0;
- g_free (group2);
- g_free (option2);
}
}
- g_free (option1);
-
if (!are_equal)
return False;
}