diff options
Diffstat (limited to 'mail/em-composer-utils.c')
| -rw-r--r-- | mail/em-composer-utils.c | 81 |
1 files changed, 37 insertions, 44 deletions
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index bc84e5508c..2897b37ef6 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -69,9 +69,6 @@ #define gmtime_r(tp,tmp) (gmtime(tp)?(*(tmp)=*gmtime(tp),(tmp)):0) #endif -#define GCONF_KEY_TEMPLATE_PLACEHOLDERS \ - "/apps/evolution/mail/template_placeholders" - typedef struct _AsyncContext AsyncContext; typedef struct _ForwardData ForwardData; @@ -159,7 +156,7 @@ ask_confirm_for_unwanted_html_mail (EMsgComposer *composer, if (str->len) res = em_utils_prompt_user ( GTK_WINDOW (composer), - "/apps/evolution/mail/prompts/unwanted_html", + "prompt-on-unwanted-html", "mail:ask-send-html", str->str, NULL); else res = TRUE; @@ -174,7 +171,7 @@ ask_confirm_for_empty_subject (EMsgComposer *composer) { return em_utils_prompt_user ( GTK_WINDOW (composer), - "/apps/evolution/mail/prompts/empty_subject", + "prompt-on-empty-subject", "mail:ask-send-no-subject", NULL); } @@ -190,7 +187,7 @@ ask_confirm_for_only_bcc (EMsgComposer *composer, return em_utils_prompt_user ( GTK_WINDOW (composer), - "/apps/evolution/mail/prompts/only_bcc", + "prompt-on-only-bcc", hidden_list_case ? "mail:ask-send-only-bcc-contact" : "mail:ask-send-only-bcc", NULL); @@ -333,7 +330,7 @@ composer_presend_check_recipients (EMsgComposer *composer) if (invalid_addrs) { if (!em_utils_prompt_user ( GTK_WINDOW (composer), - "/apps/evolution/mail/prompts/send_invalid_recip", + "prompt-on-invalid-recip", strstr (invalid_addrs->str, ", ") ? "mail:ask-send-invalid-recip-multi" : "mail:ask-send-invalid-recip-one", @@ -453,23 +450,21 @@ composer_presend_check_unwanted_html (EMsgComposer *composer) { EDestination **recipients; EComposerHeaderTable *table; - GConfClient *client; + GSettings *settings; gboolean check_passed = TRUE; gboolean html_mode; gboolean send_html; gboolean confirm_html; gint ii; - client = gconf_client_get_default (); + settings = g_settings_new ("org.gnome.evolution.mail"); table = e_msg_composer_get_header_table (composer); recipients = e_composer_header_table_get_destinations (table); html_mode = gtkhtml_editor_get_html_mode (GTKHTML_EDITOR (composer)); - send_html = gconf_client_get_bool ( - client, "/apps/evolution/mail/composer/send_html", NULL); - confirm_html = gconf_client_get_bool ( - client, "/apps/evolution/mail/prompts/unwanted_html", NULL); + send_html = g_settings_get_boolean (settings, "composer-send-html"); + confirm_html = g_settings_get_boolean (settings, "prompt-on-unwanted-html"); /* Only show this warning if our default is to send html. If it * isn't, we've manually switched into html mode in the composer @@ -493,7 +488,7 @@ composer_presend_check_unwanted_html (EMsgComposer *composer) if (recipients != NULL) e_destination_freev (recipients); - g_object_unref (client); + g_object_unref (settings); return check_passed; } @@ -1189,11 +1184,11 @@ typedef enum { } QuotingTextEnum; static struct { - const gchar * gconf_key; + const gchar * conf_key; const gchar * message; } conf_messages[] = { [QUOTING_ATTRIBUTION] = - { "/apps/evolution/mail/composer/message_attribution", + { "composer-message-attribution", /* Note to translators: this is the attribution string used * when quoting messages. Each ${Variable} gets replaced * with a value. To see a full list of available variables, @@ -1203,12 +1198,12 @@ static struct { }, [QUOTING_FORWARD] = - { "/apps/evolution/mail/composer/message_forward", + { "composer-message-forward", N_("-------- Forwarded Message --------") }, [QUOTING_ORIGINAL] = - { "/apps/evolution/mail/composer/message_original", + { "composer-message-original", N_("-----Original Message-----") } }; @@ -1216,12 +1211,12 @@ static struct { static gchar * quoting_text (QuotingTextEnum type) { - GConfClient *client; + GSettings *settings; gchar *text; - client = gconf_client_get_default (); - text = gconf_client_get_string (client, conf_messages[type].gconf_key, NULL); - g_object_unref (client); + settings = g_settings_new ("org.gnome.evolution.mail"); + text = g_settings_get_string (settings, conf_messages[type].conf_key); + g_object_unref (settings); if (text && *text) return text; @@ -1263,15 +1258,19 @@ em_utils_edit_message (EShell *shell, /* Template specific code follows. */ if (folder_is_templates) { CamelDataWrapper *content; - GConfClient *gconf; + GSettings *settings; + gchar **strv; + gint i; GSList *clue_list = NULL; - gconf = gconf_client_get_default (); - /* Get the list from gconf */ - clue_list = gconf_client_get_list ( - gconf, GCONF_KEY_TEMPLATE_PLACEHOLDERS, - GCONF_VALUE_STRING, NULL ); - g_object_unref (gconf); + settings = g_settings_new ("org.gnome.evolution.eplugin.templates"); + + /* Get the list from GSettings */ + strv = g_settings_get_strv (settings, "template-placeholders"); + for (i = 0; strv[i] != NULL; i++) + clue_list = g_slist_append (clue_list, g_strdup (strv[i])); + g_object_unref (settings); + g_strfreev (strv); content = camel_medium_get_content (CAMEL_MEDIUM (message)); traverse_parts (clue_list, message, content); @@ -2085,14 +2084,12 @@ get_reply_to (CamelMimeMessage *message) reply_to = camel_mime_message_get_reply_to (message); if (reply_to) { - GConfClient *client; - const gchar *key; + GSettings *settings; gboolean ignore_list_reply_to; - client = gconf_client_get_default (); - key = "/apps/evolution/mail/composer/ignore_list_reply_to"; - ignore_list_reply_to = gconf_client_get_bool (client, key, NULL); - g_object_unref (client); + settings = g_settings_new ("org.gnome.evolution.mail"); + ignore_list_reply_to = g_settings_get_boolean (settings, "composer-ignore-list-reply-to"); + g_object_unref (settings); if (ignore_list_reply_to && em_utils_is_munged_list_message (message)) reply_to = NULL; @@ -2529,15 +2526,13 @@ composer_set_body (EMsgComposer *composer, { gchar *text, *credits, *original; CamelMimePart *part; - GConfClient *client; + GSettings *settings; gboolean start_bottom, has_body_text = FALSE; guint32 validity_found = 0; - const gchar *key; - client = gconf_client_get_default (); + settings = g_settings_new ("org.gnome.evolution.mail"); - key = "/apps/evolution/mail/composer/reply_start_bottom"; - start_bottom = gconf_client_get_bool (client, key, NULL); + start_bottom = g_settings_get_boolean (settings, "composer-reply-start-bottom"); switch (style) { case E_MAIL_REPLY_STYLE_DO_NOT_QUOTE: @@ -2580,7 +2575,6 @@ composer_set_body (EMsgComposer *composer, GtkhtmlEditor *editor = GTKHTML_EDITOR (composer); gboolean move_cursor_to_end; gboolean top_signature; - const gchar *key; /* If we are placing signature on top, then move cursor to the end, * otherwise try to find the signature place and place cursor just @@ -2588,8 +2582,7 @@ composer_set_body (EMsgComposer *composer, gtkhtml_editor_run_command (editor, "block-selection"); gtkhtml_editor_run_command (editor, "cursor-bod"); - key = "/apps/evolution/mail/composer/top_signature"; - top_signature = gconf_client_get_bool (client, key, NULL); + top_signature = g_settings_get_boolean (settings, "composer-top-signature"); move_cursor_to_end = top_signature || !gtkhtml_editor_search_by_data ( @@ -2602,7 +2595,7 @@ composer_set_body (EMsgComposer *composer, gtkhtml_editor_run_command (editor, "unblock-selection"); } - g_object_unref (client); + g_object_unref (settings); } gchar * |