gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-11-05 16:04:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Plug leaks. (nautilus_mime_set_short_list_applications_for_file): Free the

Browse source 
2002-05-09  Dave Camp  <dave@ximian.com>

	* libnautilus-private/nautilus-mime-actions.c:
	(nautilus_mime_get_default_action_type_for_file):
	(nautilus_mime_get_default_application_for_file_internal):
	(nautilus_mime_get_default_component_for_file_internal):
	(nautilus_mime_get_short_list_applications_for_file):
	(nautilus_mime_get_short_list_components_for_file):
	(nautilus_mime_get_all_applications_for_file):
	(nautilus_mime_extend_all_applications_for_file):
	(nautilus_mime_remove_from_all_applications_for_file): Plug leaks.
	(nautilus_mime_set_short_list_applications_for_file): Free the
	normal_short_list after computing the delta, and use g_list_free
	on normal_short_list_ids rather than eel_g_list_free_deep.
	(str_list_difference): Duplicate the strings before inserting them
	into the list.
This commit is contained in:
Dave Camp 2002-05-09 20:21:34 +00:00 committed by Dave Camp
parent 4a9cd1696b
commit 8c9311cbb1
2 changed files with 44 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
ChangeLog
View file

@ -1,4 +1,21 @@
2002-05-03 Dave Camp <dave@ximian.com>
2002-05-09 Dave Camp <dave@ximian.com>
* libnautilus-private/nautilus-mime-actions.c:
(nautilus_mime_get_default_action_type_for_file):
(nautilus_mime_get_default_application_for_file_internal):
(nautilus_mime_get_default_component_for_file_internal):
(nautilus_mime_get_short_list_applications_for_file):
(nautilus_mime_get_short_list_components_for_file):
(nautilus_mime_get_all_applications_for_file):
(nautilus_mime_extend_all_applications_for_file):
(nautilus_mime_remove_from_all_applications_for_file): Plug leaks.
(nautilus_mime_set_short_list_applications_for_file): Free the
normal_short_list after computing the delta, and use g_list_free
on normal_short_list_ids rather than eel_g_list_free_deep.
(str_list_difference): Duplicate the strings before inserting them
into the list.
2002-05-09 Dave Camp <dave@ximian.com>
* src/file-manager/fm-desktop-icon-view.c (mount_parameters_new):
(mount_parameters_free): Don't hold references to the view.

34
libnautilus-private/nautilus-mime-actions.c
View file

@ -138,16 +138,18 @@ nautilus_mime_get_default_action_type_for_file (NautilusFile *file)
mime_type = nautilus_file_get_mime_type (file);
action_type = gnome_vfs_mime_get_default_action_type (mime_type);
g_free (mime_type);
return action_type;
} else {
if (g_ascii_strcasecmp (action_type_string, "application") == 0) {
return GNOME_VFS_MIME_ACTION_TYPE_APPLICATION;
action_type = GNOME_VFS_MIME_ACTION_TYPE_APPLICATION;
} else if (g_ascii_strcasecmp (action_type_string, "component") == 0) {
return GNOME_VFS_MIME_ACTION_TYPE_COMPONENT;
action_type = GNOME_VFS_MIME_ACTION_TYPE_COMPONENT;
} else {
return GNOME_VFS_MIME_ACTION_TYPE_NONE;
action_type = GNOME_VFS_MIME_ACTION_TYPE_NONE;
}
g_free (action_type_string);
}
return action_type;
}
GnomeVFSMimeAction *
@ -225,6 +227,8 @@ nautilus_mime_get_default_application_for_file_internal (NautilusFile *file,
*user_chosen = used_user_chosen_info;
}
g_free (default_application_string);
return result;
}
@ -410,6 +414,7 @@ nautilus_mime_get_default_component_for_file_internal (NautilusFile *file,
}
eel_g_list_free_deep (item_mime_types);
eel_g_list_free_deep (explicit_iids);
g_strfreev (sort_conditions);
g_free (uri_scheme);
@ -510,6 +515,9 @@ nautilus_mime_get_short_list_applications_for_file (NautilusFile *file)
}
result = g_list_reverse (result);
eel_g_list_free_deep (metadata_application_add_ids);
eel_g_list_free_deep (metadata_application_remove_ids);
return result;
}
@ -622,6 +630,9 @@ nautilus_mime_get_short_list_components_for_file (NautilusFile *file)
}
eel_g_list_free_deep (item_mime_types);
eel_g_list_free_deep (explicit_iids);
eel_g_list_free_deep (metadata_component_add_ids);
eel_g_list_free_deep (metadata_component_remove_ids);
gnome_vfs_mime_component_list_free (servers);
g_list_free (iids);
g_free (uri_scheme);
@ -664,6 +675,7 @@ nautilus_mime_get_all_applications_for_file (NautilusFile *file)
}
}
eel_g_list_free_deep (metadata_application_ids);
g_free (mime_type);
return result;
}
@ -915,14 +927,13 @@ nautilus_mime_set_short_list_applications_for_file (NautilusFile *file,
normal_short_list_ids = g_list_prepend (normal_short_list_ids, ((GnomeVFSMimeApplication *) p->data)->id);
}
gnome_vfs_mime_application_list_free (normal_short_list);
/* compute delta */
add_list = str_list_difference (applications, normal_short_list_ids);
remove_list = str_list_difference (normal_short_list_ids, applications);
eel_g_list_free_deep (normal_short_list_ids);
gnome_vfs_mime_application_list_free (normal_short_list);
g_list_free (normal_short_list_ids);
nautilus_file_set_metadata_list
(file,
@ -1125,6 +1136,10 @@ nautilus_mime_extend_all_applications_for_file (NautilusFile *file,
NAUTILUS_METADATA_SUBKEY_APPLICATION_ID,
final_applications);
eel_g_list_free_deep (metadata_application_ids);
eel_g_list_free_deep (extras);
g_list_free (final_applications);
return GNOME_VFS_OK;
}
@ -1150,6 +1165,9 @@ nautilus_mime_remove_from_all_applications_for_file (NautilusFile *file,
NAUTILUS_METADATA_KEY_EXPLICIT_APPLICATION,
NAUTILUS_METADATA_SUBKEY_APPLICATION_ID,
final_applications);
eel_g_list_free_deep (metadata_application_ids);
eel_g_list_free_deep (final_applications);
return GNOME_VFS_OK;
}
@ -1628,7 +1646,7 @@ str_list_difference (GList *a,
for (p = a; p != NULL; p = p->next) {
if (g_list_find_custom (b, p->data, (GCompareFunc) strcmp) == NULL) {
retval = g_list_prepend (retval, p->data);
retval = g_list_prepend (retval, g_strdup (p->data));
}
}