aboutsummaryrefslogtreecommitdiffstats
path: root/shell/e-shell.h
diff options
context:
space:
mode:
Diffstat (limited to 'shell/e-shell.h')
-rw-r--r--shell/e-shell.h72
1 files changed, 23 insertions, 49 deletions
diff --git a/shell/e-shell.h b/shell/e-shell.h
index 4f1b1aaf7b..afd1f33e1b 100644
--- a/shell/e-shell.h
+++ b/shell/e-shell.h
@@ -37,20 +37,18 @@ typedef struct _EShellClass EShellClass;
#include "Evolution.h"
-#include "e-component-registry.h"
-#include "e-shell-view.h"
-#include "e-uri-schema-registry.h"
#include "e-shell-user-creatable-items-handler.h"
-#include "e-local-storage.h"
+#include "e-uri-schema-registry.h"
+#include "e-shell-window.h"
+
-
#define E_TYPE_SHELL (e_shell_get_type ())
#define E_SHELL(obj) (GTK_CHECK_CAST ((obj), E_TYPE_SHELL, EShell))
#define E_SHELL_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SHELL, EShellClass))
#define E_IS_SHELL(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_SHELL))
#define E_IS_SHELL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_SHELL))
-
+
enum _EShellLineStatus {
E_SHELL_LINE_STATUS_ONLINE,
E_SHELL_LINE_STATUS_GOING_OFFLINE,
@@ -76,13 +74,12 @@ struct _EShellClass {
POA_GNOME_Evolution_Shell__epv epv;
- void (* no_views_left) (EShell *shell);
+ void (* no_windows_left) (EShell *shell);
void (* line_status_changed) (EShell *shell, EShellLineStatus status);
- void (* new_view_created) (EShell *shell, EShellView *view);
-
+ void (* new_window_created) (EShell *shell, EShellWindow *window);
};
-
+
/* ID for registering the shell in the OAF name service. */
#define E_SHELL_OAFIID "OAFIID:GNOME_Evolution_Shell"
@@ -95,69 +92,46 @@ enum _EShellConstructResult {
};
typedef enum _EShellConstructResult EShellConstructResult;
-
-#include "e-shortcuts.h"
-
GtkType e_shell_get_type (void);
EShellConstructResult e_shell_construct (EShell *shell,
const char *iid,
- const char *local_directory,
- gboolean show_splash,
EShellStartupLineMode startup_line_mode);
-EShell *e_shell_new (const char *local_directory,
- gboolean show_splash,
- EShellStartupLineMode startup_line_mode,
+EShell *e_shell_new (EShellStartupLineMode startup_line_mode,
EShellConstructResult *construct_result_return);
-EShellView *e_shell_create_view (EShell *shell,
- const char *uri,
- EShellView *template_view);
-EShellView *e_shell_create_view_from_uri_and_settings (EShell *shell,
- const char *uri,
- int view_num);
-gboolean e_shell_request_close_view (EShell *shell,
- EShellView *view);
-
-
-const char *e_shell_get_local_directory (EShell *shell);
-EShortcuts *e_shell_get_shortcuts (EShell *shell);
-EStorageSet *e_shell_get_storage_set (EShell *shell);
-ELocalStorage *e_shell_get_local_storage (EShell *shell);
-EFolderTypeRegistry *e_shell_get_folder_type_registry (EShell *shell);
+EShellWindow *e_shell_create_window (EShell *shell,
+ EShellWindow *template_window);
+gboolean e_shell_request_close_window (EShell *shell,
+ EShellWindow *window);
+
+
EUriSchemaRegistry *e_shell_get_uri_schema_registry (EShell *shell);
gboolean e_shell_save_settings (EShell *shell);
-void e_shell_destroy_all_views (EShell *shell);
+void e_shell_close_all_windows (EShell *shell);
void e_shell_unregister_all (EShell *shell);
-void e_shell_component_maybe_crashed (EShell *shell,
- const char *uri,
- const char *type_name,
- EShellView *shell_view);
-
-EShellLineStatus e_shell_get_line_status (EShell *shell);
-void e_shell_go_offline (EShell *shell,
- EShellView *action_view);
-void e_shell_go_online (EShell *shell,
- EShellView *action_view);
+EShellLineStatus e_shell_get_line_status (EShell *shell);
+void e_shell_go_offline (EShell *shell,
+ EShellWindow *action_window);
+void e_shell_go_online (EShell *shell,
+ EShellWindow *action_window);
-void e_shell_send_receive (EShell *shell);
void e_shell_show_settings (EShell *shell,
const char *type,
- EShellView *shell_view);
+ EShellWindow *shell_window);
-EComponentRegistry *e_shell_get_component_registry (EShell *shell);
EShellUserCreatableItemsHandler *e_shell_get_user_creatable_items_handler (EShell *shell);
gboolean e_shell_prepare_for_quit (EShell *shell);
-
+
const char *e_shell_construct_result_to_string (EShellConstructResult result);
-
+
gboolean e_shell_parse_uri (EShell *shell,
const char *uri,
char **path_return,