Remove the last remaining usage of GConf

7 files changed, 9 insertions, 459 deletions

diff --git a/shell/Makefile.am b/shell/Makefile.am
index 9259d63db9..9edfe88cd6 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -62,7 +62,6 @@ libeshell_la_CPPFLAGS =						\
 	$(GNOME_PLATFORM_CFLAGS)				\
 	$(EGG_SMCLIENT_CFLAGS)					\
 	$(GTKHTML_CFLAGS)					\
-	$(DBUS_GLIB_CFLAGS)					\
 	$(CLUTTER_CFLAGS)
 
 libeshell_la_SOURCES =				\
@@ -101,7 +100,6 @@ libeshell_la_LIBADD =					\
 	$(EVOLUTION_DATA_SERVER_LIBS)			\
 	$(GNOME_PLATFORM_LIBS)				\
 	$(EGG_SMCLIENT_LIBS)				\
-	$(DBUS_GLIB_LIBS)				\
 	$(CLUTTER_LIBS)
 
 # Evolution executable
@@ -185,43 +183,10 @@ error_DATA = shell.error
 errordir = $(privdatadir)/errors
 @EVO_PLUGIN_RULE@
 
-# GConf schemas
-
-schemadir   = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = apps_evolution_shell.schemas.in
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
-
-@INTLTOOL_SCHEMAS_RULE@
-
-if GCONF_SCHEMAS_INSTALL
-
-if OS_WIN32
-install-data-local:
-	if test -z "$(DESTDIR)" ; then							\
-		for p in $(schema_DATA) ; do						\
-			(echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE);	\
-			 echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat;	\
-			cmd /c _temp.bat; 						\
-			rm _temp.bat;							\
-		done									\
-	fi
-else
-install-data-local:
-	if test -z "$(DESTDIR)" ; then							\
-		for p in $(schema_DATA) ; do						\
-			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) 		\
-				$(GCONFTOOL) --makefile-install-rule $$p;		\
-		done									\
-	fi
-endif
-
-endif
-
 # Extra dist stuff
 
 EXTRA_DIST = 					\
 	shell.error.xml				\
-	$(schema_in_files)			\
 	evolution-nognome.in			\
 	evolution-icon.rc			\
 	evolution.ico				\
@@ -246,8 +211,6 @@ endif
 BUILT_SOURCES = $(error_DATA) $(ENUM_GENERATED)
 CLEANFILES = $(BUILT_SOURCES)
 
-DISTCLEANFILES = $(schema_DATA)
-
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
 
