From 0cf607076dfc2c481ca1164a04cecdb0661e6bd0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 May 2009 10:58:25 -0400 Subject: Fix compiler warnings in mail. --- mail/mail-config.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'mail/mail-config.c') diff --git a/mail/mail-config.c b/mail/mail-config.c index 5fa562e399..62f6ba6eb3 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -105,10 +105,11 @@ typedef struct { gboolean scripts_disabled; } MailConfig; +extern int camel_header_param_encode_filenames_in_rfc_2047; + static MailConfig *config = NULL; static guint config_write_timeout = 0; - void mail_config_save_accounts (void) { @@ -251,8 +252,6 @@ static void gconf_outlook_filenames_changed (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data) { - extern int camel_header_param_encode_filenames_in_rfc_2047; - g_return_if_fail (client != NULL); /* pass option to the camel */ @@ -992,12 +991,13 @@ mail_config_uri_renamed (GCompareFunc uri_cmp, const char *old, const char *new) EIterator *iter; int i, work = 0; char *oldname, *newname; - char *cachenames[] = { "config/hidestate-", - "config/et-expanded-", - "config/et-header-", - "*views/current_view-", - "*views/custom_view-", - NULL }; + const gchar *cachenames[] = { + "config/hidestate-", + "config/et-expanded-", + "config/et-header-", + "*views/current_view-", + "*views/custom_view-", + NULL }; iter = e_list_get_iterator ((EList *) config->accounts); while (e_iterator_is_valid (iter)) { -- cgit v1.2.3 From e4afd3f9fb962ea1295a0657ec9f83a427829171 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 May 2009 23:21:02 -0400 Subject: Remove trailing whitespace, again. --- mail/mail-config.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'mail/mail-config.c') diff --git a/mail/mail-config.c b/mail/mail-config.c index 62f6ba6eb3..bcf8dd7854 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -10,7 +10,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with the program; if not, see + * License along with the program; if not, see * * * Authors: @@ -423,7 +423,7 @@ mail_config_init (void) config->gconf, key, func, &config->error_time, NULL, NULL); config->error_time = - gconf_client_get_int (config->gconf, key, NULL); + gconf_client_get_int (config->gconf, key, NULL); key = "/apps/evolution/mail/display/error_level"; func = (GConfClientNotifyFunc) gconf_int_value_changed; @@ -431,7 +431,7 @@ mail_config_init (void) config->gconf, key, func, &config->error_level, NULL, NULL); config->error_level = - gconf_client_get_int (config->gconf, key, NULL); + gconf_client_get_int (config->gconf, key, NULL); key = "/apps/evolution/mail/display/force_message_limit"; func = (GConfClientNotifyFunc) gconf_bool_value_changed; @@ -678,7 +678,7 @@ mail_config_get_address_count (void) guint mail_config_get_error_timeout (void) -{ +{ if (!config) mail_config_init (); @@ -687,7 +687,7 @@ mail_config_get_error_timeout (void) guint mail_config_get_error_level (void) -{ +{ if (!config) mail_config_init (); @@ -1206,7 +1206,7 @@ mail_config_reload_junk_headers (void) /* It automatically sets in the session */ if (config == NULL) mail_config_init (); - else + else gconf_jh_check_changed (config->gconf, 0, NULL, config); } -- cgit v1.2.3