diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2013-03-10 21:53:12 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2013-03-17 20:49:12 +0800 |
commit | 2e87aa81fc94f5d9564421e036adae7b48e7380a (patch) | |
tree | 9576f15a49a6101c9246c6ce0f82e5c7bd4575c2 /mail/e-mail-reader.c | |
parent | 95a0ae4afb72b534c991fbcd774733a93f256514 (diff) | |
download | gsoc2013-evolution-2e87aa81fc94f5d9564421e036adae7b48e7380a.tar gsoc2013-evolution-2e87aa81fc94f5d9564421e036adae7b48e7380a.tar.gz gsoc2013-evolution-2e87aa81fc94f5d9564421e036adae7b48e7380a.tar.bz2 gsoc2013-evolution-2e87aa81fc94f5d9564421e036adae7b48e7380a.tar.lz gsoc2013-evolution-2e87aa81fc94f5d9564421e036adae7b48e7380a.tar.xz gsoc2013-evolution-2e87aa81fc94f5d9564421e036adae7b48e7380a.tar.zst gsoc2013-evolution-2e87aa81fc94f5d9564421e036adae7b48e7380a.zip |
Remove EMailShellSettings.
EShellSettings predates GSettings and is no longer necessary.
GSettings allows binding GObject properties to GSettings keys,
with optional mapping functions. That fulfills the purpose of
EShellSettings.
Diffstat (limited to 'mail/e-mail-reader.c')
-rw-r--r-- | mail/e-mail-reader.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index 64b8d78b40..69bb388d72 100644 --- a/mail/e-mail-reader.c +++ b/mail/e-mail-reader.c @@ -2732,32 +2732,28 @@ mail_reader_message_seen_cb (EMailReaderClosure *closure) static gboolean schedule_timeout_mark_seen (EMailReader *reader) { - EShell *shell; - EMailBackend *backend; - EShellBackend *shell_backend; - EShellSettings *shell_settings; MessageList *message_list; + GSettings *settings; gboolean schedule_timeout; gint timeout_interval; const gchar *message_uid; - backend = e_mail_reader_get_backend (reader); + message_list = MESSAGE_LIST (e_mail_reader_get_message_list (reader)); - shell_backend = E_SHELL_BACKEND (backend); - shell = e_shell_backend_get_shell (shell_backend); - shell_settings = e_shell_get_shell_settings (shell); message_uid = message_list->cursor_uid; if (message_uid == NULL || e_tree_is_dragging (E_TREE (message_list))) return FALSE; + settings = g_settings_new ("org.gnome.evolution.mail"); + + /* FIXME These should be EMailReader properties. */ schedule_timeout = (message_uid != NULL) && - e_shell_settings_get_boolean ( - shell_settings, "mail-mark-seen"); - timeout_interval = - e_shell_settings_get_int ( - shell_settings, "mail-mark-seen-timeout"); + g_settings_get_boolean (settings, "mark-seen"); + timeout_interval = g_settings_get_int (settings, "mark-seen-timeout"); + + g_object_unref (settings); if (message_list->seen_id > 0) { g_source_remove (message_list->seen_id); |