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

1 files changed, 241 insertions, 0 deletions

diff --git a/shell/apps_evolution_shell.schemas b/shell/apps_evolution_shell.schemas
new file mode 100644
index 0000000000..62adc3dab2
--- /dev/null
+++ b/shell/apps_evolution_shell.schemas
@@ -0,0 +1,241 @@
+<gconfschemafile>
+  <schemalist>
+
+    <!-- Default mail folder -->
+
+    <schema>
+      <key>/schemas/apps/evolution/shell/default_folders/mail_path</key>
+      <applyto>/apps/evolution/shell/default_folders/mail_path</applyto>
+      <owner>evolution</owner>
+      <type>string</type>
+      <default></default>
+      <locale name="C">
+        <short>Path to the default mail folder</short>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/evolution/shell/default_folders/mail_uri</key>
+      <applyto>/apps/evolution/shell/default_folders/mail_uri</applyto>
+      <owner>evolution</owner>
+      <type>string</type>
+      <default></default>
+      <locale name="C">
+        <short>Physical URI to the default mail folder</short>
+      </locale>
+    </schema>
+
+    <!-- Default contacts folder -->
+
+    <schema>
+      <key>/schemas/apps/evolution/shell/default_folders/contacts_path</key>
+      <applyto>/apps/evolution/shell/default_folders/contacts_path</applyto>
+      <owner>evolution</owner>
+      <type>string</type>
+      <default></default>
+      <locale name="C">
+        <short>Path to the default contacts folder</short>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/evolution/shell/default_folders/contacts_uri</key>
+      <applyto>/apps/evolution/shell/default_folders/contacts_uri</applyto>
+      <owner>evolution</owner>
+      <type>string</type>
+      <default></default>
+      <locale name="C">
+        <short>Physical URI to the default contacts folder</short>
+      </locale>
+    </schema>
+
+    <!-- Default calendar folder -->
+
+    <schema>
+      <key>/schemas/apps/evolution/shell/default_folders/calendar_path</key>
+      <applyto>/apps/evolution/shell/default_folders/calendar_path</applyto>
+      <owner>evolution</owner>
+      <type>string</type>
+      <default></default>
+      <locale name="C">
+        <short>Path to the default calendar folder</short>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/evolution/shell/default_folders/calendar_uri</key>
+      <applyto>/apps/evolution/shell/default_folders/calendar_uri</applyto>
+      <owner>evolution</owner>
+      <type>string</type>
+      <default></default>
+      <locale name="C">
+        <short>Physical URI to the default calendar folder</short>
+      </locale>
+    </schema>
+
+    <!-- Default tasks folder -->
+
+    <schema>
+      <key>/schemas/apps/evolution/shell/default_folders/tasks_path</key>
+      <applyto>/apps/evolution/shell/default_folders/tasks_path</applyto>
+      <owner>evolution</owner>
+      <type>string</type>
+      <default></default>
+      <locale name="C">
+        <short>Path to the default tasks folder</short>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/evolution/shell/default_folders/tasks_uri</key>
+      <applyto>/apps/evolution/shell/default_folders/tasks_uri</applyto>
+      <owner>evolution</owner>
+      <type>string</type>
+      <default></default>
+      <locale name="C">
+        <short>Physical URI to the default tasks folder</short>
+      </locale>
+    </schema>
+
+    <!-- Development warning dialog -->
+
+    <schema>
+      <key>/schemas/apps/evolution/shell/skip_warning_dialog</key>
+      <applyto>/apps/evolution/shell/skip_warning_dialog</applyto>
+      <owner>evolution</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+        <short>Whether to skip the development warning dialog</short>
+	<long>
+	  If set to true, the warning dialog in development versions
+	  of Evolution is not displayed.
+	</long>
+      </locale>
+    </schema>
+
+    <!-- Offline Mode -->
+
+    <schema>
+      <key>/schemas/apps/evolution/shell/start_offline</key>
+      <applyto>/apps/evolution/shell/start_offline</applyto>
+      <owner>evolution</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+        <short>Whether Evolution should start up in offline mode</short>
+	<long>
+	  If set to true, Evolution will start up in offline mode
+	  instead of online mode.
+	</long>
+      </locale>
+    </schema>
+
+    <!-- View defaults -->
+
+    <schema>
+      <key>/schemas/apps/evolution/shell/view_defaults/width</key>
+      <applyto>/apps/evolution/shell/view_defaults/width</applyto>
+      <owner>evolution</owner>
+      <type>int</type>
+      <default>640</default>
+      <locale name="C">
+        <short>Default window width</short>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/evolution/shell/view_defaults/height</key>
+      <applyto>/apps/evolution/shell/view_defaults/height</applyto>
+      <owner>evolution</owner>
+      <type>int</type>
+      <locale name="C">
+        <default>480</default>
+        <short>Default window height</short>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/evolution/shell/view_defaults/selected_shortcut_group</key>
+      <applyto>/apps/evolution/shell/view_defaults/selected_shortcut_group</applyto>
+      <owner>evolution</owner>
+      <type>int</type>
+      <default>0</default>
+      <locale name="C">
+        <short>Default shortcut group</short>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/evolution/shell/view_defaults/show_folder_bar</key>
+      <applyto>/apps/evolution/shell/view_defaults/show_folder_bar</applyto>
+      <owner>evolution</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+        <short>Whether to show the folder bar</short>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/evolution/shell/view_defaults/show_shortcut_bar</key>
+      <applyto>/apps/evolution/shell/view_defaults/show_shortcut_bar</applyto>
+      <owner>evolution</owner>
+      <type>bool</type>
+      <default>true</default>
+      <locale name="C">
+        <short>Whether to show the shortcut bar</short>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/evolution/shell/view_defaults/folder_path</key>
+      <applyto>/apps/evolution/shell/view_defaults/folder_path</applyto>
+      <owner>evolution</owner>
+      <type>string</type>
+      <locale name="C">
+        <default>/Summary</default>
+        <short>Path to the folder to be displayed by default</short>
+      </locale>
+    </schema>
+
+    <!-- Folder bar -->
+
+    <schema>
+      <key>/schemas/apps/evolution/shell/view_defaults/folder_bar/width</key>
+      <applyto>/apps/evolution/shell/view_defaults/folder_bar/width</applyto>
+      <owner>evolution</owner>
+      <type>int</type>
+      <default>100</default>
+      <locale name="C">
+        <short>Default width of the folder bar pane</short>
+      </locale>
+    </schema>
+
+    <!-- Shortcut bar -->
+
+    <schema>
+      <key>/schemas/apps/evolution/shell/view_defaults/shortcut_bar/width</key>
+      <applyto>/apps/evolution/shell/view_defaults/shortcut_bar/width</applyto>
+      <owner>evolution</owner>
+      <type>int</type>
+      <default>100</default>
+      <locale name="C">
+        <short>Default width of the shortcut bar pane</short>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/evolution/shell/view_defaults/shortcut_bar/icon_types</key>
+      <key>/apps/evolution/shell/view_defaults/shortcut_bar/icon_types</key>
+      <owner>evolution</owner>
+      <type>list</type>
+      <list_type>int</list_type>
+      <default>[]</default>
+      <locale name="C">
+         <short>Icon sizes for the shortcut bar groups</short>
+      </locale>
+    </schema>
+
+  </schemalist>  
+</gconfschemafile>