Fix some GSettings runtime issues.

3 files changed, 18 insertions, 12 deletions

diff --git a/modules/mail/e-mail-shell-settings.c b/modules/mail/e-mail-shell-settings.c
index 7fe3fc0342..cc94dfb63c 100644
--- a/modules/mail/e-mail-shell-settings.c
+++ b/modules/mail/e-mail-shell-settings.c
@@ -326,7 +326,7 @@ e_mail_shell_settings_init (EShellBackend *shell_backend)
 	e_shell_settings_install_property_for_key (
 		"composer-sign-reply-if-signed",
 		MAIL_SCHEMA,
-		"/apps/evolution/mail/composer/sign_reply_if_signed");
+		"composer-sign-reply-if-signed");
 
 	e_shell_settings_install_property_for_key (
 		"composer-prompt-only-bcc",
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index da715f3a7d..27f7314f9c 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -103,7 +103,7 @@ em_mailer_prefs_finalize (GObject *object)
 	EMMailerPrefs *prefs = (EMMailerPrefs *) object;
 
 	g_object_unref (prefs->builder);
-
+	g_object_unref (prefs->gconf);
 	g_object_unref (prefs->settings);
 
 	/* Chain up to parent's finalize() method. */
@@ -123,6 +123,9 @@ static void
 em_mailer_prefs_init (EMMailerPrefs *preferences)
 {
 	preferences->settings = g_settings_new ("org.gnome.evolution.mail");
+
+	/* XXX Still need this for a little while longer. */
+	preferences->gconf = gconf_client_get_default ();
 }
 
 enum {
@@ -1084,20 +1087,23 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
 	prefs->junk_header_remove = (GtkButton *)e_builder_get_widget (prefs->builder, "junk_header_remove");
 	prefs->junk_book_lookup = (GtkToggleButton *)e_builder_get_widget (prefs->builder, "lookup_book");
 	prefs->junk_lookup_local_only = (GtkToggleButton *)e_builder_get_widget (prefs->builder, "junk_lookup_local_only");
-	toggle_button_init (prefs, prefs->junk_book_lookup, FALSE,
-			    "/apps/evolution/mail/junk/lookup_addressbook",
-			    G_CALLBACK (junk_book_lookup_button_toggled));
+	toggle_button_init (
+		prefs, prefs->junk_book_lookup,
+		FALSE, "junk-lookup-addressbook",
+		G_CALLBACK (junk_book_lookup_button_toggled));
 
-	toggle_button_init (prefs, prefs->junk_lookup_local_only, FALSE,
-			    "/apps/evolution/mail/junk/lookup_addressbook_local_only",
-			    G_CALLBACK (toggle_button_toggled));
+	toggle_button_init (
+		prefs, prefs->junk_lookup_local_only,
+		FALSE, "junk-lookup-addressbook-local-only",
+		G_CALLBACK (toggle_button_toggled));
 
 	junk_book_lookup_button_toggled (prefs->junk_book_lookup, prefs);
 
 	prefs->junk_header_list_store = init_junk_tree ((GtkWidget *) prefs->junk_header_tree, prefs);
-	toggle_button_init (prefs, prefs->junk_header_check, FALSE,
-			    "/apps/evolution/mail/junk/check_custom_header",
-			    G_CALLBACK (custom_junk_button_toggled));
+	toggle_button_init (
+		prefs, prefs->junk_header_check,
+		FALSE, "junk-check-custom-header",
+		G_CALLBACK (custom_junk_button_toggled));
 
 	custom_junk_button_toggled (prefs->junk_header_check, prefs);
 	jh_tree_refill (prefs);
diff --git a/modules/spamassassin/evolution-spamassassin.c b/modules/spamassassin/evolution-spamassassin.c
index a628753aba..7381e4a2ec 100644
--- a/modules/spamassassin/evolution-spamassassin.c
+++ b/modules/spamassassin/evolution-spamassassin.c
@@ -1158,7 +1158,7 @@ e_spam_assassin_init (ESpamAssassin *extension)
 	g_settings_bind (settings, "junk-sa-local-only", G_OBJECT (extension), "local-only", G_SETTINGS_BIND_DEFAULT);
 	g_settings_bind (settings, "junk-sa-spamc-binary", G_OBJECT (extension), "spamc-binary", G_SETTINGS_BIND_DEFAULT);
 	g_settings_bind (settings, "junk-sa-spamd-binary", G_OBJECT (extension), "spamd-binary", G_SETTINGS_BIND_DEFAULT);
-	g_settings_bind (settings, "junk-sa-socjet-path", G_OBJECT (extension), "socket-path", G_SETTINGS_BIND_DEFAULT);
+	g_settings_bind (settings, "junk-sa-socket-path", G_OBJECT (extension), "socket-path", G_SETTINGS_BIND_DEFAULT);
 	g_settings_bind (settings, "junk-sa-use-daemon", G_OBJECT (extension), "use-daemon", G_SETTINGS_BIND_DEFAULT);
 
 	g_object_unref (settings);