diff options
Diffstat (limited to 'modules/mail/e-mail-shell-view-actions.c')
-rw-r--r-- | modules/mail/e-mail-shell-view-actions.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c index 82204ec85b..7bed18d8b8 100644 --- a/modules/mail/e-mail-shell-view-actions.c +++ b/modules/mail/e-mail-shell-view-actions.c @@ -378,7 +378,7 @@ action_mail_folder_mark_all_as_read_cb (GtkAction *action, backend = E_MAIL_BACKEND (shell_backend); session = e_mail_backend_get_session (backend); cache = e_mail_session_get_folder_cache (session); - key = "/apps/evolution/mail/prompts/mark_all_read"; + key = "prompt-on-mark-all-read"; if (mail_folder_cache_get_folder_has_children (cache, folder, NULL)) prompt = "mail:ask-mark-all-read-sub"; @@ -1633,9 +1633,8 @@ e_mail_shell_view_actions_init (EMailShellView *mail_shell_view) EMailView *mail_view; GtkActionGroup *action_group; GtkAction *action; - GConfBridge *bridge; + GSettings *settings; GObject *object; - const gchar *key; g_return_if_fail (E_IS_MAIL_SHELL_VIEW (mail_shell_view)); @@ -1691,17 +1690,17 @@ e_mail_shell_view_actions_init (EMailShellView *mail_shell_view) g_object_set (ACTION (MAIL_SEND_RECEIVE), "is-important", TRUE, NULL); - /* Bind GObject properties for GConf keys. */ + /* Bind GObject properties for GSettings keys. */ - bridge = gconf_bridge_get (); + settings = g_settings_new ("org.gnome.evolution.mail"); object = G_OBJECT (ACTION (MAIL_SHOW_DELETED)); - key = "/apps/evolution/mail/display/show_deleted"; - gconf_bridge_bind_property (bridge, key, object, "active"); + g_settings_bind (settings, "show-deleted", object, "active", G_SETTINGS_BIND_DEFAULT); object = G_OBJECT (ACTION (MAIL_VIEW_VERTICAL)); - key = "/apps/evolution/mail/display/layout"; - gconf_bridge_bind_property (bridge, key, object, "current-value"); + g_settings_bind (settings, "layout", object, "current-value", G_SETTINGS_BIND_DEFAULT); + + g_object_unref (settings); /* Fine tuning. */ |