summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--libgnomekbd/gkbd-indicator-config.c8
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 4e221bd..6ac4a8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-13 svu
+
+ * libgnomekbd/gkbd-indicator-config.c: unneeded free, fixing crasher
+ http://bugzilla.gnome.org/show_bug.cgi?id=466301
+
2007-08-12 svu
* configure.in, NEWS: preparing first beta of 2.20
diff --git a/libgnomekbd/gkbd-indicator-config.c b/libgnomekbd/gkbd-indicator-config.c
index 124b974..c03202b 100644
--- a/libgnomekbd/gkbd-indicator-config.c
+++ b/libgnomekbd/gkbd-indicator-config.c
@@ -193,7 +193,7 @@ gkbd_indicator_config_init (GkbdIndicatorConfig * ind_config,
GConfClient * conf_client, XklEngine * engine)
{
GError *gerror = NULL;
- gchar *sp, *datadir;
+ gchar *sp;
memset (ind_config, 0, sizeof (*ind_config));
ind_config->conf_client = conf_client;
@@ -211,7 +211,6 @@ gkbd_indicator_config_init (GkbdIndicatorConfig * ind_config,
ind_config->icon_theme = gtk_icon_theme_get_default ();
- datadir = DATADIR;
gtk_icon_theme_append_search_path (ind_config->icon_theme, sp =
g_build_filename (g_get_home_dir
(),
@@ -221,18 +220,17 @@ gkbd_indicator_config_init (GkbdIndicatorConfig * ind_config,
gtk_icon_theme_append_search_path (ind_config->icon_theme,
sp =
- g_build_filename (datadir,
+ g_build_filename (DATADIR,
"pixmaps/flags",
NULL));
g_free (sp);
gtk_icon_theme_append_search_path (ind_config->icon_theme,
sp =
- g_build_filename (datadir,
+ g_build_filename (DATADIR,
"icons/flags",
NULL));
g_free (sp);
- g_free (datadir);
}
void