From 925b03c373fc79ccd56ab718a0ab97ab92c06115 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 9 Nov 2011 12:35:00 +0100 Subject: Make it fully build --- modules/mail/em-account-prefs.c | 2 -- modules/mail/em-mailer-prefs.c | 8 ++++---- modules/mail/em-mailer-prefs.h | 1 + 3 files changed, 5 insertions(+), 6 deletions(-) (limited to 'modules/mail') 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 */ -- cgit v1.2.3