diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ChangeLog | 81 | ||||
| -rw-r--r-- | shell/Makefile.am | 2 | ||||
| -rw-r--r-- | shell/e-shell-view.c | 41 | ||||
| -rw-r--r-- | shell/e-shell.c | 1 |
4 files changed, 10 insertions, 115 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index b5f56f25cc..d9269d508e 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,76 +1,5 @@ 2002-01-23 Ettore Perazzoli <ettore@ximian.com> - * e-shell-user-creatable-items-handler.c: New member `id' in - struct `Component'. New member `icon' in struct `MenuItem'. - (component_free): Free ->id. - (component_new): Renamed from `component_new_from_client'. Get an - @id arg and set ->id accordingly. - (e_shell_user_creatable_items_handler_add_component): New arg @id. - Pass it to `component_new'. - (e_shell_user_creatable_items_handler_setup_menus): New arg - @current_component_id. - (e_shell_user_creatable_items_handler_update_menus): New. - (set_current_component): New helper function. - (get_component_by_id): New helper function. - (add_verbs): Renamed from `add_verbs_to_ui_component()'. Get a - @shell_view instead of a @ui_component. Set the SHELL_VIEW_KEY on - the ui_component of the shell_view to point to the shell_view - itself. - (ensure_menu_items): Set item->icon to NULL. - (free_menu_items): Unref item->icon. - (ensure_menu_xml): Set the icon as well. - (get_default_action_for_view): New helper function. - (find_menu_item_for_verb): New helper function. - (shell_view_view_changed_callback): New callback, set up the label - on the "New" button depending on the current component. - (e_shell_user_creatable_items_handler_attach_menus): New. For - now, do not display the toolbar button yet. - (execute_verb): New helper function, splitting out code from - `verb_fn'. - (verb_fn): Use `execute_verb'. - (combo_button_activate_default_callback): Callback for the - "activate_default" signal on the EComboButton. - (setup_toolbar_button): Connect. - - * evolution-shell-component.c: New member `icon' in - `UserCreatableItemType'. - (impl__get_userCreatableItemTypes): Put the ->icon in the - corba_type as well. - (user_creatable_item_type_new): Get a new @icon argument. - (evolution_shell_component_add_user_creatable_item): New arg - @icon. - - * Evolution-ShellComponent.idl: New member `icon' in struct - `UserCreatableItemType'. - - * evolution-test-component.c (register_component): Pass a NULL - @icon to `evolution_shell_component_add_user_creatable_item()'. - - * e-shell-view.c (class_init): Add the signal to the class. - (e_shell_view_display_uri): Emit "view_changed". - (e_shell_view_get_current_component_id): New. - - * evolution-shell-component-client.c: New member `id' in - EvolutionShellComponentClientPrivate. - (init): Init to NULL. - (impl_destroy): Free. - (evolution_shell_component_client_new_for_objref): Removed. - (evolution_shell_component_client_construct): New arg @id. - Initialize ->id from it. - (evolution_shell_component_client_get_id): New. - - * e-shell-view.h: New signal "view_changed". - - * evolution-activity-client.c (create_icon_from_pixbuf): Removed. - (create_corba_animated_icon_from_pixbuf_array): Removed. - (evolution_activity_client_construct): Use - `e_new_corba_animated_icon_from_pixbuf_array()' instead. - - * e-shell-icon-utils.h: New. - * e-shell-icon-utils.c: New. - -2002-01-23 Ettore Perazzoli <ettore@ximian.com> - [Patch by Michael Meeks <michael@ximian.com>.] * e-splash.c (e_splash_set_icon_highlight): g_return if there is @@ -78,8 +7,8 @@ 2002-01-15 Iain Holmes <iain@ximian.com> - * e-shell-importer.c (show_import_wizard): Set the importer druid - as a transient window of the parent shell. + * e-shell-importer.c (show_import_wizard): Set the druid as transient + for the main shell. 2002-01-15 Ettore Perazzoli <ettore@ximian.com> @@ -108,7 +37,7 @@ 2001-12-17 Ettore Perazzoli <ettore@ximian.com> - [Fix #17377, Evolution doesn't work on multi-depth displays.] + [Fixes #17377, Evolution doesn't work on multi-depth displays.] * main.c (main): Push GdkRGB visual and colormap. @@ -189,6 +118,10 @@ of the tree. (impl_destroy): Call save_expanded_state(). +2001-11-15 Ettore Perazzoli <ettore@ximian.com> + + * e-shell-about-box.c: Add missing comma. + 2001-11-14 Ettore Perazzoli <ettore@ximian.com> * e-shell-about-box.c: Add more contributors to the box. diff --git a/shell/Makefile.am b/shell/Makefile.am index 465b2a3250..c406707087 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -77,8 +77,6 @@ eshellinclude_HEADERS = \ libeshell_la_SOURCES = \ $(IDL_GENERATED) \ e-folder-tree.c \ - e-shell-corba-icon-utils.c \ - e-shell-corba-icon-utils.h \ evolution-activity-client.c \ evolution-session.c \ evolution-shell-client.c \ diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index 6545af81bd..e5f8e32b24 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -147,7 +147,6 @@ struct _EShellViewPrivate { enum { SHORTCUT_BAR_VISIBILITY_CHANGED, FOLDER_BAR_VISIBILITY_CHANGED, - VIEW_CHANGED, LAST_SIGNAL }; @@ -1168,18 +1167,6 @@ class_init (EShellViewClass *klass) GTK_TYPE_NONE, 1, GTK_TYPE_INT); - signals[VIEW_CHANGED] - = gtk_signal_new ("view_changed", - GTK_RUN_FIRST, - object_class->type, - GTK_SIGNAL_OFFSET (EShellViewClass, view_changed), - e_marshal_NONE__POINTER_POINTER_POINTER_POINTER, - GTK_TYPE_NONE, 4, - GTK_TYPE_STRING, - GTK_TYPE_STRING, - GTK_TYPE_STRING, - GTK_TYPE_STRING); - gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL); load_images (); @@ -1420,8 +1407,8 @@ e_shell_view_construct (EShellView *shell_view, GTK_SIGNAL_FUNC (storage_set_removed_folder_callback), shell_view, GTK_OBJECT (shell_view)); - e_shell_user_creatable_items_handler_attach_menus (e_shell_get_user_creatable_items_handler (priv->shell), - shell_view); + e_shell_user_creatable_items_handler_setup_menus (e_shell_get_user_creatable_items_handler (priv->shell), + shell_view); return view; } @@ -1692,6 +1679,7 @@ set_current_notebook_page (EShellView *shell_view, if (current_page != -1 && current_page != 0) { current = gtk_notebook_get_nth_page (notebook, current_page); + old_control_frame = bonobo_widget_get_control_frame (BONOBO_WIDGET (current)); bonobo_control_frame_set_autoactivate (old_control_frame, FALSE); } @@ -2057,12 +2045,6 @@ e_shell_view_display_uri (EShellView *shell_view, bonobo_window_thaw (BONOBO_WINDOW (shell_view)); - gtk_signal_emit (GTK_OBJECT (shell_view), signals[VIEW_CHANGED], - e_shell_view_get_current_path (shell_view), - e_shell_view_get_current_uri (shell_view), - e_shell_view_get_current_folder_type (shell_view), - e_shell_view_get_current_component_id (shell_view)); - return retval; } @@ -2288,23 +2270,6 @@ e_shell_view_get_current_folder_type (EShellView *shell_view) return get_type_for_folder (shell_view, current_path, NULL); } -const char * -e_shell_view_get_current_component_id (EShellView *shell_view) -{ - EShellViewPrivate *priv; - EFolderTypeRegistry *type_registry; - EvolutionShellComponentClient *component_client; - const char *current_folder_type; - - priv = shell_view->priv; - - type_registry = e_shell_get_folder_type_registry (priv->shell); - current_folder_type = e_shell_view_get_current_folder_type (shell_view); - component_client = e_folder_type_registry_get_handler_for_type (type_registry, current_folder_type); - - return evolution_shell_component_client_get_id (component_client); -} - /** * e_shell_view_save_settings: diff --git a/shell/e-shell.c b/shell/e-shell.c index 1923226ca0..abcd11819f 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -742,7 +742,6 @@ setup_components (EShell *shell, } else { e_shell_user_creatable_items_handler_add_component (priv->user_creatable_items_handler, - info->iid, e_component_registry_get_component_by_id (priv->component_registry, info->iid)); } |