diff --git a/shell/apps_evolution_shell.schemas.in b/shell/apps_evolution_shell.schemas.in
deleted file mode 100644
index 20e7af463d..0000000000
--- a/shell/apps_evolution_shell.schemas.in
+++ /dev/null
@@ -1,408 +0,0 @@
-<gconfschemafile>
-  <schemalist>
-
-    <!-- Evolution config version -->
-
-    <schema>
-      <key>/schemas/apps/evolution/version</key>
-      <applyto>/apps/evolution/version</applyto>
-      <owner>evolution</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-        <short>Configuration version</short>
-        <long>The configuration version of Evolution, with major/minor/configuration level (for example "2.6.0").</long>
-      </locale>
-    </schema>
-
-    <!-- last upgraded-from version, if still present -->
-
-    <schema>
-      <key>/schemas/apps/evolution/last_version</key>
-      <applyto>/apps/evolution/last_version</applyto>
-      <owner>evolution</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-        <short>Last upgraded configuration version</short>
-        <long>The last upgraded configuration version of Evolution, with major/minor/configuration level (for example "2.6.0").</long>
-      </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>Skip development warning dialog</short>
-	<long>Whether the warning dialog in development versions of Evolution is skipped.</long>
-      </locale>
-    </schema>
-
-    <!-- Initial attachment view (icon or list) -->
-
-    <schema>
-      <key>/schemas/apps/evolution/shell/attachment_view</key>
-      <applyto>/apps/evolution/shell/attachment_view</applyto>
-      <owner>evolution</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Initial attachment view</short>
-        <long>Initial view for attachment bar widgets.
-        "0" is Icon View, "1" is List View.</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>Start in offline mode</short>
-	<long> Whether Evolution will start up in offline mode instead of online mode.
-	</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/shell/offline/folder_paths</key>
-      <applyto>/apps/evolution/shell/offline/folder_paths</applyto>
-      <owner>evolution</owner>
-      <type>list</type>
-      <list_type>string</list_type>
-      <default>[]</default>
-      <locale name="C">
-        <short>List of paths for the folders to be synchronized to disk for offline usage</short>
-      </locale>
-    </schema>
-
-    <!-- View defaults -->
-
-    <schema>
-      <key>/schemas/apps/evolution/shell/view_defaults/window_y</key>
-      <applyto>/apps/evolution/shell/view_defaults/window_y</applyto>
-      <owner>evolution</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Default window Y coordinate</short>
-        <long>The default Y coordinate for the main window.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/shell/view_defaults/window_x</key>
-      <applyto>/apps/evolution/shell/view_defaults/window_x</applyto>
-      <owner>evolution</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Default window X coordinate</short>
-        <long>The default X coordinate for the main window.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/shell/view_defaults/window_width</key>
-      <applyto>/apps/evolution/shell/view_defaults/window_width</applyto>
-      <owner>evolution</owner>
-      <type>int</type>
-      <default>640</default>
-      <locale name="C">
-        <short>Default window width</short>
-        <long>The default width for the main window, in pixels.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/shell/view_defaults/window_height</key>
-      <applyto>/apps/evolution/shell/view_defaults/window_height</applyto>
-      <owner>evolution</owner>
-      <type>int</type>
-      <default>480</default>
-      <locale name="C">
-        <short>Default window height</short>
-        <long>The default height for the main window, in pixels.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/shell/view_defaults/window_maximized</key>
-      <applyto>/apps/evolution/shell/view_defaults/window_maximized</applyto>
-      <owner>evolution</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Default window state</short>
-        <long>Whether or not the window should be maximized.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/shell/view_defaults/buttons_visible</key>
-      <applyto>/apps/evolution/shell/view_defaults/buttons_visible</applyto>
-      <owner>evolution</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Window buttons are visible</short>
-        <long>Whether the window buttons should be visible.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/shell/view_defaults/buttons_style</key>
-      <applyto>/apps/evolution/shell/view_defaults/buttons_style</applyto>
-      <owner>evolution</owner>
-      <type>string</type>
-      <default>toolbar</default>
-      <locale name="C">
-        <short>Window button style</short>
-        <long>The style of the window buttons.  Can be "text", "icons", "both", "toolbar".  If "toolbar" is set, the style of the buttons is determined by the GNOME toolbar setting.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/shell/view_defaults/toolbar_visible</key>
-      <applyto>/apps/evolution/shell/view_defaults/toolbar_visible</applyto>
-      <owner>evolution</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Toolbar is visible</short>
-        <long>Whether the toolbar should be visible.</long>
-      </locale>
-    </schema>
-
-     <schema>
-      <key>/schemas/apps/evolution/shell/view_defaults/sidebar_visible</key>
-      <applyto>/apps/evolution/shell/view_defaults/sidebar_visible</applyto>
-      <owner>evolution</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Sidebar is visible</short>
-        <long>Whether the sidebar should be visible.</long>
-      </locale>
-    </schema>
-    
-     <schema>
-      <key>/schemas/apps/evolution/shell/view_defaults/statusbar_visible</key>
-      <applyto>/apps/evolution/shell/view_defaults/statusbar_visible</applyto>
-      <owner>evolution</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Statusbar is visible</short>
-        <long>Whether the status bar should be visible.</long>
-      </locale>
-    </schema>
-    
-    <schema>
-      <key>/schemas/apps/evolution/shell/view_defaults/component_id</key>
-      <applyto>/apps/evolution/shell/view_defaults/component_id</applyto>
-      <owner>evolution</owner>
-      <type>string</type>
-      <default>mail</default>
-      <locale name="C">
-        <short>ID or alias of the component to be shown by default at start-up.</short>
-        <long>ID or alias of the component to be shown by default at start-up.</long>
-      </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>200</default>
-      <locale name="C">
-        <short>Default sidebar width</short>
-        <long>The default width for the sidebar, in pixels.</long>
-      </locale>
-    </schema>
-
-    <!-- Network config defaults -->
-
-    <schema>
-      <key>/schemas/apps/evolution/shell/network_config/proxy_type</key>
-      <applyto>/apps/evolution/shell/network_config/proxy_type</applyto>
-      <owner>evolution</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Proxy configuration mode</short>
-        <long>Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 representing "use system settings", "no proxy", "use manual proxy configuration" and "use proxy configuration provided in the autoconfig url" respectively.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/shell/network_config/http_port</key>
-      <applyto>/apps/evolution/shell/network_config/http_port</applyto>
-      <owner>evolution</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>HTTP proxy port</short>
-        <long>The port on the machine defined by "/apps/evolution/shell/network_config/http_host" that you proxy through.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/shell/network_config/http_host</key>
-      <applyto>/apps/evolution/shell/network_config/http_host</applyto>
-      <owner>evolution</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-        <short>HTTP proxy host name</short>
-        <long>The machine name to proxy HTTP through.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/shell/network_config/secure_port</key>
-      <applyto>/apps/evolution/shell/network_config/secure_port</applyto>
-      <owner>evolution</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Secure HTTP proxy port</short>
-        <long>The port on the machine defined by "/apps/evolution/shell/network_config/secure_host" that you proxy through.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/shell/network_config/secure_host</key>
-      <applyto>/apps/evolution/shell/network_config/secure_host</applyto>
-      <owner>evolution</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-        <short>Secure HTTP proxy host name</short>
-        <long>The machine name to proxy secure HTTP through.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/shell/network_config/socks_port</key>
-      <applyto>/apps/evolution/shell/network_config/socks_port</applyto>
-      <owner>evolution</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>SOCKS proxy port</short>
-        <long>The port on the machine defined by "/apps/evolution/shell/network_config/socks_host" that you proxy through.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/shell/network_config/socks_host</key>
-      <applyto>/apps/evolution/shell/network_config/socks_host</applyto>
-      <owner>evolution</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-        <short>SOCKS proxy host name</short>
-        <long>The machine name to proxy socks through.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/shell/network_config/use_http_proxy</key>
-      <applyto>/apps/evolution/shell/network_config/use_http_proxy</applyto>
-      <owner>evolution</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Use HTTP proxy</short>
-        <long>Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/shell/network_config/use_authentication</key>
-      <applyto>/apps/evolution/shell/network_config/use_authentication</applyto>
-      <owner>evolution</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Authenticate proxy server connections</short>
-        <long>If true, then connections to the proxy server require authentication. The username is retrieved from the "/apps/evolution/shell/network_config/authentication_user" GConf key, and the password is retrieved from either gnome-keyring or the ~/.gnome2_private/Evolution password file.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/shell/network_config/authentication_user</key>
-      <applyto>/apps/evolution/shell/network_config/authentication_user</applyto>
-      <owner>evolution</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-        <short>HTTP proxy username</short>
-        <long>Username to pass as authentication when doing HTTP proxying.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/shell/network_config/authentication_password</key>
-      <applyto>/apps/evolution/shell/network_config/authentication_password</applyto>
-      <owner>evolution</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-        <short>HTTP proxy password</short>
-        <long>Password to pass as authentication when doing HTTP proxying.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/shell/network_config/ignore_hosts</key>
-      <applyto>/apps/evolution/shell/network_config/ignore_hosts</applyto>
-      <owner>evolution</owner>
-      <type>list</type>
-      <list_type>string</list_type>
-      <default>[]</default>
-      <locale name="C">
-        <short>Non-proxy hosts</short>
-        <long>This key contains a list of hosts which are connected to directly, rather than via the proxy (if it is active). The values can be hostnames, domains (using an initial wildcard like *.foo.com), IP host addresses (both IPv4 and IPv6) and network addresses with a netmask (something like 192.168.0.0/24).</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/shell/network_config/autoconfig_url</key>
-      <applyto>/apps/evolution/shell/network_config/autoconfig_url</applyto>
-      <owner>evolution</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-        <short>Automatic proxy configuration URL</short>
-        <long>URL that provides proxy configuration values.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/shell/express_mode</key>
-      <applyto>/apps/evolution/shell/express_mode</applyto>
-      <owner>evolution</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Enable express mode</short>
-        <long>Flag that enables a much simplified user interface.</long>
-      </locale>
-    </schema>
-
-  </schemalist>  
-</gconfschemafile>
diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c
index d746aeff54..2fe9cd69ee 100644
--- a/shell/e-shell-migrate.c
+++ b/shell/e-shell-migrate.c
@@ -744,7 +744,7 @@ shell_migrate_get_version (EShell *shell,
 	string = g_settings_get_string (settings, "version");
 
 	if (string != NULL) {
-		/* Since 1.4.0 we've kept the version key in GConf. */
+		/* Since 1.4.0 we've kept the version key in GSettings. */
 		sscanf (string, "%d.%d.%d", major, minor, micro);
 		g_free (string);
 	}
diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c
index 293a39b645..bfc1ca9557 100644
--- a/shell/e-shell-window-actions.c
+++ b/shell/e-shell-window-actions.c
@@ -2359,7 +2359,7 @@ e_shell_window_update_search_menu (EShellWindow *shell_window)
 	shell_view = e_shell_window_get_shell_view (shell_window, view_name);
 
 	/* Check for a NULL shell view before proceeding.  This can
-	 * happen if the initial view name from GConf is unrecognized.
+	 * happen if the initial view name from GSettings is unrecognized.
 	 * Without this we would crash at E_SHELL_VIEW_GET_CLASS(). */
 	g_return_if_fail (shell_view != NULL);
 
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index ee87446209..abc3d085fd 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -1030,9 +1030,9 @@ e_shell_window_init (EShellWindow *shell_window)
  * #EShellWindow into "safe mode" if detects the previous Evolution
  * session crashed.
  *
- * The initial view for the window is determined by GConf key
- * <filename>/apps/evolution/shell/view_defaults/component_id</filename>.
- * Or, if the GConf key is not set or can't be read, the first view
+ * The initial view for the window is determined by GSettings key
+ * <filename>/org/gnome/evolution/shell/default-component-id</filename>.
+ * Or, if the GSettings key is not set or can't be read, the first view
  * in the switcher is used.
  *
  * Returns: a new #EShellWindow
@@ -1326,8 +1326,8 @@ e_shell_window_get_active_view (EShellWindow *shell_window)
  * the entire content of @shell_window to change.  This is typically
  * called as a result of the user clicking one of the switcher buttons.
  *
- * The name of the newly activated shell view is also written to GConf key
- * <filename>/apps/evolution/shell/view_defaults/component_id</filename>.
+ * The name of the newly activated shell view is also written to GSettings key
+ * <filename>/org/gnome/evolution/shell/default-component-id</filename>.
  * This makes the active shell view persistent across Evolution sessions.
  * It also causes new shell windows created within the current Evolution
  * session to open to the most recently selected shell view.
diff --git a/shell/e-shell.c b/shell/e-shell.c
index ae8abb2a50..7ab685ab27 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -1239,7 +1239,7 @@ e_shell_init (EShell *shell)
 		G_CALLBACK (shell_notify_online_cb), NULL);
 
 	/* XXX Do this after creating the EShellSettings instance,
-	 *     otherwise the GConf bindings will not get set up. */
+	 *     otherwise the GSettings bindings will not get set up. */
 
 	e_shell_settings_install_property_for_key (
 		"start-offline",
@@ -1474,7 +1474,7 @@ e_shell_create_shell_window (EShell *shell,
 
 	view_name = e_shell_get_canonical_name (shell, view_name);
 
-	/* EShellWindow initializes its active view from a GConf key,
+	/* EShellWindow initializes its active view from a GSetting key,
 	 * so set the key ahead of time to control the intial view. */
 	if (view_name != NULL) {
 		GSettings *settings;
diff --git a/shell/main.c b/shell/main.c
index 521f817623..d6de1499e4 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -30,8 +30,6 @@
 #include <glib-unix.h>
 #endif
 
-#include <dbus/dbus-glib.h>
-
 #if HAVE_CLUTTER
 #include <clutter-gtk/clutter-gtk.h>
 #include <mx/mx.h>
@@ -497,9 +495,6 @@ main (gint argc,
 
 	g_type_init ();
 
-	/* this is to initialize threading for dbus-glib used by GConf */
-	dbus_g_thread_init ();
-
 	/* do not require Gtk+ for --force-shutdown */
 	if (argc == 2 && argv[1] && g_str_equal (argv[1], "--force-shutdown")) {
 		shell_force_shutdown ();