aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-11-28 10:23:55 +0800
committerMatthew Barnes <mbarnes@redhat.com>2011-11-28 10:28:53 +0800
commitdff45d6cd8a6d631bf4126e8a484c6b6c62b9a9a (patch)
tree2f2b2e0371575ef69a03afab1173689616968d94 /modules
parenta7699bb29f5ca0c09d68cbad65cd65bedf1307c5 (diff)
downloadgsoc2013-evolution-dff45d6cd8a6d631bf4126e8a484c6b6c62b9a9a.tar
gsoc2013-evolution-dff45d6cd8a6d631bf4126e8a484c6b6c62b9a9a.tar.gz
gsoc2013-evolution-dff45d6cd8a6d631bf4126e8a484c6b6c62b9a9a.tar.bz2
gsoc2013-evolution-dff45d6cd8a6d631bf4126e8a484c6b6c62b9a9a.tar.lz
gsoc2013-evolution-dff45d6cd8a6d631bf4126e8a484c6b6c62b9a9a.tar.xz
gsoc2013-evolution-dff45d6cd8a6d631bf4126e8a484c6b6c62b9a9a.tar.zst
gsoc2013-evolution-dff45d6cd8a6d631bf4126e8a484c6b6c62b9a9a.zip
Remove some unnecessary GConf crud.
Diffstat (limited to 'modules')
-rw-r--r--modules/mail/e-mail-config-hook.c1
-rw-r--r--modules/mail/em-composer-prefs.c4
-rw-r--r--modules/mail/em-mailer-prefs.c4
-rw-r--r--modules/mail/em-mailer-prefs.h2
-rw-r--r--modules/mail/em-network-prefs.c4
5 files changed, 2 insertions, 13 deletions
diff --git a/modules/mail/e-mail-config-hook.c b/modules/mail/e-mail-config-hook.c
index cc9734647b..14acc60aca 100644
--- a/modules/mail/e-mail-config-hook.c
+++ b/modules/mail/e-mail-config-hook.c
@@ -34,7 +34,6 @@ static const EConfigHookTargetMask no_masks[] = {
static const EConfigHookTargetMap targets[] = {
{ "folder", EM_CONFIG_TARGET_FOLDER, no_masks },
- { "prefs", EM_CONFIG_TARGET_PREFS, no_masks },
{ "settings", EM_CONFIG_TARGET_SETTINGS, no_masks },
{ NULL }
};
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index f46825e4c4..a0091e353a 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -328,7 +328,6 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
GtkCellRenderer *renderer;
GConfClient *client;
EMConfig *ec;
- EMConfigTargetPrefs *target;
GSList *l;
gint i;
@@ -346,7 +345,6 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
* @Id: org.gnome.evolution.mail.composerPrefs
* @Type: E_CONFIG_BOOK
* @Class: org.gnome.evolution.mail.config:1.0
- * @Target: EMConfigTargetPrefs
*
* The mail composer preferences settings page.
*/
@@ -589,8 +587,6 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
/* get our toplevel widget */
client = gconf_client_get_default ();
- target = em_config_target_new_prefs (ec, client);
- e_config_set_target ((EConfig *) ec, (EConfigTarget *) target);
toplevel = e_config_create_widget ((EConfig *) ec);
gtk_container_add (GTK_CONTAINER (prefs), toplevel);
g_object_unref (client);
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index 27f7314f9c..a629d393a8 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -712,7 +712,6 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
gboolean locked;
gint val, i;
EMConfig *ec;
- EMConfigTargetPrefs *target;
GSList *l;
shell_settings = e_shell_get_shell_settings (shell);
@@ -729,7 +728,6 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
* @Id: org.gnome.evolution.mail.prefs
* @Type: E_CONFIG_BOOK
* @Class: org.gnome.evolution.mail.config:1.0
- * @Target: EMConfigTargetPrefs
*
* The main mail preferences page.
*/
@@ -1115,8 +1113,6 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
G_CALLBACK (jh_remove_cb), prefs);
/* get our toplevel widget */
- target = em_config_target_new_prefs (ec, prefs->gconf);
- e_config_set_target ((EConfig *) ec, (EConfigTarget *) target);
toplevel = e_config_create_widget ((EConfig *) ec);
gtk_container_add (GTK_CONTAINER (prefs), toplevel);
}
diff --git a/modules/mail/em-mailer-prefs.h b/modules/mail/em-mailer-prefs.h
index b8e01b360d..d672d2cc9b 100644
--- a/modules/mail/em-mailer-prefs.h
+++ b/modules/mail/em-mailer-prefs.h
@@ -24,6 +24,8 @@
#define EM_MAILER_PREFS_H
#include <gtk/gtk.h>
+#include <gconf/gconf-client.h>
+
#include <shell/e-shell.h>
#include <widgets/misc/e-preferences-window.h>
diff --git a/modules/mail/em-network-prefs.c b/modules/mail/em-network-prefs.c
index 64fe23e7f9..38e34f7ea5 100644
--- a/modules/mail/em-network-prefs.c
+++ b/modules/mail/em-network-prefs.c
@@ -318,7 +318,6 @@ em_network_prefs_construct (EMNetworkPrefs *prefs)
GSList *l, *ignore;
gchar *buf;
EMConfig *ec;
- EMConfigTargetPrefs *target;
gboolean locked;
gint i, val, port;
@@ -336,7 +335,6 @@ em_network_prefs_construct (EMNetworkPrefs *prefs)
* @Id: org.gnome.evolution.mail.networkPrefs
* @Type: E_CONFIG_BOOK
* @Class: org.gnome.evolution.mail.config:1.0
- * @Target: EMConfigTargetPrefs
*
* The network preferences settings page.
*/
@@ -522,8 +520,6 @@ em_network_prefs_construct (EMNetworkPrefs *prefs)
}
/* get our toplevel widget */
- target = em_config_target_new_prefs (ec, prefs->gconf);
- e_config_set_target ((EConfig *) ec, (EConfigTarget *) target);
toplevel = e_config_create_widget ((EConfig *) ec);
gtk_container_add (GTK_CONTAINER (prefs), toplevel);
}