From 8b3091dea7eb0e975f40f8cb7ffaa8bb8a36ffdb Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Tue, 19 Nov 2002 21:25:37 +0000 Subject: Disabled for now. * main.c (upgrade_from_1_0_if_needed): Disabled for now. * e-shell-startup-wizard.c: Removed member config_listener from struct SWData. (e_shell_startup_wizard_create): Updated accordingly, just use GConf, checking the /apps/evolution/mail/account-list key. (finish_func): Use GConf. * e-shell-config-default-folders.c: Removed member config_listener in struct EvolutionDefaultFolderConfig. (e_shell_config_default_folders_create_widget): Do not initialize here. GConfified the paths. (config_control_destroy_notify): No unref of the config_listener anymore. (config_control_apply_cb): Use GConf. (setup_folder_selector): Likewise. * e-shell-config-autocompletion.c: Removed member config_listener from EvolutionAutocompletionConfig. (config_control_destroy_notify): Do not unref. (config_control_apply_callback): Use a GConfClient. * e-folder-list.c (e_folder_list_init): Add missing cast. * main.c (show_development_warning): Use GConf. * e-setup.c (e_setup_check_config): Removed arg @listener. GConfified. * e-shell-view.c (e_shell_view_save_defaults): New. (e_shell_view_save_settings): Removed. (e_shell_view_load_settings): Removed. (setup_defaults): New helper function. (e_shell_view_construct): New arg @uri. (e_shell_view_new): New arg @uri. * e-shell.c: Removed member config_listener in struct EShellPrivate. (impl_dispose): Do not unref. (init): Do not initialize. (get_config_start_offline): New helper function. (e_shell_construct): Use this to get the startup mode in case E_SHELL_STARTUP_LINE_MODE_CONFIG. (save_misc_settings): Changed to use GConfClient instead of EConfigListener. (e_shell_create_view_from_settings): Removed. (e_shell_restore_from_settings): Removed. (e_shell_get_config_listener): Removed. (e_shell_disconnect_db): Removed. (parse_default_uri): Use GConf. * main.c (idle_cb): Simplified the logic here. Always assume that the view will be created with the default folder open by just using e_shell_create_view(). svn path=/trunk/; revision=18844 --- shell/e-shell-view.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'shell/e-shell-view.h') diff --git a/shell/e-shell-view.h b/shell/e-shell-view.h index 72c76fbd2c..7e3ec94806 100644 --- a/shell/e-shell-view.h +++ b/shell/e-shell-view.h @@ -81,8 +81,10 @@ struct _EShellViewClass { GtkType e_shell_view_get_type (void); EShellView *e_shell_view_construct (EShellView *shell_view, - EShell *shell); -EShellView *e_shell_view_new (EShell *shell); + EShell *shell, + const char *uri); +EShellView *e_shell_view_new (EShell *shell, + const char *uri); const GNOME_Evolution_ShellView e_shell_view_get_corba_interface (EShellView *view); @@ -110,10 +112,7 @@ const char *e_shell_view_get_current_folder_type (EShellView *shell_vi const char *e_shell_view_get_current_component_id (EShellView *shell_view); const char *e_shell_view_get_current_path (EShellView *shell_view); -gboolean e_shell_view_save_settings (EShellView *shell_view, - int view_num); -gboolean e_shell_view_load_settings (EShellView *shell_view, - int view_num); +void e_shell_view_save_defaults (EShellView *shell_view); int e_shell_view_get_current_shortcuts_group_num (EShellView *shell_view); void e_shell_view_set_current_shortcuts_group_num (EShellView *shell_view, -- cgit v1.2.3