aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2011-11-29 21:16:55 +0800
committerMilan Crha <mcrha@redhat.com>2011-11-29 21:16:55 +0800
commitf2b9a4b609b13d51ec1925e7c297e87e17026e33 (patch)
tree8ad0454f8ec9cbead4e0ca4de92bcc8652f02e93 /modules
parentb16c24615186a2a46a052d57f3e494b54d1d3300 (diff)
downloadgsoc2013-evolution-f2b9a4b609b13d51ec1925e7c297e87e17026e33.tar.gz
gsoc2013-evolution-f2b9a4b609b13d51ec1925e7c297e87e17026e33.tar.zst
gsoc2013-evolution-f2b9a4b609b13d51ec1925e7c297e87e17026e33.zip
Bug #665103 - Blank composer/mail/network preferences windows
Diffstat (limited to 'modules')
-rw-r--r--modules/mail/e-mail-config-hook.c1
-rw-r--r--modules/mail/em-composer-prefs.c7
-rw-r--r--modules/mail/em-mailer-prefs.c4
-rw-r--r--modules/mail/em-network-prefs.c4
4 files changed, 13 insertions, 3 deletions
diff --git a/modules/mail/e-mail-config-hook.c b/modules/mail/e-mail-config-hook.c
index 14acc60aca..cc9734647b 100644
--- a/modules/mail/e-mail-config-hook.c
+++ b/modules/mail/e-mail-config-hook.c
@@ -34,6 +34,7 @@ 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 a0091e353a..0dcd1116bb 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -326,8 +326,8 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
GtkListStore *store;
GtkTreeSelection *selection;
GtkCellRenderer *renderer;
- GConfClient *client;
EMConfig *ec;
+ EMConfigTargetPrefs *target;
GSList *l;
gint i;
@@ -345,6 +345,7 @@ 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.
*/
@@ -586,10 +587,10 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
NULL);
/* get our toplevel widget */
- client = gconf_client_get_default ();
+ target = em_config_target_new_prefs (ec);
+ 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);
}
GtkWidget *
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index a629d393a8..af570e5c88 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -712,6 +712,7 @@ 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);
@@ -728,6 +729,7 @@ 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.
*/
@@ -1113,6 +1115,8 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
G_CALLBACK (jh_remove_cb), prefs);
/* get our toplevel widget */
+ target = em_config_target_new_prefs (ec);
+ 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-network-prefs.c b/modules/mail/em-network-prefs.c
index 38e34f7ea5..793925055a 100644
--- a/modules/mail/em-network-prefs.c
+++ b/modules/mail/em-network-prefs.c
@@ -318,6 +318,7 @@ em_network_prefs_construct (EMNetworkPrefs *prefs)
GSList *l, *ignore;
gchar *buf;
EMConfig *ec;
+ EMConfigTargetPrefs *target;
gboolean locked;
gint i, val, port;
@@ -335,6 +336,7 @@ 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.
*/
@@ -520,6 +522,8 @@ em_network_prefs_construct (EMNetworkPrefs *prefs)
}
/* get our toplevel widget */
+ target = em_config_target_new_prefs (ec);
+ e_config_set_target ((EConfig *) ec, (EConfigTarget *) target);
toplevel = e_config_create_widget ((EConfig *) ec);
gtk_container_add (GTK_CONTAINER (prefs), toplevel);
}