From d46b2c14a8dd543d7ced4c83face8e61516b6329 Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Sun, 25 May 2008 23:47:36 +0000 Subject: [PATCH] =?UTF-8?q?Bug=20507389=20=E2=80=93=20use=20gslice=20for?= =?UTF-8?q?=20gtksettings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2008-05-25 Cody Russell Bug 507389 – use gslice for gtksettings * gtk/gtksettings.c: Change from g_new0/g_free to use GSlice. Report and patch by Christian Persch. svn path=/trunk/; revision=20168 --- ChangeLog | 7 +++++++ gtk/gtksettings.c | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b61afd8a3e..70b9743ced 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-05-25 Cody Russell + + Bug 507389 – use gslice for gtksettings + + * gtk/gtksettings.c: Change from g_new0/g_free to use GSlice. + Report and patch by Christian Persch. + 2008-05-25 Cody Russell Bug 523562 - gtk-update-icon-cache core dumps when run concurrently and diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c index a19ad33099..3ce2046ebc 100644 --- a/gtk/gtksettings.c +++ b/gtk/gtksettings.c @@ -1286,7 +1286,7 @@ free_value (gpointer data) g_value_unset (&qvalue->public.value); g_free (qvalue->public.origin); - g_free (qvalue); + g_slice_free (GtkSettingsValuePrivate, qvalue); } static void @@ -1317,7 +1317,7 @@ gtk_settings_set_property_value_internal (GtkSettings *settings, qvalue = g_datalist_id_get_data (&settings->queued_settings, name_quark); if (!qvalue) { - qvalue = g_new0 (GtkSettingsValuePrivate, 1); + qvalue = g_slice_new0 (GtkSettingsValuePrivate); g_datalist_id_set_data_full (&settings->queued_settings, name_quark, qvalue, free_value); } else @@ -1990,7 +1990,7 @@ color_scheme_data_free (ColorSchemeData *data) g_free (data->lastentry[i]); } - g_free (data); + g_slice_free (ColorSchemeData, data); } static void @@ -2001,7 +2001,7 @@ settings_update_color_scheme (GtkSettings *settings) ColorSchemeData *data; GValue value = { 0, }; - data = g_new0 (ColorSchemeData, 1); + data = g_slice_new0 (ColorSchemeData); data->color_hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) gdk_color_free); g_object_set_data_full (G_OBJECT (settings), "gtk-color-scheme",