diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-10-19 02:22:58 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-10-19 02:31:16 +0800 |
| commit | ae478d1e3cbdf46dd9a34e2d84eddfb37e9dd961 (patch) | |
| tree | 0e7ad99f50070f6c52d7c4b6e225c3c044afe04c /modules/mail | |
| parent | 0e7b23b94da808d3935f76aae53ad8a96ac06dd9 (diff) | |
| download | gsoc2013-evolution-ae478d1e3cbdf46dd9a34e2d84eddfb37e9dd961.tar gsoc2013-evolution-ae478d1e3cbdf46dd9a34e2d84eddfb37e9dd961.tar.gz gsoc2013-evolution-ae478d1e3cbdf46dd9a34e2d84eddfb37e9dd961.tar.bz2 gsoc2013-evolution-ae478d1e3cbdf46dd9a34e2d84eddfb37e9dd961.tar.lz gsoc2013-evolution-ae478d1e3cbdf46dd9a34e2d84eddfb37e9dd961.tar.xz gsoc2013-evolution-ae478d1e3cbdf46dd9a34e2d84eddfb37e9dd961.tar.zst gsoc2013-evolution-ae478d1e3cbdf46dd9a34e2d84eddfb37e9dd961.zip | |
Collect mail enum types in e-mail-enums.h.
And generate GTypes for each of them in e-mail-enumtypes.[ch].
Also, the glib-gen.mak script forced me to add a <mail/e-mail.h>
top-level header, which really isn't a bad idea anyway.
TODO: We should do this for calendar and addressbook too.
Diffstat (limited to 'modules/mail')
| -rw-r--r-- | modules/mail/em-mailer-prefs.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c index 522138a134..ff8f238b4a 100644 --- a/modules/mail/em-mailer-prefs.c +++ b/modules/mail/em-mailer-prefs.c @@ -611,16 +611,16 @@ emmp_empty_junk_init (EMMailerPrefs *prefs, static void http_images_changed (GtkWidget *widget, EMMailerPrefs *prefs) { - gint when; + EMailImageLoadingPolicy policy; if (gtk_toggle_button_get_active (prefs->images_always)) - when = MAIL_CONFIG_HTTP_ALWAYS; + policy = E_MAIL_IMAGE_LOADING_POLICY_ALWAYS; else if (gtk_toggle_button_get_active (prefs->images_sometimes)) - when = MAIL_CONFIG_HTTP_SOMETIMES; + policy = E_MAIL_IMAGE_LOADING_POLICY_SOMETIMES; else - when = MAIL_CONFIG_HTTP_NEVER; + policy = E_MAIL_IMAGE_LOADING_POLICY_NEVER; - gconf_client_set_int (prefs->gconf, "/apps/evolution/mail/display/load_http_images", when, NULL); + gconf_client_set_int (prefs->gconf, "/apps/evolution/mail/display/load_http_images", policy, NULL); } static GtkWidget * @@ -929,17 +929,17 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs, val = gconf_client_get_int (prefs->gconf, "/apps/evolution/mail/display/load_http_images", NULL); prefs->images_never = GTK_TOGGLE_BUTTON (e_builder_get_widget (prefs->builder, "radImagesNever")); - gtk_toggle_button_set_active (prefs->images_never, val == MAIL_CONFIG_HTTP_NEVER); + gtk_toggle_button_set_active (prefs->images_never, val == E_MAIL_IMAGE_LOADING_POLICY_NEVER); if (locked) gtk_widget_set_sensitive ((GtkWidget *) prefs->images_never, FALSE); prefs->images_sometimes = GTK_TOGGLE_BUTTON (e_builder_get_widget (prefs->builder, "radImagesSometimes")); - gtk_toggle_button_set_active (prefs->images_sometimes, val == MAIL_CONFIG_HTTP_SOMETIMES); + gtk_toggle_button_set_active (prefs->images_sometimes, val == E_MAIL_IMAGE_LOADING_POLICY_SOMETIMES); if (locked) gtk_widget_set_sensitive ((GtkWidget *) prefs->images_sometimes, FALSE); prefs->images_always = GTK_TOGGLE_BUTTON (e_builder_get_widget (prefs->builder, "radImagesAlways")); - gtk_toggle_button_set_active (prefs->images_always, val == MAIL_CONFIG_HTTP_ALWAYS); + gtk_toggle_button_set_active (prefs->images_always, val == E_MAIL_IMAGE_LOADING_POLICY_ALWAYS); if (locked) gtk_widget_set_sensitive ((GtkWidget *) prefs->images_always, FALSE); |