From 0a17b8dc43d64a3a230aef3e1bbe47bdbc89a2b2 Mon Sep 17 00:00:00 2001 From: Jens Granseuer Date: Tue, 1 May 2007 13:53:13 +0000 Subject: [PATCH] we don't need to unref the GConfPropertyEditors 2007-05-01 Jens Granseuer * appearance-main.c: (main): * appearance-ui.c: (ui_init): * appearance-ui.h: * appearance.h: we don't need to unref the GConfPropertyEditors svn path=/trunk/; revision=7531 --- capplets/appearance/ChangeLog | 7 +++++++ capplets/appearance/appearance-main.c | 1 - capplets/appearance/appearance-ui.c | 13 ------------- capplets/appearance/appearance-ui.h | 1 - capplets/appearance/appearance.h | 3 --- 5 files changed, 7 insertions(+), 18 deletions(-) diff --git a/capplets/appearance/ChangeLog b/capplets/appearance/ChangeLog index c50149996..4ebd8c75e 100644 --- a/capplets/appearance/ChangeLog +++ b/capplets/appearance/ChangeLog @@ -1,3 +1,10 @@ +2007-05-01 Jens Granseuer + + * appearance-main.c: (main): + * appearance-ui.c: (ui_init): + * appearance-ui.h: + * appearance.h: we don't need to unref the GConfPropertyEditors + 2007-05-01 Jens Granseuer * appearance-main.c: (main): diff --git a/capplets/appearance/appearance-main.c b/capplets/appearance/appearance-main.c index e3507d21b..c92595f5b 100644 --- a/capplets/appearance/appearance-main.c +++ b/capplets/appearance/appearance-main.c @@ -97,7 +97,6 @@ main (int argc, char **argv) gtk_main (); /* free stuff */ - ui_shutdown (data); g_object_unref (data->client); g_object_unref (data->xml); g_free (data); diff --git a/capplets/appearance/appearance-ui.c b/capplets/appearance/appearance-ui.c index b4899fd02..de3ef23f8 100644 --- a/capplets/appearance/appearance-ui.c +++ b/capplets/appearance/appearance-ui.c @@ -187,7 +187,6 @@ button_press_block_cb (GtkWidget *toolbar, void ui_init (AppearanceData *data) { - GSList *peds = NULL; GObject *peditor; char *toolbar_style; @@ -197,14 +196,12 @@ ui_init (AppearanceData *data) peditor = gconf_peditor_new_boolean (NULL, "/desktop/gnome/interface/can_change_accels", WID ("menu_accel_toggle"), NULL); - g_slist_append (peds, peditor); peditor = gconf_peditor_new_boolean (NULL, "/desktop/gnome/interface/menus_have_icons", WID ("menu_icons_toggle"), NULL); g_signal_connect (peditor, "value_changed", G_CALLBACK (menus_have_icons_cb), data); - g_slist_append (peds, peditor); set_have_icons (data, gconf_client_get_bool (data->client, @@ -219,7 +216,6 @@ ui_init (AppearanceData *data) NULL); g_signal_connect (peditor, "value_changed", G_CALLBACK (toolbar_style_cb), data); - g_slist_append (peds, peditor); g_signal_connect (G_OBJECT (WID ("toolbar_handlebox")), "button_press_event", @@ -240,13 +236,4 @@ ui_init (AppearanceData *data) /* no ui for detachable toolbars */ g_signal_connect (G_OBJECT (data->client), "value_changed", G_CALLBACK (toolbar_detachable_cb), data); - - data->peditors = peds; -} - -void -ui_shutdown (AppearanceData *data) -{ - g_slist_foreach (data->peditors, (GFunc) g_object_unref, NULL); - g_slist_free (data->peditors); } diff --git a/capplets/appearance/appearance-ui.h b/capplets/appearance/appearance-ui.h index 747a2ba02..5817a7351 100644 --- a/capplets/appearance/appearance-ui.h +++ b/capplets/appearance/appearance-ui.h @@ -19,4 +19,3 @@ */ void ui_init (AppearanceData *data); -void ui_shutdown (AppearanceData *data); diff --git a/capplets/appearance/appearance.h b/capplets/appearance/appearance.h index c380eb919..204212fb7 100644 --- a/capplets/appearance/appearance.h +++ b/capplets/appearance/appearance.h @@ -32,7 +32,4 @@ typedef struct { int argc; char **argv; GladeXML *xml; - - /* ui */ - GSList *peditors; } AppearanceData;