diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2008-06-06 23:12:53 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-06-06 23:12:53 +0800 |
| commit | 4503c052d04822edb3105e639b824ed88013a810 (patch) | |
| tree | a158d5a45ad252370444729fa5ae97bd17362669 /mail/mail-config.c | |
| parent | 6efe8d58cdb61225ce942181d0d2a0ae3227ed5f (diff) | |
| download | gsoc2013-evolution-4503c052d04822edb3105e639b824ed88013a810.tar gsoc2013-evolution-4503c052d04822edb3105e639b824ed88013a810.tar.gz gsoc2013-evolution-4503c052d04822edb3105e639b824ed88013a810.tar.bz2 gsoc2013-evolution-4503c052d04822edb3105e639b824ed88013a810.tar.lz gsoc2013-evolution-4503c052d04822edb3105e639b824ed88013a810.tar.xz gsoc2013-evolution-4503c052d04822edb3105e639b824ed88013a810.tar.zst gsoc2013-evolution-4503c052d04822edb3105e639b824ed88013a810.zip | |
** Allow evolution to build with G_DISABLE_SINGLE_INCLUDES and
2008-06-06 Matthew Barnes <mbarnes@redhat.com>
** Allow evolution to build with G_DISABLE_SINGLE_INCLUDES and
GTK_DISABLE_SINGLE_INCLUDES defined. (#536637)
svn path=/trunk/; revision=35606
Diffstat (limited to 'mail/mail-config.c')
| -rw-r--r-- | mail/mail-config.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/mail/mail-config.c b/mail/mail-config.c index ec89953c05..ec2e491519 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -35,14 +35,13 @@ #include <string.h> #include <ctype.h> -#include <glib.h> +#include <gtk/gtk.h> #include <glib/gstdio.h> #ifndef G_OS_WIN32 #include <sys/wait.h> #endif -#include <gtk/gtkdialog.h> #include <gtkhtml/gtkhtml.h> #include <glade/glade.h> @@ -256,9 +255,11 @@ gconf_jh_check_changed (GConfClient *client, guint cnxn_id, if (!config->jh_check) { mail_session_set_junk_headers (NULL, NULL, 0); } else { - config->jh_header = gconf_client_get_list (config->gconf, "/apps/evolution/mail/junk/custom_header", GCONF_VALUE_STRING, NULL); - GSList *node = config->jh_header; + GSList *node; GPtrArray *name, *value; + + config->jh_header = gconf_client_get_list (config->gconf, "/apps/evolution/mail/junk/custom_header", GCONF_VALUE_STRING, NULL); + node = config->jh_header; name = g_ptr_array_new (); value = g_ptr_array_new (); while (node && node->data) { @@ -278,9 +279,11 @@ static void gconf_jh_headers_changed (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data) { - config->jh_header = gconf_client_get_list (config->gconf, "/apps/evolution/mail/junk/custom_header", GCONF_VALUE_STRING, NULL); - GSList *node = config->jh_header; + GSList *node; GPtrArray *name, *value; + + config->jh_header = gconf_client_get_list (config->gconf, "/apps/evolution/mail/junk/custom_header", GCONF_VALUE_STRING, NULL); + node = config->jh_header; name = g_ptr_array_new (); value = g_ptr_array_new (); while (node && node->data) { |