patch by Thomas Cataldo <thomas.cataldo@aliacom.fr> to fix a bunch of

2004-10-21  Sebastien Bacher  <seb128@debian.org>

	* gnome-settings-default-editor.c: (vfs_change_cb):
	* gnome-settings-font.c: (load_cursor):
	* gnome-settings-gtk1theme.c: (apply_settings):
	* gnome-settings-keyboard.c: (apply_settings):
	* gnome-settings-multimedia-keys.c: (init_kbd):
	* gnome-settings-xsettings.c: (gnome_settings_xsettings_load):
	patch by Thomas Cataldo <thomas.cataldo@aliacom.fr> to fix a bunch of
	memory leaks (Closes: #150145).
This commit is contained in:
Sebastien Bacher 2004-10-21 19:41:26 +00:00 committed by Sebastien Bacher
parent 6f620d298d
commit ad0968036a
7 changed files with 47 additions and 10 deletions

View file

@ -92,10 +92,20 @@ vfs_change_cb (GnomeVFSMIMEMonitor *monitor, GConfClient *client)
star_app = gnome_vfs_mime_get_default_application ("text/*");
plain_app = gnome_vfs_mime_get_default_application ("text/plain");
if (star_app == NULL || plain_app == NULL)
if (star_app == NULL || plain_app == NULL) {
if (star_app != NULL) {
gnome_vfs_mime_application_free (star_app);
}
if (plain_app != NULL) {
gnome_vfs_mime_application_free (plain_app);
}
return;
if (!strcmp (star_app->id, plain_app->id))
}
if (!strcmp (star_app->id, plain_app->id)) {
gnome_vfs_mime_application_free (star_app);
gnome_vfs_mime_application_free (plain_app);
return;
}
#if DE_DEBUG
g_message ("Synching text/plain to text/*...");
@ -104,6 +114,8 @@ vfs_change_cb (GnomeVFSMIMEMonitor *monitor, GConfClient *client)
action = gnome_vfs_mime_get_default_action_type ("text/plain");
gnome_vfs_mime_set_default_application ("text/*", plain_app->id);
gnome_vfs_mime_application_free (plain_app);
gnome_vfs_mime_set_default_action_type ("text/*", action);
PRINT_STATE;