diff options
Diffstat (limited to 'shell/e-shell.c')
| -rw-r--r-- | shell/e-shell.c | 1389 |
1 files changed, 151 insertions, 1238 deletions
diff --git a/shell/e-shell.c b/shell/e-shell.c index 5dbf9f8666..9e221584fe 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -28,30 +28,16 @@ #include "e-util/e-dialog-utils.h" -#include "e-activity-handler.h" -#include "e-component-registry.h" -#include "e-corba-shortcuts.h" -#include "e-corba-storage-registry.h" -#include "e-folder-type-registry.h" -#include "e-local-storage.h" #include "e-setup.h" #include "e-shell-constants.h" -#include "e-shell-corba-icon-utils.h" -#include "e-shell-folder-selection-dialog.h" -#include "e-shell-offline-handler.h" #include "e-shell-settings-dialog.h" #include "e-shell-startup-wizard.h" -#include "e-shell-view.h" -#include "e-shortcuts.h" -#include "e-storage-set.h" -#include "e-splash.h" #include "e-uri-schema-registry.h" #include "e-shell-marshal.h" #include "evolution-shell-component-client.h" #include "evolution-shell-component-utils.h" -#include "evolution-storage-set-view-factory.h" #include "importer/intelligent.h" @@ -81,7 +67,7 @@ #include "Evolution.h" - + #define PARENT_TYPE bonobo_object_get_type () static BonoboObjectClass *parent_class = NULL; @@ -89,36 +75,12 @@ struct _EShellPrivate { /* IID for registering the object on OAF. */ char *iid; - char *local_directory; - - GList *views; - - EStorageSet *storage_set; - ELocalStorage *local_storage; - EStorage *summary_storage; + GList *windows; - EShortcuts *shortcuts; - EFolderTypeRegistry *folder_type_registry; EUriSchemaRegistry *uri_schema_registry; - EComponentRegistry *component_registry; - - EShellUserCreatableItemsHandler *user_creatable_items_handler; - - /* ::StorageRegistry interface handler. */ - ECorbaStorageRegistry *corba_storage_registry; /* <aggregate> */ - - /* ::Activity interface handler. */ - EActivityHandler *activity_handler; /* <aggregate> */ - - /* ::Shortcuts interface handler. */ - ECorbaShortcuts *corba_shortcuts; /* <aggregate> */ - - /* This object handles going off-line. If the pointer is not NULL, it - means we have a going-off-line process in progress. */ - EShellOfflineHandler *offline_handler; - /* Names for the types of the folders that have maybe crashed. */ + /* FIXME TODO */ GList *crash_type_names; /* char * */ /* Line status. */ @@ -142,42 +104,20 @@ struct _EShellPrivate { unsigned int preparing_to_quit : 1; }; - -/* Constants. */ -/* FIXME: We need a component repository instead. */ +/* Signals. */ -#define SHORTCUTS_FILE_NAME "shortcuts.xml" -#define LOCAL_STORAGE_DIRECTORY "local" - - enum { - NO_VIEWS_LEFT, + NO_WINDOWS_LEFT, LINE_STATUS_CHANGED, - NEW_VIEW_CREATED, + NEW_WINDOW_CREATED, LAST_SIGNAL }; static guint signals[LAST_SIGNAL] = { 0 }; - -/* Utility functions. */ -static void -pop_up_activation_error_dialog (ESplash *splash, - const char *id, - CORBA_Environment *ev) -{ - char *error_message; - - error_message = e_get_activation_failure_msg (ev); - e_notice (splash, GTK_MESSAGE_ERROR, - _("Cannot activate component %s :\n" - "The error from the activation system is:\n" - "%s"), - id, error_message); - g_free (error_message); -} +/* Utility functions. */ static gboolean get_config_start_offline (void) @@ -194,130 +134,17 @@ get_config_start_offline (void) return value; } - + /* Interactivity handling. */ static void set_interactive (EShell *shell, gboolean interactive) { - EShellPrivate *priv; - GList *id_list, *p; - Window new_view_xid; - - priv = shell->priv; - - if (!! priv->is_interactive == !! interactive) - return; - - priv->is_interactive = interactive; - - if (interactive) { - GtkWidget *new_view; - - g_return_if_fail (priv->views && priv->views->data); - new_view = priv->views->data; - - new_view_xid = GDK_WINDOW_XWINDOW (new_view->window); - } else - new_view_xid = None; - - id_list = e_component_registry_get_id_list (priv->component_registry); - for (p = id_list; p != NULL; p = p->next) { - EvolutionShellComponentClient *shell_component_client; - GNOME_Evolution_ShellComponent shell_component_objref; - const char *id; - CORBA_Environment ev; - - id = (const char *) p->data; - shell_component_client = e_component_registry_get_component_by_id (priv->component_registry, id); - shell_component_objref = evolution_shell_component_client_corba_objref (shell_component_client); - - CORBA_exception_init (&ev); - - GNOME_Evolution_ShellComponent_interactive (shell_component_objref, interactive, new_view_xid, &ev); - if (ev._major != CORBA_NO_EXCEPTION) - g_warning ("Error changing interactive status of component %s to %s -- %s\n", - id, interactive ? "TRUE" : "FALSE", BONOBO_EX_REPOID (&ev)); - - CORBA_exception_free (&ev); - } - - e_free_string_list (id_list); -} - - -/* Callback for the folder selection dialog. */ - -static void -folder_selection_dialog_cancelled_cb (EShellFolderSelectionDialog *folder_selection_dialog, - void *data) -{ - GNOME_Evolution_FolderSelectionListener listener; - CORBA_Environment ev; - - listener = g_object_get_data (G_OBJECT (folder_selection_dialog), "corba_listener"); - - CORBA_exception_init (&ev); - - GNOME_Evolution_FolderSelectionListener_notifyCanceled (listener, &ev); - - CORBA_exception_free (&ev); - - gtk_widget_destroy (GTK_WIDGET (folder_selection_dialog)); + /* FIXME TODO */ } -static void -folder_selection_dialog_folder_selected_cb (EShellFolderSelectionDialog *folder_selection_dialog, - const char *path, - void *data) -{ - CORBA_Environment ev; - EShell *shell; - GNOME_Evolution_FolderSelectionListener listener; - EStorageSet *storage_set; - EFolder *folder; - GNOME_Evolution_Folder corba_folder; - shell = E_SHELL (data); - listener = g_object_get_data (G_OBJECT (folder_selection_dialog), "corba_listener"); - - CORBA_exception_init (&ev); - - storage_set = e_shell_get_storage_set (shell); - folder = e_storage_set_get_folder (storage_set, path); - - if (folder == NULL) { - corba_folder.type = ""; - corba_folder.description = ""; - corba_folder.displayName = ""; - corba_folder.physicalUri = ""; - corba_folder.evolutionUri = ""; - corba_folder.unreadCount = -1; - corba_folder.customIconName = ""; - } else { - corba_folder.type = (CORBA_char *)e_folder_get_type_string (folder); - corba_folder.description = (CORBA_char *)e_folder_get_description (folder); - if (corba_folder.description == NULL) - corba_folder.description = ""; - corba_folder.displayName = (CORBA_char *)e_folder_get_name (folder); - corba_folder.physicalUri = (CORBA_char *)e_folder_get_physical_uri (folder); - if (corba_folder.physicalUri == NULL) - corba_folder.physicalUri = ""; - corba_folder.evolutionUri = (CORBA_char *)g_strconcat (E_SHELL_URI_PREFIX, path, NULL); - corba_folder.unreadCount = e_folder_get_unread_count (folder); - corba_folder.customIconName = (CORBA_char *)e_folder_get_custom_icon_name (folder); - if (corba_folder.customIconName == NULL) - corba_folder.customIconName = ""; - } - - GNOME_Evolution_FolderSelectionListener_notifySelected (listener, &corba_folder, &ev); - g_free (corba_folder.evolutionUri); - - CORBA_exception_free (&ev); -} - - /* CORBA interface implementation. */ static gboolean @@ -337,75 +164,20 @@ raise_exception_if_not_ready (PortableServer_Servant servant, return FALSE; } -static GNOME_Evolution_ShellComponent -impl_Shell_getComponentByType (PortableServer_Servant servant, - const CORBA_char *type, - CORBA_Environment *ev) -{ - BonoboObject *bonobo_object; - EvolutionShellComponentClient *handler; - EFolderTypeRegistry *folder_type_registry; - GNOME_Evolution_ShellComponent corba_component; - EShell *shell; - - if (raise_exception_if_not_ready (servant, ev)) - return CORBA_OBJECT_NIL; - - bonobo_object = bonobo_object_from_servant (servant); - shell = E_SHELL (bonobo_object); - folder_type_registry = shell->priv->folder_type_registry; - - handler = e_folder_type_registry_get_handler_for_type (folder_type_registry, type); - - if (handler == NULL) { - CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Shell_NotFound, NULL); - return CORBA_OBJECT_NIL; - } - - corba_component = evolution_shell_component_client_corba_objref (handler); - Bonobo_Unknown_ref (corba_component, ev); - - return CORBA_Object_duplicate (corba_component, ev); -} - -static GNOME_Evolution_Icon * -impl_Shell_getIconByType (PortableServer_Servant servant, - const CORBA_char *type, - const CORBA_boolean mini, - CORBA_Environment *ev) -{ - BonoboObject *bonobo_object; - EFolderTypeRegistry *folder_type_registry; - GdkPixbuf *pixbuf; - GNOME_Evolution_Icon *icon; - EShell *shell; - - if (raise_exception_if_not_ready (servant, ev)) - return CORBA_OBJECT_NIL; - - bonobo_object = bonobo_object_from_servant (servant); - shell = E_SHELL (bonobo_object); - folder_type_registry = shell->priv->folder_type_registry; - - pixbuf = e_folder_type_registry_get_icon_for_type (folder_type_registry, type, mini); - - if (pixbuf == NULL) { - CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Shell_NotFound, NULL); - return CORBA_OBJECT_NIL; - } - - icon = e_new_corba_icon_from_pixbuf (pixbuf); - return icon; -} - static GNOME_Evolution_ShellView impl_Shell_createNewView (PortableServer_Servant servant, const CORBA_char *uri, CORBA_Environment *ev) { + CORBA_exception_set (ev, CORBA_USER_EXCEPTION, + ex_GNOME_Evolution_Shell_InternalError, NULL); + + return CORBA_OBJECT_NIL; + +#if 0 /* FIXME */ BonoboObject *bonobo_object; EShell *shell; - EShellView *shell_view; + EShellWindow *shell_window; GNOME_Evolution_ShellView shell_view_interface; if (raise_exception_if_not_ready (servant, ev)) @@ -421,22 +193,23 @@ impl_Shell_createNewView (PortableServer_Servant servant, return CORBA_OBJECT_NIL; } - shell_view = e_shell_create_view (shell, uri, NULL); - if (shell_view == NULL) { + shell_window = e_shell_create_window (shell, uri, NULL); + if (shell_window == NULL) { CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Shell_NotFound, NULL); return CORBA_OBJECT_NIL; } - shell_view_interface = e_shell_view_get_corba_interface (shell_view); - if (shell_view_interface == CORBA_OBJECT_NIL) { + shell_window_interface = e_shell_window_get_corba_interface (shell_window); + if (shell_window_interface == CORBA_OBJECT_NIL) { CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Shell_InternalError, NULL); return CORBA_OBJECT_NIL; } - Bonobo_Unknown_ref (shell_view_interface, ev); - return CORBA_Object_duplicate ((CORBA_Object) shell_view_interface, ev); + Bonobo_Unknown_ref (shell_window_interface, ev); + return CORBA_Object_duplicate ((CORBA_Object) shell_window_interface, ev); +#endif } static void @@ -458,7 +231,7 @@ impl_Shell_handleURI (PortableServer_Servant servant, if (strncmp (uri, E_SHELL_URI_PREFIX, E_SHELL_URI_PREFIX_LEN) == 0 || strncmp (uri, E_SHELL_DEFAULTURI_PREFIX, E_SHELL_DEFAULTURI_PREFIX_LEN) == 0) { - e_shell_create_view (shell, uri, NULL); + e_shell_create_window (shell, NULL); return; } @@ -491,157 +264,6 @@ impl_Shell_handleURI (PortableServer_Servant servant, } static void -corba_listener_destroy_notify (void *data) -{ - CORBA_Environment ev; - GNOME_Evolution_FolderSelectionListener listener_interface; - - listener_interface = (GNOME_Evolution_FolderSelectionListener) data; - - CORBA_exception_init (&ev); - CORBA_Object_release (listener_interface, &ev); - CORBA_exception_free (&ev); -} - -static void -impl_Shell_selectUserFolder (PortableServer_Servant servant, - const CORBA_long_long parent_xid, - const GNOME_Evolution_FolderSelectionListener listener, - const CORBA_char *title, - const CORBA_char *default_folder, - const GNOME_Evolution_Shell_FolderTypeNameList *corba_allowed_type_names, - CORBA_Environment *ev) -{ - GtkWidget *folder_selection_dialog; - BonoboObject *bonobo_object; - GNOME_Evolution_FolderSelectionListener listener_duplicate; - EShell *shell; - const char **allowed_type_names; - int i; - - if (raise_exception_if_not_ready (servant, ev)) - return; - - bonobo_object = bonobo_object_from_servant (servant); - shell = E_SHELL (bonobo_object); - - allowed_type_names = alloca (sizeof (allowed_type_names[0]) * (corba_allowed_type_names->_length + 1)); - for (i = 0; i < corba_allowed_type_names->_length; i++) - allowed_type_names[i] = corba_allowed_type_names->_buffer[i]; - allowed_type_names[corba_allowed_type_names->_length] = NULL; - - /* CORBA doesn't allow you to pass a NULL pointer. */ - if (!*default_folder) - default_folder = NULL; - folder_selection_dialog = e_shell_folder_selection_dialog_new (shell, - title, - NULL, - default_folder, - allowed_type_names, - TRUE); - - - listener_duplicate = CORBA_Object_duplicate (listener, ev); - g_object_set_data_full (G_OBJECT (folder_selection_dialog), "corba_listener", - listener_duplicate, corba_listener_destroy_notify); - - g_signal_connect (folder_selection_dialog, "folder_selected", - G_CALLBACK (folder_selection_dialog_folder_selected_cb), shell); - g_signal_connect (folder_selection_dialog, "cancelled", - G_CALLBACK (folder_selection_dialog_cancelled_cb), shell); - - if (parent_xid) - e_dialog_set_transient_for_xid (GTK_WINDOW (folder_selection_dialog), parent_xid); - -#if NASTY_HACK_FOR_OUT_OF_PROC_COMPONENTS - if (parent_xid == 0) { - gtk_widget_show (folder_selection_dialog); - } else { - XClassHint class_hints; - XWMHints *parent_wm_hints; - - /* Set the WM class and the WindowGroup hint to be the same as - the foreign parent window's. This way smartass window - managers like Sawfish don't get confused. */ - - if (XGetClassHint (GDK_DISPLAY (), (Window) parent_xid, &class_hints)) { - gtk_window_set_wmclass (GTK_WINDOW (folder_selection_dialog), - class_hints.res_name, class_hints.res_class); - XFree (class_hints.res_name); - XFree (class_hints.res_class); - } - - gtk_widget_show (folder_selection_dialog); - - while (folder_selection_dialog->window == NULL) - gtk_main_iteration (); - - parent_wm_hints = XGetWMHints (GDK_DISPLAY (), (Window) parent_xid); - - if (parent_wm_hints != NULL && (parent_wm_hints->flags & WindowGroupHint)) { - XWMHints *wm_hints; - - wm_hints = XAllocWMHints (); - wm_hints->flags = WindowGroupHint; - wm_hints->window_group = parent_wm_hints->window_group; - XSetWMHints (GDK_DISPLAY (), GDK_WINDOW_XWINDOW (folder_selection_dialog->window), wm_hints); - XFree (wm_hints); - XFree (parent_wm_hints); - } - } -#else - gtk_widget_show (folder_selection_dialog); -#endif -} - -static GNOME_Evolution_Storage -impl_Shell_getLocalStorage (PortableServer_Servant servant, - CORBA_Environment *ev) -{ - BonoboObject *bonobo_object; - GNOME_Evolution_Storage local_storage_interface; - EShell *shell; - EShellPrivate *priv; - - bonobo_object = bonobo_object_from_servant (servant); - shell = E_SHELL (bonobo_object); - priv = shell->priv; - - if (priv->local_storage == NULL) { - CORBA_exception_set (ev, CORBA_USER_EXCEPTION, - ex_GNOME_Evolution_Shell_NotReady, NULL); - return CORBA_OBJECT_NIL; - } - - local_storage_interface = e_local_storage_get_corba_interface (priv->local_storage); - - bonobo_object_dup_ref (local_storage_interface, ev); - - return local_storage_interface; -} - -static Bonobo_Control -impl_Shell_createStorageSetView (PortableServer_Servant servant, - CORBA_Environment *ev) -{ - BonoboObject *bonobo_object; - BonoboControl *control; - CORBA_Object dup_objref; - EShell *shell; - - if (raise_exception_if_not_ready (servant, ev)) - return CORBA_OBJECT_NIL; - - bonobo_object = bonobo_object_from_servant (servant); - shell = E_SHELL (bonobo_object); - - control = evolution_storage_set_view_factory_new_view (shell); - dup_objref = CORBA_Object_duplicate (bonobo_object_corba_objref (BONOBO_OBJECT (control)), ev); - - return dup_objref; -} - -static void impl_Shell_setLineStatus (PortableServer_Servant servant, CORBA_boolean online, CORBA_Environment *ev) @@ -661,130 +283,11 @@ impl_Shell_setLineStatus (PortableServer_Servant servant, e_shell_go_offline (shell, NULL); } - -/* Set up the ::Activity interface. */ - -static void -setup_activity_interface (EShell *shell) -{ - EActivityHandler *activity_handler; - EShellPrivate *priv; - - priv = shell->priv; - - activity_handler = e_activity_handler_new (); - - bonobo_object_add_interface (BONOBO_OBJECT (shell), BONOBO_OBJECT (activity_handler)); - priv->activity_handler = activity_handler; -} - - -/* Set up the ::Shortcuts interface. */ - -static void -setup_shortcuts_interface (EShell *shell) -{ - ECorbaShortcuts *corba_shortcuts; - EShellPrivate *priv; - - priv = shell->priv; - - g_assert (priv->shortcuts != NULL); - - corba_shortcuts = e_corba_shortcuts_new (priv->shortcuts); - - bonobo_object_add_interface (BONOBO_OBJECT (shell), BONOBO_OBJECT (corba_shortcuts)); - priv->corba_shortcuts = corba_shortcuts; -} - - -/* Initialization of the storages. */ - -static gboolean -setup_corba_storages (EShell *shell) -{ - EShellPrivate *priv; - ECorbaStorageRegistry *corba_storage_registry; - priv = shell->priv; - - g_assert (priv->storage_set != NULL); - corba_storage_registry = e_corba_storage_registry_new (priv->storage_set); - - if (corba_storage_registry == NULL) - return FALSE; - - bonobo_object_add_interface (BONOBO_OBJECT (shell), - BONOBO_OBJECT (corba_storage_registry)); - - priv->corba_storage_registry = corba_storage_registry; - - return TRUE; -} - -static gboolean -setup_local_storage (EShell *shell) -{ - EStorage *local_storage; - EShellPrivate *priv; - gchar *local_storage_path; - EFolder *summary_folder; - - priv = shell->priv; - - g_assert (priv->folder_type_registry != NULL); - g_assert (priv->local_storage == NULL); - - local_storage_path = g_build_filename (priv->local_directory, LOCAL_STORAGE_DIRECTORY, NULL); - local_storage = e_local_storage_open (priv->folder_type_registry, local_storage_path); - if (local_storage == NULL) { - g_warning (_("Cannot set up local storage -- %s"), local_storage_path); - g_free (local_storage_path); - return FALSE; - } - g_free (local_storage_path); - - e_storage_set_add_storage (priv->storage_set, local_storage); - priv->local_storage = E_LOCAL_STORAGE (local_storage); - - summary_folder = e_folder_new (_("Summary"), "summary", ""); - e_folder_set_physical_uri (summary_folder, "/"); - e_folder_set_is_stock (summary_folder, TRUE); - priv->summary_storage = e_storage_new (E_SUMMARY_STORAGE_NAME, - summary_folder); - e_storage_set_add_storage (priv->storage_set, priv->summary_storage); - - return TRUE; -} - - /* Initialization of the components. */ -static char * -get_icon_path_for_component_info (const Bonobo_ServerInfo *info) -{ - Bonobo_ActivationProperty *property; - const char *shell_component_icon_value; - - property = bonobo_server_info_prop_find ((Bonobo_ServerInfo *) info, - "evolution:shell_component_icon"); - - if (property == NULL || property->v._d != Bonobo_ACTIVATION_P_STRING) - return gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_PIXMAP, "gnome-question.png", - TRUE, NULL); - - shell_component_icon_value = property->v._u.value_string; - - if (g_path_is_absolute (shell_component_icon_value)) - return g_strdup (shell_component_icon_value); - - else - return g_build_filename (EVOLUTION_IMAGES, shell_component_icon_value, NULL); -} - static void -setup_components (EShell *shell, - ESplash *splash) +setup_components (EShell *shell) { EShellPrivate *priv; char *const selection_order[] = { "0-evolution:shell_component_launch_order", NULL }; @@ -795,8 +298,8 @@ setup_components (EShell *shell, CORBA_exception_init (&ev); priv = shell->priv; - priv->component_registry = e_component_registry_new (shell); +#if 0 /* FIXME */ info_list = bonobo_activation_query ("repo_ids.has ('IDL:GNOME/Evolution/ShellComponent:1.0')", selection_order, &ev); if (ev._major != CORBA_NO_EXCEPTION) @@ -835,14 +338,8 @@ setup_components (EShell *shell, CORBA_exception_init (&ev); - if (! e_component_registry_register_component (priv->component_registry, info->iid, &ev)) { + if (! e_component_registry_register_component (priv->component_registry, info->iid, &ev)) pop_up_activation_error_dialog (splash, info->iid, &ev); - } 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)); - } CORBA_exception_free (&ev); @@ -852,114 +349,30 @@ setup_components (EShell *shell, while (gtk_events_pending ()) gtk_main_iteration (); } - CORBA_free (info_list); +#endif CORBA_exception_free (&ev); } -/* FIXME what if anything fails here? */ -static void -set_owner_on_components (EShell *shell, - ESplash *splash) -{ - GNOME_Evolution_Shell corba_shell; - EShellPrivate *priv; - const char *local_directory; - GList *id_list; - GList *p; - - priv = shell->priv; - local_directory = e_shell_get_local_directory (shell); - - corba_shell = BONOBO_OBJREF (shell); - id_list = e_component_registry_get_id_list (priv->component_registry); - for (p = id_list; p != NULL; p = p->next) { - EvolutionShellComponentClient *component_client; - EvolutionShellComponentResult result; - const char *id; - - id = (const char *) p->data; - component_client = e_component_registry_get_component_by_id (priv->component_registry, id); - - result = evolution_shell_component_client_set_owner (component_client, corba_shell, local_directory); - if (result != EVOLUTION_SHELL_COMPONENT_OK) { - g_warning ("Error setting owner on component %s -- %s", - id, evolution_shell_component_result_to_string (result)); - - if (result == EVOLUTION_SHELL_COMPONENT_OLDOWNERHASDIED) { - CORBA_Environment ev; - - CORBA_exception_init (&ev); - - component_client = e_component_registry_restart_component (priv->component_registry, - id, &ev); - - if (component_client == NULL) { - pop_up_activation_error_dialog (splash, id, &ev); - } else { - result = evolution_shell_component_client_set_owner (component_client, corba_shell, - local_directory); - if (result != EVOLUTION_SHELL_COMPONENT_OK) { - g_warning ("Error re-setting owner on component %s -- %s", - id, evolution_shell_component_result_to_string (result)); - /* (At this point, we give up.) */ - } - } - - CORBA_exception_free (&ev); - } - } - } - - e_free_string_list (id_list); -} - - -/* EStorageSet callbacks. */ - -static void -storage_set_moved_folder_callback (EStorageSet *storage_set, - const char *source_path, - const char *destination_path, - void *data) -{ - EShell *shell; - char *source_uri; - char *destination_uri; - - shell = E_SHELL (data); - - source_uri = g_strconcat (E_SHELL_URI_PREFIX, source_path, NULL); - destination_uri = g_strconcat (E_SHELL_URI_PREFIX, destination_path, NULL); - - e_shortcuts_update_shortcuts_for_changed_uri (e_shell_get_shortcuts (shell), - source_uri, - destination_uri); - - g_free (source_uri); - g_free (destination_uri); -} - - -/* EShellView handling and bookkeeping. */ +/* EShellWindow handling and bookkeeping. */ static int -view_delete_event_cb (GtkWidget *widget, +window_delete_event_cb (GtkWidget *widget, GdkEventAny *ev, void *data) { EShell *shell; - g_assert (E_IS_SHELL_VIEW (widget)); + g_assert (E_IS_SHELL_WINDOW (widget)); shell = E_SHELL (data); - return ! e_shell_request_close_view (shell, E_SHELL_VIEW (widget)); + return ! e_shell_request_close_window (shell, E_SHELL_WINDOW (widget)); } static gboolean -notify_no_views_left_idle_cb (void *data) +notify_no_windows_left_idle_cb (void *data) { EShell *shell; @@ -967,7 +380,7 @@ notify_no_views_left_idle_cb (void *data) set_interactive (shell, FALSE); - g_signal_emit (shell, signals [NO_VIEWS_LEFT], 0); + g_signal_emit (shell, signals [NO_WINDOWS_LEFT], 0); bonobo_object_unref (BONOBO_OBJECT (shell)); @@ -975,67 +388,52 @@ notify_no_views_left_idle_cb (void *data) } static void -view_weak_notify (void *data, - GObject *where_the_object_was) +window_weak_notify (void *data, + GObject *where_the_object_was) { EShell *shell; - int num_views; + int num_windows; shell = E_SHELL (data); - num_views = g_list_length (shell->priv->views); + num_windows = g_list_length (shell->priv->windows); - /* If this is our last view, save settings now because in the callback - for no_views_left shell->priv->views will be NULL and settings won't + /* If this is our last window, save settings now because in the callback + for no_windows_left shell->priv->windows will be NULL and settings won't be saved because of that. */ - if (num_views == 1) + if (num_windows == 1) e_shell_save_settings (shell); - shell->priv->views = g_list_remove (shell->priv->views, where_the_object_was); + shell->priv->windows = g_list_remove (shell->priv->windows, where_the_object_was); - if (shell->priv->views == NULL) { + if (shell->priv->windows == NULL) { bonobo_object_ref (BONOBO_OBJECT (shell)); - g_idle_add (notify_no_views_left_idle_cb, shell); + g_idle_add (notify_no_windows_left_idle_cb, shell); } } -static EShellView * -create_view (EShell *shell, - const char *uri, - EShellView *template_view) +static EShellWindow * +create_window (EShell *shell, + EShellWindow *template_window) { EShellPrivate *priv; - EShellView *view; - ETaskBar *task_bar; + EShellWindow *window; priv = shell->priv; - view = e_shell_view_new (shell, uri); + window = E_SHELL_WINDOW (e_shell_window_new (shell)); - g_signal_connect (view, "delete_event", - G_CALLBACK (view_delete_event_cb), shell); + g_signal_connect (window, "delete_event", G_CALLBACK (window_delete_event_cb), shell); + g_object_weak_ref (G_OBJECT (window), window_weak_notify, shell); - g_object_weak_ref (G_OBJECT (view), view_weak_notify, shell); + shell->priv->windows = g_list_prepend (shell->priv->windows, window); - if (uri != NULL) - e_shell_view_display_uri (E_SHELL_VIEW (view), uri, TRUE); + g_signal_emit (shell, signals[NEW_WINDOW_CREATED], 0, window); - shell->priv->views = g_list_prepend (shell->priv->views, view); - - task_bar = e_shell_view_get_task_bar (view); - e_activity_handler_attach_task_bar (priv->activity_handler, task_bar); - - if (template_view != NULL) { - e_shell_view_show_folder_bar (view, e_shell_view_folder_bar_shown (template_view)); - e_shell_view_show_shortcut_bar (view, e_shell_view_shortcut_bar_shown (template_view)); - } - - g_signal_emit (shell, signals[NEW_VIEW_CREATED], 0, view); - - return view; + return window; } - + /* GObject methods. */ static void @@ -1050,71 +448,27 @@ impl_dispose (GObject *object) priv->is_initialized = FALSE; - if (priv->storage_set != NULL) { - g_object_unref (priv->storage_set); - priv->storage_set = NULL; - } - - if (priv->local_storage != NULL) { - g_object_unref (priv->local_storage); - priv->local_storage = NULL; - } - - if (priv->summary_storage != NULL) { - g_object_unref (priv->summary_storage); - priv->summary_storage = NULL; - } - - if (priv->shortcuts != NULL) { - g_object_unref (priv->shortcuts); - priv->shortcuts = NULL; - } - - if (priv->folder_type_registry != NULL) { - g_object_unref (priv->folder_type_registry); - priv->folder_type_registry = NULL; - } - if (priv->uri_schema_registry != NULL) { g_object_unref (priv->uri_schema_registry); priv->uri_schema_registry = NULL; } - if (priv->component_registry != NULL) { - g_object_unref (priv->component_registry); - priv->component_registry = NULL; - } - - if (priv->user_creatable_items_handler != NULL) { - g_object_unref (priv->user_creatable_items_handler); - priv->user_creatable_items_handler = NULL; - } - - for (p = priv->views; p != NULL; p = p->next) { - EShellView *view; - - view = E_SHELL_VIEW (p->data); + for (p = priv->windows; p != NULL; p = p->next) { + EShellWindow *window; - g_signal_handlers_disconnect_by_func (view, G_CALLBACK (view_delete_event_cb), shell); + window = E_SHELL_WINDOW (p->data); - g_object_weak_unref (G_OBJECT (view), view_weak_notify, shell); + g_signal_handlers_disconnect_by_func (window, G_CALLBACK (window_delete_event_cb), shell); + g_object_weak_unref (G_OBJECT (window), window_weak_notify, shell); - gtk_object_destroy (GTK_OBJECT (view)); + gtk_object_destroy (GTK_OBJECT (window)); } - g_list_free (priv->views); - priv->views = NULL; + g_list_free (priv->windows); + priv->windows = NULL; /* No unreffing for these as they are aggregate. */ /* bonobo_object_unref (BONOBO_OBJECT (priv->corba_storage_registry)); */ - /* bonobo_object_unref (BONOBO_OBJECT (priv->activity_handler)); */ - /* bonobo_object_unref (BONOBO_OBJECT (priv->corba_shortcuts)); */ - - /* FIXME. Maybe we should do something special here. */ - if (priv->offline_handler != NULL) { - g_object_unref (priv->offline_handler); - priv->offline_handler = NULL; - } if (priv->settings_dialog != NULL) { gtk_widget_destroy (priv->settings_dialog); @@ -1137,8 +491,6 @@ impl_finalize (GObject *object) bonobo_activation_active_server_unregister (priv->iid, bonobo_object_corba_objref (BONOBO_OBJECT (shell))); - g_free (priv->local_directory); - e_free_string_list (priv->crash_type_names); g_free (priv); @@ -1146,7 +498,7 @@ impl_finalize (GObject *object) (* G_OBJECT_CLASS (parent_class)->finalize) (object); } - + /* Initialization. */ static void @@ -1161,11 +513,11 @@ e_shell_class_init (EShellClass *klass) object_class->dispose = impl_dispose; object_class->finalize = impl_finalize; - signals[NO_VIEWS_LEFT] = - g_signal_new ("no_views_left", + signals[NO_WINDOWS_LEFT] = + g_signal_new ("no_windows_left", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (EShellClass, no_views_left), + G_STRUCT_OFFSET (EShellClass, no_windows_left), NULL, NULL, e_shell_marshal_NONE__NONE, G_TYPE_NONE, 0); @@ -1180,24 +532,19 @@ e_shell_class_init (EShellClass *klass) G_TYPE_NONE, 1, G_TYPE_INT); - signals[NEW_VIEW_CREATED] = - g_signal_new ("new_view_created", + signals[NEW_WINDOW_CREATED] = + g_signal_new ("new_window_created", G_OBJECT_CLASS_TYPE (object_class), G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (EShellClass, new_view_created), + G_STRUCT_OFFSET (EShellClass, new_window_created), NULL, NULL, e_shell_marshal_NONE__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); epv = & klass->epv; - epv->getComponentByType = impl_Shell_getComponentByType; - epv->getIconByType = impl_Shell_getIconByType; epv->createNewView = impl_Shell_createNewView; epv->handleURI = impl_Shell_handleURI; - epv->selectUserFolder = impl_Shell_selectUserFolder; - epv->getLocalStorage = impl_Shell_getLocalStorage; - epv->createStorageSetView = impl_Shell_createStorageSetView; epv->setLineStatus = impl_Shell_setLineStatus; } @@ -1208,22 +555,10 @@ e_shell_init (EShell *shell) priv = g_new (EShellPrivate, 1); - priv->views = NULL; + priv->windows = NULL; priv->iid = NULL; - priv->local_directory = NULL; - priv->storage_set = NULL; - priv->local_storage = NULL; - priv->summary_storage = NULL; - priv->shortcuts = NULL; - priv->component_registry = NULL; - priv->user_creatable_items_handler = NULL; - priv->folder_type_registry = NULL; priv->uri_schema_registry = NULL; - priv->corba_storage_registry = NULL; - priv->activity_handler = NULL; - priv->corba_shortcuts = NULL; - priv->offline_handler = NULL; priv->crash_type_names = NULL; priv->line_status = E_SHELL_LINE_STATUS_OFFLINE; priv->settings_dialog = NULL; @@ -1234,70 +569,37 @@ e_shell_init (EShell *shell) shell->priv = priv; } - + /** * e_shell_construct: * @shell: An EShell object to construct * @iid: OAFIID for registering the shell into the name server - * @local_directory: Local directory for storing local information and folders - * @show_splash: Whether to display a splash screen. * @startup_line_mode: How to set up the line mode (online or offline) initally. * - * Construct @shell so that it uses the specified @local_directory and - * @corba_object. + * Construct @shell so that it uses the specified @corba_object. * * Return value: The result of the operation. **/ EShellConstructResult e_shell_construct (EShell *shell, const char *iid, - const char *local_directory, - gboolean show_splash, EShellStartupLineMode startup_line_mode) { GtkWidget *splash = NULL; EShellPrivate *priv; CORBA_Object corba_object; - gchar *shortcut_path; gboolean start_online; g_return_val_if_fail (shell != NULL, E_SHELL_CONSTRUCT_RESULT_INVALIDARG); g_return_val_if_fail (E_IS_SHELL (shell), E_SHELL_CONSTRUCT_RESULT_INVALIDARG); - g_return_val_if_fail (local_directory != NULL, E_SHELL_CONSTRUCT_RESULT_INVALIDARG); - g_return_val_if_fail (g_path_is_absolute (local_directory), E_SHELL_CONSTRUCT_RESULT_INVALIDARG); g_return_val_if_fail (startup_line_mode == E_SHELL_STARTUP_LINE_MODE_CONFIG || startup_line_mode == E_SHELL_STARTUP_LINE_MODE_ONLINE || startup_line_mode == E_SHELL_STARTUP_LINE_MODE_OFFLINE, E_SHELL_CONSTRUCT_RESULT_INVALIDARG); priv = shell->priv; + priv->iid = g_strdup (iid); - priv->iid = g_strdup (iid); - priv->local_directory = g_strdup (local_directory); - priv->folder_type_registry = e_folder_type_registry_new (); - priv->uri_schema_registry = e_uri_schema_registry_new (); - priv->storage_set = e_storage_set_new (priv->folder_type_registry); - - g_signal_connect_object (priv->storage_set, "moved_folder", - G_CALLBACK (storage_set_moved_folder_callback), - shell, 0); - - e_folder_type_registry_register_type (priv->folder_type_registry, - "noselect", "empty.gif", - "noselect", "", FALSE, - 0, NULL, 0, NULL); - e_folder_type_registry_register_type (priv->folder_type_registry, - "working", "working-16.png", - "working", "", FALSE, - 0, NULL, 0, NULL); - - /* CORBA storages must be set up before the components, because otherwise components - cannot register their own storages. */ - if (! setup_corba_storages (shell)) - return FALSE; - - e_setup_check_config (local_directory); - /* Now we can register into OAF. Notice that we shouldn't be registering into OAF until we are sure we can complete. */ @@ -1306,46 +608,10 @@ e_shell_construct (EShell *shell, if (bonobo_activation_active_server_register (iid, corba_object) != Bonobo_ACTIVATION_REG_SUCCESS) return E_SHELL_CONSTRUCT_RESULT_CANNOTREGISTER; - if (show_splash - && (splash = e_splash_new ())) { - g_signal_connect (splash, "delete_event", - G_CALLBACK (gtk_widget_hide_on_delete), NULL); - gtk_widget_show (splash); - } - while (gtk_events_pending ()) gtk_main_iteration (); - priv->user_creatable_items_handler = e_shell_user_creatable_items_handler_new (); - - setup_components (shell, (ESplash *)splash); - - /* Set up the shortcuts. */ - - shortcut_path = g_build_filename (local_directory, "shortcuts.xml", NULL); - priv->shortcuts = e_shortcuts_new_from_file (shell, shortcut_path); - g_assert (priv->shortcuts != NULL); - - if (e_shortcuts_get_num_groups (priv->shortcuts) == 0) - e_shortcuts_add_default_group (priv->shortcuts); - - g_free (shortcut_path); - - /* The local storage depends on the component registry. */ - setup_local_storage (shell); - - /* Set up the ::Activity interface. This must be done before we notify - the components, as they might want to use it. */ - setup_activity_interface (shell); - - /* Set up the shortcuts interface. This has to be done after the - shortcuts are actually initialized. */ - - setup_shortcuts_interface (shell); - - /* Now that we have a local storage and all the interfaces set up, we - can tell the components we are here. */ - set_owner_on_components (shell, (ESplash *)splash); + setup_components (shell); if (splash) gtk_widget_destroy (splash); @@ -1382,8 +648,6 @@ e_shell_construct (EShell *shell, /** * e_shell_new: - * @local_directory: Local directory for storing local information and folders. - * @show_splash: Whether to display a splash screen. * @start_online: Whether to start in on-line mode or not. * @construct_result_return: A pointer to an EShellConstructResult variable into * which the result of the operation will be stored. @@ -1393,25 +657,16 @@ e_shell_construct (EShell *shell, * Return value: **/ EShell * -e_shell_new (const char *local_directory, - gboolean show_splash, - EShellStartupLineMode startup_line_mode, +e_shell_new (EShellStartupLineMode startup_line_mode, EShellConstructResult *construct_result_return) { EShell *new; EShellPrivate *priv; EShellConstructResult construct_result; - g_return_val_if_fail (local_directory != NULL, NULL); - g_return_val_if_fail (*local_directory != '\0', NULL); - new = g_object_new (e_shell_get_type (), NULL); - construct_result = e_shell_construct (new, - E_SHELL_OAFIID, - local_directory, - show_splash, - startup_line_mode); + construct_result = e_shell_construct (new, E_SHELL_OAFIID, startup_line_mode); if (construct_result != E_SHELL_CONSTRUCT_RESULT_OK) { *construct_result_return = construct_result; @@ -1421,71 +676,64 @@ e_shell_new (const char *local_directory, priv = new->priv; - if (priv->shortcuts == NULL || priv->storage_set == NULL) { - /* FIXME? */ - *construct_result_return = E_SHELL_CONSTRUCT_RESULT_GENERICERROR; - bonobo_object_unref (BONOBO_OBJECT (new)); - return NULL; - } - *construct_result_return = E_SHELL_CONSTRUCT_RESULT_OK; return new; } - + /** - * e_shell_create_view: - * @shell: The shell for which to create a new view. - * @uri: URI for the new view. - * @template_view: Window from which to copy the view settings (can be %NULL). + * e_shell_create_window: + * @shell: The shell for which to create a new window. + * @template_window: Window from which to copy the window settings (can be %NULL). * - * Create a new view for @uri. + * Create a new window for @uri. * - * Return value: The new view. + * Return value: The new window. **/ -EShellView * -e_shell_create_view (EShell *shell, - const char *uri, - EShellView *template_view) +EShellWindow * +e_shell_create_window (EShell *shell, + EShellWindow *template_window) { - EShellView *view; + EShellWindow *window; EShellPrivate *priv; + /* FIXME need to actually copy settings from template_window. */ + g_return_val_if_fail (shell != NULL, NULL); g_return_val_if_fail (E_IS_SHELL (shell), NULL); priv = shell->priv; - view = create_view (shell, uri, template_view); + window = create_window (shell, template_window); - gtk_widget_show (GTK_WIDGET (view)); + gtk_widget_show (GTK_WIDGET (window)); set_interactive (shell, TRUE); - return view; + return window; } gboolean -e_shell_request_close_view (EShell *shell, - EShellView *shell_view) +e_shell_request_close_window (EShell *shell, + EShellWindow *shell_window) { g_return_val_if_fail (E_IS_SHELL (shell), FALSE); - g_return_val_if_fail (E_IS_SHELL_VIEW (shell_view), FALSE); + g_return_val_if_fail (E_IS_SHELL_WINDOW (shell_window), FALSE); e_shell_save_settings (shell); - if (g_list_length (shell->priv->views) != 1) { - /* Not the last view. */ + if (g_list_length (shell->priv->windows) != 1) { + /* Not the last window. */ return TRUE; } if (shell->priv->preparing_to_quit) return FALSE; - /* If it's the last view, save settings and ask for confirmation before + /* If it's the last window, save settings and ask for confirmation before quitting. */ - e_shell_view_save_defaults (shell_view); + e_shell_window_save_defaults (shell_window); if (e_shell_prepare_for_quit (shell)) return TRUE; @@ -1493,74 +741,6 @@ e_shell_request_close_view (EShell *shell, return FALSE; } - -/** - * e_shell_get_local_directory: - * @shell: An EShell object. - * - * Get the local directory associated with @shell. - * - * Return value: A pointer to the path of the local directory. - **/ -const char * -e_shell_get_local_directory (EShell *shell) -{ - g_return_val_if_fail (shell != NULL, NULL); - g_return_val_if_fail (E_IS_SHELL (shell), NULL); - - return shell->priv->local_directory; -} - -/** - * e_shell_get_shortcuts: - * @shell: An EShell object. - * - * Get the shortcuts associated to @shell. - * - * Return value: A pointer to the EShortcuts associated to @shell. - **/ -EShortcuts * -e_shell_get_shortcuts (EShell *shell) -{ - g_return_val_if_fail (shell != NULL, NULL); - g_return_val_if_fail (E_IS_SHELL (shell), NULL); - - return shell->priv->shortcuts; -} - -/** - * e_shell_get_storage_set: - * @shell: An EShell object. - * - * Get the storage set associated to @shell. - * - * Return value: A pointer to the EStorageSet associated to @shell. - **/ -EStorageSet * -e_shell_get_storage_set (EShell *shell) -{ - g_return_val_if_fail (shell != NULL, NULL); - g_return_val_if_fail (E_IS_SHELL (shell), NULL); - - return shell->priv->storage_set; -} - -/** - * e_shell_get_folder_type_registry: - * @shell: An EShell object. - * - * Get the folder type registry associated to @shell. - * - * Return value: A pointer to the EFolderTypeRegistry associated to @shell. - **/ -EFolderTypeRegistry * -e_shell_get_folder_type_registry (EShell *shell) -{ - g_return_val_if_fail (shell != NULL, NULL); - g_return_val_if_fail (E_IS_SHELL (shell), NULL); - - return shell->priv->folder_type_registry; -} /** * e_shell_get_uri_schema_registry: @@ -1579,111 +759,6 @@ e_shell_get_uri_schema_registry (EShell *shell) return shell->priv->uri_schema_registry; } -/** - * e_shell_get_local_storage: - * @shell: An EShell object. - * - * Get the local storage associated to @shell. - * - * Return value: A pointer to the ELocalStorage associated to @shell. - **/ -ELocalStorage * -e_shell_get_local_storage (EShell *shell) -{ - g_return_val_if_fail (shell != NULL, NULL); - g_return_val_if_fail (E_IS_SHELL (shell), NULL); - - return shell->priv->local_storage; -} - - -static gboolean -save_settings_for_component (EShell *shell, - const char *id, - EvolutionShellComponentClient *client) -{ - Bonobo_Unknown unknown_interface; - GNOME_Evolution_Session session_interface; - CORBA_Environment ev; - char *prefix; - gboolean retval; - - unknown_interface = evolution_shell_component_client_corba_objref (client); - g_assert (unknown_interface != CORBA_OBJECT_NIL); - - CORBA_exception_init (&ev); - - session_interface = Bonobo_Unknown_queryInterface (unknown_interface, - "IDL:GNOME/Evolution/Session:1.0", &ev); - if (ev._major != CORBA_NO_EXCEPTION || CORBA_Object_is_nil (session_interface, &ev)) { - CORBA_exception_free (&ev); - return TRUE; - } - - prefix = g_strconcat ("/apps/evolution/shell/components/", id, NULL); - GNOME_Evolution_Session_saveConfiguration (session_interface, prefix, &ev); - - if (ev._major == CORBA_NO_EXCEPTION) - retval = TRUE; - else - retval = FALSE; - - g_free (prefix); - - CORBA_exception_free (&ev); - - bonobo_object_release_unref (session_interface, NULL); - - return retval; -} - -static gboolean -save_settings_for_components (EShell *shell) -{ - EShellPrivate *priv; - GList *component_ids; - GList *p; - gboolean retval; - - priv = shell->priv; - - g_assert (priv->component_registry); - component_ids = e_component_registry_get_id_list (priv->component_registry); - - retval = TRUE; - for (p = component_ids; p != NULL; p = p->next) { - EvolutionShellComponentClient *client; - const char *id; - - id = p->data; - client = e_component_registry_get_component_by_id (priv->component_registry, id); - - if (! save_settings_for_component (shell, id, client)) - retval = FALSE; - } - - e_free_string_list (component_ids); - - return retval; -} - -static gboolean -save_misc_settings (EShell *shell) -{ - GConfClient *client; - EShellPrivate *priv; - gboolean is_offline; - - priv = shell->priv; - - is_offline = ( e_shell_get_line_status (shell) == E_SHELL_LINE_STATUS_OFFLINE ); - - client = gconf_client_get_default (); - gconf_client_set_bool (client, "/apps/evolution/shell/start_offline", is_offline, NULL); - g_object_unref (client); - - return TRUE; -} /** * e_shell_save_settings: @@ -1692,32 +767,35 @@ save_misc_settings (EShell *shell) * Save the settings for this shell. * * Return value: %TRUE if it worked, %FALSE otherwise. Even if %FALSE is - * returned, it is possible that at least part of the settings for the views + * returned, it is possible that at least part of the settings for the windows * have been saved. **/ gboolean e_shell_save_settings (EShell *shell) { - gboolean components_saved; - gboolean misc_saved; + GConfClient *client; + EShellPrivate *priv; + gboolean is_offline; - g_return_val_if_fail (shell != NULL, FALSE); - g_return_val_if_fail (E_IS_SHELL (shell), FALSE); + priv = shell->priv; - components_saved = save_settings_for_components (shell); - misc_saved = save_misc_settings (shell); + is_offline = ( e_shell_get_line_status (shell) == E_SHELL_LINE_STATUS_OFFLINE ); - return components_saved && misc_saved; + client = gconf_client_get_default (); + gconf_client_set_bool (client, "/apps/evolution/shell/start_offline", is_offline, NULL); + g_object_unref (client); + + return TRUE; } /** - * e_shell_destroy_all_views: + * e_shell_close_all_windows: * @shell: * - * Destroy all the views in @shell. + * Destroy all the windows in @shell. **/ void -e_shell_destroy_all_views (EShell *shell) +e_shell_close_all_windows (EShell *shell) { EShellPrivate *priv; GList *p, *pnext; @@ -1725,131 +803,19 @@ e_shell_destroy_all_views (EShell *shell) g_return_if_fail (shell != NULL); g_return_if_fail (E_IS_SHELL (shell)); - if (shell->priv->views) + if (shell->priv->windows) e_shell_save_settings (shell); priv = shell->priv; - - for (p = priv->views; p != NULL; p = pnext) { - EShellView *shell_view; - + for (p = priv->windows; p != NULL; p = pnext) { pnext = p->next; - shell_view = E_SHELL_VIEW (p->data); - gtk_widget_destroy (GTK_WIDGET (shell_view)); + /* Note that this will also remove the window from the list... Hence the + need for the pnext variable. */ + gtk_widget_destroy (GTK_WIDGET (p->data)); } } - -/** - * e_shell_component_maybe_crashed: - * @shell: A pointer to an EShell object - * @uri: URI that caused the crash - * @type_name: The type of the folder that caused the crash - * @shell_view: Pointer to the EShellView over which we want the modal dialog - * to appear. - * - * Report that a maybe crash happened when trying to display a folder of type - * @type_name. The shell will pop up a crash dialog whose parent will be the - * @shell_view. - **/ -void -e_shell_component_maybe_crashed (EShell *shell, - const char *uri, - const char *type_name, - EShellView *shell_view) -{ - EShellPrivate *priv; - EvolutionShellComponentClient *component; - GList *p; - - g_return_if_fail (shell != NULL); - g_return_if_fail (E_IS_SHELL (shell)); - g_return_if_fail (type_name != NULL); - g_return_if_fail (shell_view != NULL); - g_return_if_fail (E_IS_SHELL_VIEW (shell_view)); - - priv = shell->priv; - - if (strncmp (uri, E_SHELL_URI_PREFIX, E_SHELL_URI_PREFIX_LEN) == 0) { - const char *path; - - path = uri + E_SHELL_URI_PREFIX_LEN; - if (e_storage_set_get_folder (priv->storage_set, path) == NULL) - return; - } - - component = e_folder_type_registry_get_handler_for_type (priv->folder_type_registry, type_name); - if (component != NULL - && bonobo_unknown_ping (evolution_shell_component_client_corba_objref (component), NULL)) - return; - - /* See if that type has caused a crash already. */ - - for (p = priv->crash_type_names; p != NULL; p = p->next) { - const char *crash_type_name; - - crash_type_name = (const char *) p->data; - if (strcmp (type_name, crash_type_name) == 0) { - /* This type caused a crash already. */ - return; - } - } - - /* New crash. */ - - priv->crash_type_names = g_list_prepend (priv->crash_type_names, g_strdup (type_name)); - - e_notice (shell_view, GTK_MESSAGE_ERROR, - _("The Evolution component that handles folders of type \"%s\"\n" - "has unexpectedly quit. You will need to quit Evolution and restart\n" - "in order to access that data again."), - type_name); - - if (shell_view) - bonobo_ui_engine_deregister_dead_components (bonobo_window_get_ui_engine (BONOBO_WINDOW (shell_view))); - - /* FIXME: we should probably re-start the component here */ -} - - -/* Offline/online handling. */ - -static void -offline_procedure_started_cb (EShellOfflineHandler *offline_handler, - void *data) -{ - EShell *shell; - EShellPrivate *priv; - - shell = E_SHELL (data); - priv = shell->priv; - - priv->line_status = E_SHELL_LINE_STATUS_GOING_OFFLINE; - g_signal_emit (shell, signals[LINE_STATUS_CHANGED], 0, priv->line_status); -} - -static void -offline_procedure_finished_cb (EShellOfflineHandler *offline_handler, - gboolean now_offline, - void *data) -{ - EShell *shell; - EShellPrivate *priv; - - shell = E_SHELL (data); - priv = shell->priv; - - if (now_offline) - priv->line_status = E_SHELL_LINE_STATUS_OFFLINE; - else - priv->line_status = E_SHELL_LINE_STATUS_ONLINE; - - g_object_unref (priv->offline_handler); - priv->offline_handler = NULL; - - g_signal_emit (shell, signals[LINE_STATUS_CHANGED], 0, priv->line_status); -} /** * e_shell_get_line_status: @@ -1871,56 +837,58 @@ e_shell_get_line_status (EShell *shell) /** * e_shell_go_offline: * @shell: - * @action_view: + * @action_window: * * Make the shell go into off-line mode. **/ void e_shell_go_offline (EShell *shell, - EShellView *action_view) + EShellWindow *action_window) { EShellPrivate *priv; g_return_if_fail (shell != NULL); g_return_if_fail (E_IS_SHELL (shell)); - g_return_if_fail (action_view != NULL); - g_return_if_fail (action_view == NULL || E_IS_SHELL_VIEW (action_view)); + g_return_if_fail (action_window != NULL); + g_return_if_fail (action_window == NULL || E_IS_SHELL_WINDOW (action_window)); priv = shell->priv; if (priv->line_status != E_SHELL_LINE_STATUS_ONLINE) return; - g_assert (priv->offline_handler == NULL); - +#if 0 priv->offline_handler = e_shell_offline_handler_new (shell); + /* FIXME TODO */ g_signal_connect (priv->offline_handler, "offline_procedure_started", G_CALLBACK (offline_procedure_started_cb), shell); g_signal_connect (priv->offline_handler, "offline_procedure_finished", G_CALLBACK (offline_procedure_finished_cb), shell); - e_shell_offline_handler_put_components_offline (priv->offline_handler, action_view); + e_shell_offline_handler_put_components_offline (priv->offline_handler, GTK_WINDOW (action_window)); +#endif } /** * e_shell_go_online: * @shell: - * @action_view: + * @action_window: * * Make the shell go into on-line mode. **/ void e_shell_go_online (EShell *shell, - EShellView *action_view) + EShellWindow *action_window) { +#if 0 /* FIXME TODO */ EShellPrivate *priv; GList *component_ids; GList *p; g_return_if_fail (shell != NULL); g_return_if_fail (E_IS_SHELL (shell)); - g_return_if_fail (action_view == NULL || E_IS_SHELL_VIEW (action_view)); + g_return_if_fail (action_window == NULL || E_IS_SHELL_WINDOW (action_window)); priv = shell->priv; @@ -1955,46 +923,14 @@ e_shell_go_online (EShell *shell, priv->line_status = E_SHELL_LINE_STATUS_ONLINE; g_signal_emit (shell, signals[LINE_STATUS_CHANGED], 0, priv->line_status); +#endif } - -void -e_shell_send_receive (EShell *shell) -{ - EShellPrivate *priv; - GList *id_list; - GList *p; - - g_return_if_fail (E_IS_SHELL (shell)); - - priv = shell->priv; - - id_list = e_component_registry_get_id_list (priv->component_registry); - - for (p = id_list; p != NULL; p = p->next) { - EvolutionShellComponentClient *component_client; - CORBA_Environment ev; - const char *id; - - id = (const char *) p->data; - component_client = e_component_registry_get_component_by_id (priv->component_registry, id); - - CORBA_exception_init (&ev); - - GNOME_Evolution_ShellComponent_sendReceive - (evolution_shell_component_client_corba_objref (component_client), TRUE, &ev); - - if (BONOBO_EX (&ev)) - g_warning ("Error invoking Send/Receive on %s -- %s", id, BONOBO_EX_REPOID (&ev)); - - CORBA_exception_free (&ev); - } - - e_free_string_list (id_list); -} void -e_shell_show_settings (EShell *shell, const char *type, EShellView *shell_view) +e_shell_show_settings (EShell *shell, + const char *type, + EShellWindow *shell_window) { EShellPrivate *priv; @@ -2019,26 +955,15 @@ e_shell_show_settings (EShell *shell, const char *type, EShellView *shell_view) gtk_widget_show (priv->settings_dialog); } - -EComponentRegistry * -e_shell_get_component_registry (EShell *shell) -{ - g_return_val_if_fail (shell != NULL, NULL); - g_return_val_if_fail (E_IS_SHELL (shell), NULL); - - return shell->priv->component_registry; -} EShellUserCreatableItemsHandler * e_shell_get_user_creatable_items_handler (EShell *shell) { - g_return_val_if_fail (shell != NULL, NULL); - g_return_val_if_fail (E_IS_SHELL (shell), NULL); - - return shell->priv->user_creatable_items_handler; + g_assert_not_reached (); /* FIXME */ + return NULL; } - + /* FIXME: These are ugly hacks, they really should not be needed. */ void @@ -2051,14 +976,10 @@ e_shell_unregister_all (EShell *shell) /* FIXME: This really really sucks. */ priv = shell->priv; - priv->is_initialized = FALSE; - - g_object_unref (priv->component_registry); - priv->component_registry = NULL; } - + const char * e_shell_construct_result_to_string (EShellConstructResult result) { @@ -2078,21 +999,15 @@ e_shell_construct_result_to_string (EShellConstructResult result) } } - -static void -prepare_for_quit_callback (EvolutionShellComponentClient *client, - EvolutionShellComponentResult result, - void *data) -{ - GNOME_Evolution_ShellComponentListener_Result *result_return; - - result_return = (GNOME_Evolution_ShellComponentListener_Result *) data; - *result_return = result; -} gboolean e_shell_prepare_for_quit (EShell *shell) { + /* FIXME TODO */ + + return TRUE; + +#if 0 EShellPrivate *priv; GList *component_ids; GList *p; @@ -2103,9 +1018,9 @@ e_shell_prepare_for_quit (EShell *shell) priv = shell->priv; priv->preparing_to_quit = TRUE; - /* Make all the views insensitive so we have some modal-like + /* Make all the windows insensitive so we have some modal-like behavior. */ - for (p = priv->views; p != NULL; p = p->next) + for (p = priv->windows; p != NULL; p = p->next) gtk_widget_set_sensitive (GTK_WIDGET (p->data), FALSE); component_ids = e_component_registry_get_id_list (priv->component_registry); @@ -2134,16 +1049,17 @@ e_shell_prepare_for_quit (EShell *shell) retval = TRUE; end: - /* Restore all the views to be sensitive. */ - for (p = priv->views; p != NULL; p = p->next) + /* Restore all the windows to be sensitive. */ + for (p = priv->windows; p != NULL; p = p->next) gtk_widget_set_sensitive (GTK_WIDGET (p->data), TRUE); priv->preparing_to_quit = FALSE; e_free_string_list (component_ids); return retval; +#endif } - + /* URI parsing. */ static gboolean @@ -2252,8 +1168,5 @@ e_shell_parse_uri (EShell *shell, return FALSE; } - -BONOBO_TYPE_FUNC_FULL (EShell, - GNOME_Evolution_Shell, - PARENT_TYPE, - e_shell) + +BONOBO_TYPE_FUNC_FULL (EShell, GNOME_Evolution_Shell, PARENT_TYPE, e_shell) |