From 09d4af6fff63dd112b8bb42087f14f7018e2f78c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 2 Oct 2007 11:54:42 +0000 Subject: ** Fixes bug #469657 2007-10-02 Matthew Barnes ** Fixes bug #469657 * addressbook/importers/evolution-ldif-importer.c: * calendar/gui/comp-editor-factory.c: * composer/e-msg-composer.c: * e-util/e-config-listener.c: * mail/em-composer-prefs.c: * mail/em-folder-tree-model.c: * mail/em-format.c: * mail/em-format-html.c: * mail/em-migrate.c: * mail/em-subscribe-editor.c: * mail/mail-component.c: * mail/mail-send-recv.c: * mail/message-list.c: * mail/importers/elm-importer.c: * plugins/exchange-operations/exchange-folder-size-display.c: * plugins/mono/mono-plugin.c: * shell/e-shell-settings-dialog.c: * tools/killev.c: * widgets/table/e-table-extras.c: * widgets/table/e-table-selection-model.c: Use destroy functions in GHashTables to simplify memory management. svn path=/trunk/; revision=34344 --- shell/e-shell-settings-dialog.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'shell/e-shell-settings-dialog.c') diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c index e503192034..e2c720355d 100644 --- a/shell/e-shell-settings-dialog.c +++ b/shell/e-shell-settings-dialog.c @@ -268,14 +268,6 @@ load_pages (EShellSettingsDialog *dialog) /* GtkObject methods. */ -static gboolean -destroy_type_entry (gpointer key, gpointer value, gpointer data) -{ - g_free (key); - - return TRUE; -} - static void impl_finalize (GObject *object) { @@ -285,7 +277,6 @@ impl_finalize (GObject *object) dialog = E_SHELL_SETTINGS_DIALOG (object); priv = dialog->priv; - g_hash_table_foreach_remove (priv->types, destroy_type_entry, NULL); g_hash_table_destroy (priv->types); g_free (priv); @@ -309,7 +300,10 @@ e_shell_settings_dialog_init (EShellSettingsDialog *dialog) EShellSettingsDialogPrivate *priv; priv = g_new (EShellSettingsDialogPrivate, 1); - priv->types = g_hash_table_new (g_str_hash, g_str_equal); + priv->types = g_hash_table_new_full ( + g_str_hash, g_str_equal, + (GDestroyNotify) g_free, + (GDestroyNotify) NULL); dialog->priv = priv; -- cgit v1.2.3