diff options
| author | Larry Ewing <lewing@ximian.com> | 2003-05-21 02:33:33 +0800 |
|---|---|---|
| committer | Larry Ewing <lewing@src.gnome.org> | 2003-05-21 02:33:33 +0800 |
| commit | 8d75f1b9bc33edd7dab1f6299b415d5717ba76c6 (patch) | |
| tree | 245b818859054d28e93b1e21c5d732f55ce37def /mail/mail-preferences.c | |
| parent | 81237cc33be1e7f4dc3016c2cb4b37c3a594a1d2 (diff) | |
| download | gsoc2013-evolution-8d75f1b9bc33edd7dab1f6299b415d5717ba76c6.tar.gz gsoc2013-evolution-8d75f1b9bc33edd7dab1f6299b415d5717ba76c6.tar.zst gsoc2013-evolution-8d75f1b9bc33edd7dab1f6299b415d5717ba76c6.zip | |
remove references to gtkhtml property manager. Connect to missing
2003-05-20 Larry Ewing <lewing@ximian.com>
* mail-composer-prefs.c: remove references to gtkhtml property
manager. Connect to missing settings.
* mail-preferences.c: remove references to gtkhtml property
manager. Connect to missing settings.
* mail-config.glade: remove keybinding setting.
* mail-display.c (mail_display_destroy): remove notification.
(display_notify): set animate and redisplay. We have to redisplay
because the citation color may have changed.
* evolution-mail.schemas: add composer and display gconf entries.
svn path=/trunk/; revision=21288
Diffstat (limited to 'mail/mail-preferences.c')
| -rw-r--r-- | mail/mail-preferences.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/mail/mail-preferences.c b/mail/mail-preferences.c index dad50e251a..f2b6685a7f 100644 --- a/mail/mail-preferences.c +++ b/mail/mail-preferences.c @@ -90,7 +90,6 @@ mail_preferences_finalise (GObject *obj) MailPreferences *prefs = (MailPreferences *) obj; g_object_unref (prefs->gui); - g_object_unref (prefs->pman); g_object_unref (prefs->gconf); ((GObjectClass *)(parent_class))->finalize (obj); @@ -311,6 +310,7 @@ mail_preferences_construct (MailPreferences *prefs) /* HTML Mail tab */ /* Loading Images */ + val = gconf_client_get_int (prefs->gconf, "/apps/evolution/mail/display/load_http_images", NULL); prefs->images_never = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "radImagesNever")); gtk_toggle_button_set_active (prefs->images_never, val == MAIL_CONFIG_HTTP_NEVER); @@ -324,6 +324,11 @@ mail_preferences_construct (MailPreferences *prefs) gtk_toggle_button_set_active (prefs->images_always, val == MAIL_CONFIG_HTTP_ALWAYS); g_signal_connect (prefs->images_always, "toggled", G_CALLBACK (settings_changed), prefs); + prefs->show_animated = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkShowAnimatedImages")); + bool = gconf_client_get_bool (prefs->gconf, "/apps/evolution/mail/display/animate_images", NULL); + gtk_toggle_button_set_active (prefs->show_animated, bool); + g_signal_connect (prefs->show_animated, "toggled", G_CALLBACK (settings_changed), prefs); + prefs->prompt_unwanted_html = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkPromptWantHTML")); bool = gconf_client_get_bool (prefs->gconf, "/apps/evolution/mail/prompts/unwanted_html", NULL); gtk_toggle_button_set_active (prefs->prompt_unwanted_html, bool); @@ -436,20 +441,19 @@ mail_preferences_apply (MailPreferences *prefs) gconf_client_set_int (prefs->gconf, "/apps/evolution/mail/display/load_http_images", val, NULL); -#warning "gtkhtml propmanager" -#if 0 - gtk_html_propmanager_apply (prefs->pman); -#endif gconf_client_set_string (prefs->gconf, "/apps/evolution/mail/display/fonts/variable", gnome_font_picker_get_font_name (prefs->font_variable), NULL); gconf_client_set_string (prefs->gconf, "/apps/evolution/mail/display/fonts/monospace", gnome_font_picker_get_font_name (prefs->font_fixed), NULL); gconf_client_set_bool (prefs->gconf, "/apps/evolution/mail/display/fonts/use_custom", !gtk_toggle_button_get_active (prefs->font_share), NULL); + gconf_client_set_bool (prefs->gconf, "/apps/evolution/mail/display/animate_images", + gtk_toggle_button_get_active (prefs->show_animated), NULL); gconf_client_set_bool (prefs->gconf, "/apps/evolution/mail/prompts/unwanted_html", gtk_toggle_button_get_active (prefs->prompt_unwanted_html), NULL); + /* Labels and Colours */ list = NULL; for (i = 4; i >= 0; i--) { |