Committed patches by Lauris Kaplinski for bugs 73571, 73587, and 71613.

2002-03-11  Richard Hestilow <hestilow@ximian.com>

	* Committed patches by Lauris Kaplinski for bugs 73571, 73587,
	and 71613.
This commit is contained in:
Richard Hestilow 2002-03-12 01:35:40 +00:00 committed by Rachel Hestilow
parent c53bfb9c43
commit ec08294088
9 changed files with 88 additions and 12 deletions

View file

@ -1,3 +1,10 @@
2002-03-08 Lauris Kaplinski <lauris@ximian.com>
* mime-type-info.c (mime_type_info_using_custom_app): Return TRUE
if default_action does not exist (it is better than crash)
* mime-edit-dialog.c (store_data): Create default_action if there is none
2002-02-27 Kjartan Maraas <kmaraas@gnome.org>
* file-types-applet.c: s/PACKAGE/GETTEXT_PACKAGE/g

View file

@ -624,6 +624,8 @@ store_data (MimeEditDialog *dialog)
if (!mime_type_info_using_custom_app (dialog->p->info)) {
gnome_vfs_mime_application_free (dialog->p->info->default_action);
dialog->p->info->default_action = g_new0 (GnomeVFSMimeApplication, 1);
} else if (!dialog->p->info->default_action) {
dialog->p->info->default_action = g_new0 (GnomeVFSMimeApplication, 1);
}
g_free (dialog->p->info->default_action->command);

View file

@ -201,7 +201,7 @@ mime_type_info_using_custom_app (const MimeTypeInfo *info)
gchar *tmp;
gboolean ret;
if (info->default_action->name == NULL)
if (!info->default_action || !info->default_action->name)
return TRUE;
tmp = g_strdup_printf ("Custom %s", info->mime_type);