applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Try to fix bug #149236 by not freeing stuff already being free'd by the

Browse source 
2005-01-27  Kjartan Maraas  <kmaraas@gnome.org>

	* gnome-theme-info.c: (top_theme_dir_changed),
	(top_icon_theme_dir_changed), (real_add_top_theme_dir_monitor):
	Try to fix bug #149236 by not freeing stuff already being free'd
	by the hash destroy_func. It will leak a bit more, but that can
	be fixed later. Please test this and report success in the report
	mentioned above.
This commit is contained in:
Kjartan Maraas 2005-01-27 03:14:14 +00:00 • committed by Kjartan Maraas
parent 7d324e378a
commit 454c13566a
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
capplets/common/ChangeLog
View file

@ -1,3 +1,12 @@
2005-01-27 Kjartan Maraas <kmaraas@gnome.org>
* gnome-theme-info.c: (top_theme_dir_changed),
(top_icon_theme_dir_changed), (real_add_top_theme_dir_monitor):
Try to fix bug #149236 by not freeing stuff already being free'd
by the hash destroy_func. It will leak a bit more, but that can
be fixed later. Please test this and report success in the report
mentioned above.
2005-01-02 Thomas Cataldo <thomas.cataldo@aliacom.fr> 2005-01-02 Thomas Cataldo <thomas.cataldo@aliacom.fr>
* gconf-property-editor.c: (gconf_property_editor_finalize): plug * gconf-property-editor.c: (gconf_property_editor_finalize): plug

4
capplets/common/gnome-theme-info.c
View file

@ -953,7 +953,6 @@ top_theme_dir_changed (GnomeVFSMonitorHandle *handle,
g_hash_table_remove (handle_hash, name); g_hash_table_remove (handle_hash, name);
g_free (monitor_data); g_free (monitor_data);
} }
g_free (name);
} }
gnome_vfs_uri_unref (common_theme_dir_uri); gnome_vfs_uri_unref (common_theme_dir_uri);
} }
@ -1005,7 +1004,6 @@ top_icon_theme_dir_changed (GnomeVFSMonitorHandle *handle,
g_hash_table_remove (handle_hash, name); g_hash_table_remove (handle_hash, name);
g_free (monitor_data); g_free (monitor_data);
} }
g_free (name);
} }
gnome_vfs_uri_unref (common_icon_theme_dir_uri); gnome_vfs_uri_unref (common_icon_theme_dir_uri);
} }
@ -1187,7 +1185,7 @@ real_add_top_theme_dir_monitor (GnomeVFSURI *uri,
* use it to remove the monitor handles when a dir is removed. * use it to remove the monitor handles when a dir is removed.
*/ */
tuple = g_new0 (CallbackTuple, 1); tuple = g_new0 (CallbackTuple, 1);
tuple->handle_hash = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify)g_free, NULL); tuple->handle_hash = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify)g_free, (GDestroyNotify)g_free);
tuple->priority = priority; tuple->priority = priority;
/* Check the URI */ /* Check the URI */