From 7f2badb024128819fbb1d2656057c5e476100cd8 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Fri, 9 Apr 2004 15:46:00 +0000 Subject: Change this a lot. Now each component will maintain its own * e-user-creatable-items-handler.c: Change this a lot. Now each component will maintain its own EUserCreatableItemsHandler and merge the button and menus in and out of the UI as its controls are activated and deactivated. (This lets the connector component display the correct default for the New button). Also, update to the Product Design Team's new organization (separating object types from folder types) * e-shell.c: Remove all creatable_items_handler references * e-shell-window.c (e_shell_window_new): Remove creatable_items_handler reference * Makefile.am: Move e-user-creatable-items-handler from evolution to libeshell, and make libeshell depend on libemiscwidgets (for the combo button) * Evolution-Component.idl: add another field to CreatableItemType so we can distinguish object types from folder types. svn path=/trunk/; revision=25379 --- shell/e-shell.c | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'shell/e-shell.c') diff --git a/shell/e-shell.c b/shell/e-shell.c index 8068d0a145..4c5748031f 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -77,7 +77,6 @@ struct _EShellPrivate { GList *windows; - EUserCreatableItemsHandler *user_creatable_items_handler; /* EUriSchemaRegistry *uri_schema_registry; FIXME */ EComponentRegistry *component_registry; @@ -340,11 +339,6 @@ impl_dispose (GObject *object) priv->is_initialized = FALSE; - if (priv->user_creatable_items_handler != NULL) { - g_object_unref (priv->user_creatable_items_handler); - priv->user_creatable_items_handler = NULL; - } - #if 0 /* FIXME */ if (priv->uri_schema_registry != NULL) { g_object_unref (priv->uri_schema_registry); @@ -465,7 +459,6 @@ e_shell_init (EShell *shell) priv = g_new0 (EShellPrivate, 1); priv->line_status = E_SHELL_LINE_STATUS_OFFLINE; priv->component_registry = e_component_registry_new (); - priv->user_creatable_items_handler = e_user_creatable_items_handler_new (priv->component_registry); shell->priv = priv; } @@ -1165,13 +1158,4 @@ e_shell_quit(EShell *shell) return can_quit; } -EUserCreatableItemsHandler * -e_shell_peek_user_creatable_items_handler (EShell *shell) -{ - g_return_val_if_fail (E_IS_SHELL (shell), NULL); - - return shell->priv->user_creatable_items_handler; -} - - BONOBO_TYPE_FUNC_FULL (EShell, GNOME_Evolution_Shell, PARENT_TYPE, e_shell) -- cgit v1.2.3