From e83a9693b34f0a9a838d637f48ef1e11d6561ff0 Mon Sep 17 00:00:00 2001 From: Bradford Hovinen Date: Sun, 27 Jan 2002 18:37:07 +0000 Subject: [PATCH] Rename override_category as use_category; give it the opposite meaning 2002-01-27 Bradford Hovinen * mime-type-info.c (mime_type_info_load_all, mime_type_info_save): Rename override_category as use_category; give it the opposite meaning (reduce_supported_app_list, find_possible_supported_apps): Update according to the above --- capplets/file-types/ChangeLog | 6 ++++++ capplets/file-types/TODO_NOTES | 1 - capplets/file-types/mime-edit-dialog.c | 6 +++--- capplets/file-types/mime-type-info.c | 24 ++++++++++++------------ capplets/file-types/mime-type-info.h | 2 +- 5 files changed, 22 insertions(+), 17 deletions(-) diff --git a/capplets/file-types/ChangeLog b/capplets/file-types/ChangeLog index 3d88784b3..cf50d69e4 100644 --- a/capplets/file-types/ChangeLog +++ b/capplets/file-types/ChangeLog @@ -1,5 +1,11 @@ 2002-01-27 Bradford Hovinen + * mime-type-info.c (mime_type_info_load_all, mime_type_info_save): + Rename override_category as use_category; give it the opposite + meaning + (reduce_supported_app_list, find_possible_supported_apps): Update + according to the above + * mime-edit-dialog.c (fill_dialog): Set use_category_defaults_toggle (store_data): Set override_category diff --git a/capplets/file-types/TODO_NOTES b/capplets/file-types/TODO_NOTES index d8ebe449a..cb07e8f43 100644 --- a/capplets/file-types/TODO_NOTES +++ b/capplets/file-types/TODO_NOTES @@ -1,4 +1,3 @@ - - Implement override_category_default flag - Implement mime_category_info_save, mime_category_info_load_all - Add categories to many types in MIME database - Fix gnome_url_show diff --git a/capplets/file-types/mime-edit-dialog.c b/capplets/file-types/mime-edit-dialog.c index c1405b2ad..a5f1efb8e 100644 --- a/capplets/file-types/mime-edit-dialog.c +++ b/capplets/file-types/mime-edit-dialog.c @@ -348,7 +348,7 @@ fill_dialog (MimeEditDialog *dialog) gtk_entry_set_text (GTK_ENTRY (WID ("mime_type_entry")), dialog->p->info->mime_type); gtk_entry_set_text (GTK_ENTRY (WID ("category_entry")), mime_type_info_get_category_name (dialog->p->info)); - dialog->p->use_cat_dfl = !dialog->p->info->override_category; + dialog->p->use_cat_dfl = dialog->p->info->use_category; gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("use_category_defaults_toggle")), dialog->p->use_cat_dfl); update_sensitivity (dialog); @@ -583,8 +583,8 @@ store_data (MimeEditDialog *dialog) dialog->p->info->small_icon_pixbuf = NULL; } - dialog->p->info->override_category = - !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (WID ("use_category_defaults_toggle"))); + dialog->p->info->use_category = + gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (WID ("use_category_defaults_toggle"))); option_menu = GTK_OPTION_MENU (WID ("component_select")); menu_shell = GTK_MENU_SHELL (gtk_option_menu_get_menu (option_menu)); diff --git a/capplets/file-types/mime-type-info.c b/capplets/file-types/mime-type-info.c index ad7a45cb6..c35b153ee 100644 --- a/capplets/file-types/mime-type-info.c +++ b/capplets/file-types/mime-type-info.c @@ -121,12 +121,12 @@ mime_type_info_load_all (MimeTypeInfo *info) if (info->default_component == NULL) info->default_component = gnome_vfs_mime_get_default_component (info->mime_type); - tmp = gnome_vfs_mime_get_value (info->mime_type, "override-category"); + tmp = gnome_vfs_mime_get_value (info->mime_type, "use-category"); if (tmp != NULL && !strcmp (tmp, "yes")) - info->override_category = TRUE; + info->use_category = TRUE; else - info->override_category = FALSE; + info->use_category = FALSE; } const gchar * @@ -298,7 +298,7 @@ mime_type_info_save (const MimeTypeInfo *info) gnome_vfs_mime_set_value (info->mime_type, "category", tmp); g_free (tmp); - gnome_vfs_mime_set_value (info->mime_type, "override-category", info->override_category ? "yes" : "no"); + gnome_vfs_mime_set_value (info->mime_type, "use-category", info->use_category ? "yes" : "no"); } void @@ -369,10 +369,10 @@ find_possible_supported_apps (ModelEntry *entry) return NULL; case MODEL_ENTRY_MIME_TYPE: - if (MIME_TYPE_INFO (entry)->override_category) - return NULL; - else + if (MIME_TYPE_INFO (entry)->use_category) return gnome_vfs_application_registry_get_applications (MIME_TYPE_INFO (entry)->mime_type); + else + return NULL; default: return NULL; @@ -415,12 +415,12 @@ reduce_supported_app_list (ModelEntry *entry, GList *list) break; case MODEL_ENTRY_MIME_TYPE: - if (MIME_TYPE_INFO (entry)->override_category) - break; + if (MIME_TYPE_INFO (entry)->use_category) { + type_list = gnome_vfs_application_registry_get_applications (MIME_TYPE_INFO (entry)->mime_type); + list = intersect_lists (list, type_list); + g_list_free (type_list); + } - type_list = gnome_vfs_application_registry_get_applications (MIME_TYPE_INFO (entry)->mime_type); - list = intersect_lists (list, type_list); - g_list_free (type_list); break; default: diff --git a/capplets/file-types/mime-type-info.h b/capplets/file-types/mime-type-info.h index fa8e4519d..b7ab80356 100644 --- a/capplets/file-types/mime-type-info.h +++ b/capplets/file-types/mime-type-info.h @@ -53,7 +53,7 @@ struct _MimeTypeInfo GdkPixbuf *icon_pixbuf; GdkPixbuf *small_icon_pixbuf; - gboolean override_category; + gboolean use_category; Bonobo_ServerInfo *default_component; GnomeVFSMimeApplication *default_action;