From 78542d0487ab419419197ff357bf53e6b5f21adf Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Mon, 19 Aug 2002 14:43:00 +0000 Subject: Fix the names of these functions. (They previously used "register" instead * e-folder-type-registry.c (e_folder_type_registry_type_registered, e_folder_type_registry_unregister_type): Fix the names of these functions. (They previously used "register" instead of "registry".) * e-component-registry.c (register_type): Update for renaming * e-local-storage.c (load_folder): Likewise svn path=/trunk/; revision=17799 --- shell/ChangeLog | 12 ++++++++++++ shell/e-component-registry.c | 4 ++-- shell/e-folder-type-registry.c | 6 +++--- shell/e-folder-type-registry.h | 4 ++-- shell/e-local-storage.c | 2 +- 5 files changed, 20 insertions(+), 8 deletions(-) (limited to 'shell') diff --git a/shell/ChangeLog b/shell/ChangeLog index 8caac5b568..c5cb529fa4 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,15 @@ +2002-08-19 Dan Winship + + * e-folder-type-registry.c + (e_folder_type_registry_type_registered, + e_folder_type_registry_unregister_type): Fix the names of these + functions. (They previously used "register" instead of + "registry".) + + * e-component-registry.c (register_type): Update for renaming + + * e-local-storage.c (load_folder): Likewise + 2002-08-16 Dan Winship * evolution-folder-selector-button.c diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c index e1ef250eaa..a4da4af714 100644 --- a/shell/e-component-registry.c +++ b/shell/e-component-registry.c @@ -177,8 +177,8 @@ register_type (EComponentRegistry *component_registry, g_assert (folder_type_registry != NULL); if (override_duplicate - && e_folder_type_register_type_registered (folder_type_registry, name)) - e_folder_type_register_unregister_type (folder_type_registry, name); + && e_folder_type_registry_type_registered (folder_type_registry, name)) + e_folder_type_registry_unregister_type (folder_type_registry, name); if (! e_folder_type_registry_register_type (folder_type_registry, name, icon_name, diff --git a/shell/e-folder-type-registry.c b/shell/e-folder-type-registry.c index 285ae33760..04ab30824a 100644 --- a/shell/e-folder-type-registry.c +++ b/shell/e-folder-type-registry.c @@ -327,7 +327,7 @@ e_folder_type_registry_set_handler_for_type (EFolderTypeRegistry *folder_type_r gboolean -e_folder_type_register_type_registered (EFolderTypeRegistry *folder_type_registry, +e_folder_type_registry_type_registered (EFolderTypeRegistry *folder_type_registry, const char *type_name) { EFolderTypeRegistryPrivate *priv; @@ -345,7 +345,7 @@ e_folder_type_register_type_registered (EFolderTypeRegistry *folder_type_regist } void -e_folder_type_register_unregister_type (EFolderTypeRegistry *folder_type_registry, +e_folder_type_registry_unregister_type (EFolderTypeRegistry *folder_type_registry, const char *type_name) { EFolderTypeRegistryPrivate *priv; @@ -359,7 +359,7 @@ e_folder_type_register_unregister_type (EFolderTypeRegistry *folder_type_registr folder_type = get_folder_type (folder_type_registry, type_name); if (folder_type == NULL) { - g_warning ("e_folder_type_register_unregister_type(): cannot find type `%s'\n", + g_warning ("e_folder_type_registry_unregister_type(): cannot find type `%s'\n", type_name); return; } diff --git a/shell/e-folder-type-registry.h b/shell/e-folder-type-registry.h index c772754ff3..628a5d7d39 100644 --- a/shell/e-folder-type-registry.h +++ b/shell/e-folder-type-registry.h @@ -75,9 +75,9 @@ gboolean e_folder_type_registry_set_handler_for_type (EFolderTypeRegistry GList *e_folder_type_registry_get_type_names (EFolderTypeRegistry *folder_type_registry); -gboolean e_folder_type_register_type_registered (EFolderTypeRegistry *folder_type_registry, +gboolean e_folder_type_registry_type_registered (EFolderTypeRegistry *folder_type_registry, const char *type_name); -void e_folder_type_register_unregister_type (EFolderTypeRegistry *folder_type_registry, +void e_folder_type_registry_unregister_type (EFolderTypeRegistry *folder_type_registry, const char *type_name); GdkPixbuf *e_folder_type_registry_get_icon_for_type (EFolderTypeRegistry *folder_type_registry, diff --git a/shell/e-local-storage.c b/shell/e-local-storage.c index 3b7caca0e4..611f62cb2b 100644 --- a/shell/e-local-storage.c +++ b/shell/e-local-storage.c @@ -200,7 +200,7 @@ load_folder (const char *physical_path, } /* Ignore the folder if it uses an unknown type. */ - if (! e_folder_type_register_type_registered (local_storage->priv->folder_type_registry, + if (! e_folder_type_registry_type_registered (local_storage->priv->folder_type_registry, e_folder_get_type_string (folder))) { g_warning ("Folder in %s has unknown type (%s)... ignoring", physical_path, e_folder_get_type_string (folder)); -- cgit v1.2.3