Commit adf6645d authored by Matthew Barnes's avatar Matthew Barnes

Fix some GSettings runtime issues.

parent 26587308
......@@ -25,7 +25,7 @@ gsettings_SCHEMAS = \
org.gnome.evolution.eplugin.face-picture.gschema.xml \
org.gnome.evolution.eplugin.itip.gschema.xml \
org.gnome.evolution.eplugin.mail-notification.gschema.xml \
org.gnome.evolution.eplugin.prefer-plain.gschema.xml.in \
org.gnome.evolution.eplugin.prefer-plain.gschema.xml \
org.gnome.evolution.eplugin.templates.gschema.xml
@INTLTOOL_XML_NOMERGE_RULE@
......
......@@ -5,8 +5,8 @@ disabled-eplugins = /apps/evolution/eplugin/disabled
[org.gnome.evolution.shell]
attachment-view = /apps/evolution/shell/attachment_view
buttons-visible = /apps/evolution/shell/view_defaults/buttons_visible
buttons-style = /apps/evolution/shell/view_defaults/buttons_style
buttons-visible = /apps/evolution/shell/view_defaults/buttons_visible
default-component-id = /apps/evolution/shell/view_defaults/component_id
express-mode = /apps/evolution/shell/express_mode
file-chooser-folder = /apps/evolution/shell/file_chooser_folder
......@@ -17,11 +17,11 @@ skip-warning-dialog = /apps/evolution/shell/skip_warning_dialog
start-offline = /apps/evolution/shell/start_offline
statusbar-visible = /apps/evolution/shell/view_defaults/statusbar_visible
toolbar-visible = /apps/evolution/shell/view_defaults/toolbar_visible
window-y = /apps/evolution/shell/view_defaults/window_y
window-x = /apps/evolution/shell/view_defaults/window_x
window-width = /apps/evolution/shell/view_defaults/window_width
window-height = /apps/evolution/shell/view_defaults/window_height
window-maximized = /apps/evolution/shell/view_defaults/window_maximized
window-width = /apps/evolution/shell/view_defaults/window_width
window-x = /apps/evolution/shell/view_defaults/window_x
window-y = /apps/evolution/shell/view_defaults/window_y
[org.gnome.evolution.addressbook]
address-formatting = /apps/evolution/addressbook/display/address_formatting
......@@ -45,11 +45,11 @@ confirm-purge = /apps/evolution/calendar/prompts/confirm_purge
date-navigator-pane-position = /apps/evolution/calendar/display/date_navigator_pane_position
day-end-hour = /apps/evolution/calendar/display/day_end_hour
day-end-minute = /apps/evolution/calendar/display/day_end_minute
day-start-hour = /apps/evolution/calendar/display/day_start_hour
day-start-minute = /apps/evolution/calendar/display/day_start_minute
day-second-zone = /apps/evolution/calendar/display/day_second_zone
day-second-zones = /apps/evolution/calendar/display/day_second_zones
day-second-zones-max = /apps/evolution/calendar/display/day_second_zones_max
day-start-hour = /apps/evolution/calendar/display/day_start_hour
day-start-minute = /apps/evolution/calendar/display/day_start_minute
default-reminder-interval = /apps/evolution/calendar/other/default_reminder_interval
default-reminder-units = /apps/evolution/calendar/other/default_reminder_units
editor-show-categories = /apps/evolution/calendar/display/show_categories
......@@ -88,9 +88,9 @@ show-week-numbers = /apps/evolution/calendar/display/show_week_numbers
tag-vpane-position = /apps/evolution/calendar/display/tag_vpane_position
task-due-today-color = /apps/evolution/calendar/tasks/colors/due_today
task-hpane-position = /apps/evolution/calendar/display/task_hpane_position
task-vpane-position = /apps/evolution/calendar/display/task_vpane_position
task-layout = /apps/evolution/calendar/display/task_layout
task-overdue-color = /apps/evolution/calendar/tasks/colors/overdue
task-vpane-position = /apps/evolution/calendar/display/task_vpane_position
time-divisions = /apps/evolution/calendar/display/time_divisions
timezone = /apps/evolution/calendar/display/timezone
use-24hour-format = /apps/evolution/calendar/display/use_24hour_format
......@@ -128,13 +128,14 @@ composer-outlook-filenames = /apps/evolution/mail/composer/outlook_filenames
composer-reply-start-bottom = /apps/evolution/mail/composer/reply_start_bottom
composer-request-receipt = /apps/evolution/mail/composer/request_receipt
composer-send-html = /apps/evolution/mail/composer/send_html
composer-spell-color = /apps/evolution/mail/composer/spell_color
composer-spell-languages = /apps/evolution/mail/composer/spell_languages
composer-show-bcc = /apps/evolution/mail/composer/show_mail_bcc
composer-show-cc = /apps/evolution/mail/composer/show_mail_cc
composer-show-reply-to = /apps/evolution/mail/composer/show_mail_reply_to
composer-show-post-from = /apps/evolution/mail/composer/show_post_from
composer-show-post-reply-to = /apps/evolution/mail/composer/show_post_reply_to
composer-show-reply-to = /apps/evolution/mail/composer/show_mail_reply_to
composer-sign-reply-if-signed = /apps/evolution/mail/composer/sign_reply_if_signed
composer-spell-color = /apps/evolution/mail/composer/spell_color
composer-spell-languages = /apps/evolution/mail/composer/spell_languages
composer-top-signature = /apps/evolution/mail/composer/top_signature
composer-width = /apps/evolution/mail/composer/width
default-account = /apps/evolution/mail/default_account
......@@ -163,9 +164,9 @@ junk-empty-on-exit-days = /apps/evolution/mail/junk/empty_on_exit_days
junk-lookup-addressbook = /apps/evolution/mail/junk/lookup_addressbook
junk-lookup-addressbook-local-only = /apps/evolution/mail/junk/lookup_addressbook_local_only
junk-sa-local-only = /apps/evolution/mail/junk/sa/local_only
junk-sa-socket-path = "/apps/evolution/mail/junk/sa/socket_path
junk-sa-spamc-binary = /apps/evolution/mail/junk/sa/spamc_binary
junk-sa-spamd-binary = /apps/evolution/mail/junk/sa/spamd_binary
junk-sa-socket-path = "/apps/evolution/mail/junk/sa/socket_path
junk-sa-use-daemon = /apps/evolution/mail/junk/sa/use_daemon
labels = /apps/evolution/mail/labels
layout = /apps/evolution/mail/display/layout
......@@ -200,12 +201,12 @@ prompt-on-reply-close-browser = /apps/evolution/mail/prompts/reply_close_browser
prompt-on-reply-many-recips = /apps/evolution/mail/prompts/reply_many_recips
prompt-on-unwanted-html = /apps/evolution/mail/prompts/unwanted_html
reply-style = /apps/evolution/mail/format/reply_style
save-dir = /apps/evolution/mail/save_dir
safe-list = /apps/evolution/mail/display/safe_list
save-dir = /apps/evolution/mail/save_dir
send-recv-all-on-start = /apps/evolution/mail/send_recv_all_on_start
send-recv-height = /apps/evolution/mail/send_recv_height
send-recv-maximized = /apps/evolution/mail/send_recv_maximized
send-recv-on-start = /apps/evolution/mail/send_recv_on_start
send-recv-all-on-start = /apps/evolution/mail/send_recv_all_on_start
send-recv-width = /apps/evolution/mail/send_recv_width
show-all-headers = /apps/evolution/mail/display/show_all_headers
show-animated-images = /apps/evolution/mail/display/animated_images
......
<schemalist>
<schema gettext-domain="evolution" id="org.gnome.evolution.eplugin.prefer-plain" path="/orf/gnome/evolution/eplugin/prefer-plain/">
<schema gettext-domain="evolution" id="org.gnome.evolution.eplugin.prefer-plain" path="/org/gnome/evolution/eplugin/prefer-plain/">
<key name="mode" type="s">
<default>'normal'</default>
<_summary>Mode to use when displaying mails</_summary>
......
......@@ -100,6 +100,11 @@
<_summary>Show "Reply To" field when posting to a newsgroup</_summary>
<_description>Show the "Reply To" field when posting to a newsgroup. This is controlled from the View menu when a news account is chosen.</_description>
</key>
<key name="composer-sign-reply-if-signed" type="b">
<default>false</default>
<_summary>Digitally sign replies when the original message is signed</_summary>
<_description>Automatically enable PGP or S/MIME signatures when replying to a message which is also PGP or S/MIME signed.</_description>
</key>
<key name="composer-outlook-filenames" type="b">
<default>false</default>
<_summary>Encode file names in an Outlook/GMail way</_summary>
......
......@@ -252,7 +252,8 @@ mail_config_init (EMailSession *session)
/* Composer Configuration */
settings_outlook_filenames_changed (mail_settings, NULL, NULL);
settings_outlook_filenames_changed (
mail_settings, "composer-outlook-filenames", NULL);
g_signal_connect (
mail_settings, "changed::composer-outlook-filenames",
G_CALLBACK (settings_outlook_filenames_changed), NULL);
......
......@@ -326,7 +326,7 @@ e_mail_shell_settings_init (EShellBackend *shell_backend)
e_shell_settings_install_property_for_key (
"composer-sign-reply-if-signed",
MAIL_SCHEMA,
"/apps/evolution/mail/composer/sign_reply_if_signed");
"composer-sign-reply-if-signed");
e_shell_settings_install_property_for_key (
"composer-prompt-only-bcc",
......
......@@ -103,7 +103,7 @@ em_mailer_prefs_finalize (GObject *object)
EMMailerPrefs *prefs = (EMMailerPrefs *) object;
g_object_unref (prefs->builder);
g_object_unref (prefs->gconf);
g_object_unref (prefs->settings);
/* Chain up to parent's finalize() method. */
......@@ -123,6 +123,9 @@ static void
em_mailer_prefs_init (EMMailerPrefs *preferences)
{
preferences->settings = g_settings_new ("org.gnome.evolution.mail");
/* XXX Still need this for a little while longer. */
preferences->gconf = gconf_client_get_default ();
}
enum {
......@@ -1084,20 +1087,23 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
prefs->junk_header_remove = (GtkButton *)e_builder_get_widget (prefs->builder, "junk_header_remove");
prefs->junk_book_lookup = (GtkToggleButton *)e_builder_get_widget (prefs->builder, "lookup_book");
prefs->junk_lookup_local_only = (GtkToggleButton *)e_builder_get_widget (prefs->builder, "junk_lookup_local_only");
toggle_button_init (prefs, prefs->junk_book_lookup, FALSE,
"/apps/evolution/mail/junk/lookup_addressbook",
G_CALLBACK (junk_book_lookup_button_toggled));
toggle_button_init (
prefs, prefs->junk_book_lookup,
FALSE, "junk-lookup-addressbook",
G_CALLBACK (junk_book_lookup_button_toggled));
toggle_button_init (prefs, prefs->junk_lookup_local_only, FALSE,
"/apps/evolution/mail/junk/lookup_addressbook_local_only",
G_CALLBACK (toggle_button_toggled));
toggle_button_init (
prefs, prefs->junk_lookup_local_only,
FALSE, "junk-lookup-addressbook-local-only",
G_CALLBACK (toggle_button_toggled));
junk_book_lookup_button_toggled (prefs->junk_book_lookup, prefs);
prefs->junk_header_list_store = init_junk_tree ((GtkWidget *) prefs->junk_header_tree, prefs);
toggle_button_init (prefs, prefs->junk_header_check, FALSE,
"/apps/evolution/mail/junk/check_custom_header",
G_CALLBACK (custom_junk_button_toggled));
toggle_button_init (
prefs, prefs->junk_header_check,
FALSE, "junk-check-custom-header",
G_CALLBACK (custom_junk_button_toggled));
custom_junk_button_toggled (prefs->junk_header_check, prefs);
jh_tree_refill (prefs);
......
......@@ -1158,7 +1158,7 @@ e_spam_assassin_init (ESpamAssassin *extension)
g_settings_bind (settings, "junk-sa-local-only", G_OBJECT (extension), "local-only", G_SETTINGS_BIND_DEFAULT);
g_settings_bind (settings, "junk-sa-spamc-binary", G_OBJECT (extension), "spamc-binary", G_SETTINGS_BIND_DEFAULT);
g_settings_bind (settings, "junk-sa-spamd-binary", G_OBJECT (extension), "spamd-binary", G_SETTINGS_BIND_DEFAULT);
g_settings_bind (settings, "junk-sa-socjet-path", G_OBJECT (extension), "socket-path", G_SETTINGS_BIND_DEFAULT);
g_settings_bind (settings, "junk-sa-socket-path", G_OBJECT (extension), "socket-path", G_SETTINGS_BIND_DEFAULT);
g_settings_bind (settings, "junk-sa-use-daemon", G_OBJECT (extension), "use-daemon", G_SETTINGS_BIND_DEFAULT);
g_object_unref (settings);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment