aboutsummaryrefslogtreecommitdiffstats
path: root/modules/mail
diff options
context:
space:
mode:
authorRodrigo Moya <rodrigo@gnome-db.org>2011-11-09 19:35:00 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-11-09 19:35:00 +0800
commit925b03c373fc79ccd56ab718a0ab97ab92c06115 (patch)
tree57bdcde0d7f103022ad47967c4e5956cfb0f9f40 /modules/mail
parenta610cccc0a32d48809301c35341e02822edaa612 (diff)
downloadgsoc2013-evolution-925b03c373fc79ccd56ab718a0ab97ab92c06115.tar
gsoc2013-evolution-925b03c373fc79ccd56ab718a0ab97ab92c06115.tar.gz
gsoc2013-evolution-925b03c373fc79ccd56ab718a0ab97ab92c06115.tar.bz2
gsoc2013-evolution-925b03c373fc79ccd56ab718a0ab97ab92c06115.tar.lz
gsoc2013-evolution-925b03c373fc79ccd56ab718a0ab97ab92c06115.tar.xz
gsoc2013-evolution-925b03c373fc79ccd56ab718a0ab97ab92c06115.tar.zst
gsoc2013-evolution-925b03c373fc79ccd56ab718a0ab97ab92c06115.zip
Make it fully build
Diffstat (limited to 'modules/mail')
-rw-r--r--modules/mail/em-account-prefs.c2
-rw-r--r--modules/mail/em-mailer-prefs.c8
-rw-r--r--modules/mail/em-mailer-prefs.h1
3 files changed, 5 insertions, 6 deletions
diff --git a/modules/mail/em-account-prefs.c b/modules/mail/em-account-prefs.c
index 4bd6c1c968..ddf51d815e 100644
--- a/modules/mail/em-account-prefs.c
+++ b/modules/mail/em-account-prefs.c
@@ -117,7 +117,6 @@ account_prefs_disable_account_cb (EAccountTreeView *tree_view,
EMAccountPrefs *prefs)
{
EAccountList *account_list;
- EMailSession *session;
EAccount *account;
EMailSession *session;
gpointer parent;
@@ -326,7 +325,6 @@ account_prefs_delete_account (EAccountManager *manager)
EMAccountPrefsPrivate *priv;
EAccountTreeView *tree_view;
EAccountList *account_list;
- EMailSession *session;
EAccount *account;
EMailSession *session;
gboolean has_proxies;
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index b04c35b088..4dabd0dacf 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -212,7 +212,7 @@ jh_add_cb (GtkWidget *widget,
tok = g_strdup_printf ("%s=%s", name, value);
g_ptr_array_add (array, tok);
g_ptr_array_add (array, NULL);
- g_settings_set_strv (prefs->settings, "junk-custom-header", array->pdata);
+ g_settings_set_strv (prefs->settings, "junk-custom-header", (const gchar * const*) array->pdata);
g_ptr_array_free (array, TRUE);
g_strfreev (strv);
@@ -260,7 +260,7 @@ jh_remove_cb (GtkWidget *widget,
g_ptr_array_add (array, NULL);
- g_settings_set_strv (prefs->settings, "junk-custom-header", array->pdata);
+ g_settings_set_strv (prefs->settings, "junk-custom-header", (const gchar * const*) array->pdata);
g_strfreev (strv);
g_ptr_array_free (array, TRUE);
@@ -534,8 +534,8 @@ toggle_button_init (EMMailerPrefs *prefs,
g_signal_connect (toggle, "toggled", toggled, prefs);
}
- if (!g_settings_is_writable (prefs->settings, key)
- gtk_widget_set_sensitive ((GtkWidget *) toggle, FALSE);
+ if (!g_settings_is_writable (prefs->settings, key))
+ gtk_widget_set_sensitive (GTK_WIDGET (toggle), FALSE);
}
static void
diff --git a/modules/mail/em-mailer-prefs.h b/modules/mail/em-mailer-prefs.h
index eee2d248ac..b8e01b360d 100644
--- a/modules/mail/em-mailer-prefs.h
+++ b/modules/mail/em-mailer-prefs.h
@@ -55,6 +55,7 @@ struct _EMMailerPrefs {
GtkVBox parent_object;
GtkBuilder *builder;
+ GConfClient *gconf;
GSettings *settings;
/* General tab */