From 94daae3dba8e86e88f69320bc82795fe660ec9cd Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 15 Jun 2012 09:04:08 +0200 Subject: Remove the last remaining usage of GConf --- mail/Makefile.am | 35 - mail/e-mail-browser.c | 2 - mail/e-mail-migrate.c | 225 ----- mail/e-mail-reader-utils.c | 1 - mail/em-utils.c | 29 +- mail/evolution-mail.schemas.in | 1828 ---------------------------------------- mail/importers/elm-importer.c | 25 +- mail/importers/pine-importer.c | 36 +- mail/mail-send-recv.c | 3 - 9 files changed, 21 insertions(+), 2163 deletions(-) delete mode 100644 mail/evolution-mail.schemas.in (limited to 'mail') diff --git a/mail/Makefile.am b/mail/Makefile.am index 7fa3dbab9c..cd02ad6fdf 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -274,7 +274,6 @@ EXTRA_DIST = \ README.async \ mail.error.xml \ $(ui_DATA) \ - $(schema_in_files) \ $(server_in_files) \ $(etspec_DATA) \ filtertypes.xml \ @@ -295,38 +294,6 @@ evolution-mail.pure: evolution-mail endif - -# GConf - -schemadir = $(GCONF_SCHEMA_FILE_DIR) -schema_in_files = evolution-mail.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) -@INTLTOOL_SCHEMAS_RULE@ - -if GCONF_SCHEMAS_INSTALL - -if OS_WIN32 -install-data-local: - if test -z "$(DESTDIR)" ; then \ - for p in $(schema_DATA) ; do \ - (echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \ - echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \ - cmd /c _temp.bat; \ - rm _temp.bat; \ - done \ - fi -else -install-data-local: - if test -z "$(DESTDIR)" ; then \ - for p in $(schema_DATA) ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ - $(GCONFTOOL) --makefile-install-rule $$p; \ - done \ - fi -endif - -endif - # Prologue dist-hook: @@ -336,6 +303,4 @@ BUILT_SOURCES = $(error_DATA) CLEANFILES = $(BUILT_SOURCES) -DISTCLEANFILES = $(schema_DATA) - -include $(top_srcdir)/git.mk diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c index eda9d6cbc3..5b89154885 100644 --- a/mail/e-mail-browser.c +++ b/mail/e-mail-browser.c @@ -45,8 +45,6 @@ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_MAIL_BROWSER, EMailBrowserPrivate)) -#define MAIL_BROWSER_GCONF_PREFIX "/apps/evolution/mail/mail_browser" - #define ACTION_GROUP_STANDARD "action-group-standard" #define ACTION_GROUP_SEARCH_FOLDERS "action-group-search-folders" diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c index 8f913bb7c8..857523f146 100644 --- a/mail/e-mail-migrate.c +++ b/mail/e-mail-migrate.c @@ -42,8 +42,6 @@ #include -#include - #include #include #include @@ -270,152 +268,6 @@ emm_setup_initial (const gchar *data_dir) return TRUE; } -static gboolean -is_in_plugs_list (GSList *list, - const gchar *value) -{ - GSList *l; - - for (l = list; l; l = l->next) { - if (l->data && !strcmp (l->data, value)) - return TRUE; - } - - return FALSE; -} - -/* - * em_update_message_notify_settings_2_21 - * DBus plugin and sound email notification was merged to - * mail-notification plugin, so move the options to new locations. - */ -static void -em_update_message_notify_settings_2_21 (void) -{ - GConfClient *client; - GConfValue *is_key; - gboolean dbus, status; - GSList *list; - gchar *str; - gint val; - - client = gconf_client_get_default (); - - is_key = gconf_client_get ( - client, - "/apps/evolution/eplugin/mail-notification/dbus-enabled", NULL); - if (is_key) { - /* already migrated, so do not migrate again */ - gconf_value_free (is_key); - g_object_unref (client); - - return; - } - - gconf_client_set_bool ( - client, - "/apps/evolution/eplugin/mail-notification/status-blink-icon", - gconf_client_get_bool ( - client, - "/apps/evolution/mail/notification/blink-status-icon", - NULL), NULL); - gconf_client_set_bool ( - client, - "/apps/evolution/eplugin/mail-notification/status-notification", - gconf_client_get_bool ( - client, - "/apps/evolution/mail/notification/notification", - NULL), NULL); - - list = gconf_client_get_list ( - client, "/apps/evolution/eplugin/disabled", - GCONF_VALUE_STRING, NULL); - dbus = !is_in_plugs_list (list, "org.gnome.evolution.new_mail_notify"); - status = !is_in_plugs_list ( - list, "org.gnome.evolution.mail_notification"); - - gconf_client_set_bool ( - client, - "/apps/evolution/eplugin/mail-notification/dbus-enabled", - dbus, NULL); - gconf_client_set_bool ( - client, - "/apps/evolution/eplugin/mail-notification/status-enabled", - status, NULL); - - if (!status) { - GSList *plugins, *l; - - plugins = e_plugin_list_plugins (); - - for (l = plugins; l; l = l->next) { - EPlugin *p = l->data; - - if (p && p->id && !strcmp (p->id, - "org.gnome.evolution.mail_notification")) { - e_plugin_enable (p, 1); - break; - } - } - - g_slist_foreach (plugins, (GFunc) g_object_unref, NULL); - g_slist_free (plugins); - } - - g_slist_foreach (list, (GFunc) g_free, NULL); - g_slist_free (list); - - val = gconf_client_get_int ( - client, "/apps/evolution/mail/notify/type", NULL); - gconf_client_set_bool ( - client, - "/apps/evolution/eplugin/mail-notification/sound-enabled", - val == 1 || val == 2, NULL); - gconf_client_set_bool ( - client, - "/apps/evolution/eplugin/mail-notification/sound-beep", - val == 0 || val == 1, NULL); - - str = gconf_client_get_string ( - client, "/apps/evolution/mail/notify/sound", NULL); - gconf_client_set_string ( - client, - "/apps/evolution/eplugin/mail-notification/sound-file", - str ? str : "", NULL); - g_free (str); - - g_object_unref (client); -} - -/* fixing typo in SpamAssassin name */ -static void -em_update_sa_junk_setting_2_23 (void) -{ - GConfClient *client; - GConfValue *key; - - client = gconf_client_get_default (); - - key = gconf_client_get ( - client, "/apps/evolution/mail/junk/default_plugin", NULL); - if (key) { - const gchar *str = gconf_value_get_string (key); - - if (str && strcmp (str, "Spamassasin") == 0) - gconf_client_set_string ( - client, - "/apps/evolution/mail/junk/default_plugin", - "SpamAssassin", NULL); - - gconf_value_free (key); - g_object_unref (client); - - return; - } - - g_object_unref (client); -} - static gboolean mbox_to_maildir_migration_needed (EShellBackend *shell_backend) { @@ -693,66 +545,6 @@ migrate_local_store (EShellBackend *shell_backend) return TRUE; } -static void -em_ensure_proxy_ignore_hosts_being_list (void) -{ - const gchar *key = "/apps/evolution/shell/network_config/ignore_hosts"; - GConfClient *client; - GConfValue *key_value; - - /* Makes sure the 'key' is a list of strings, not a string, - * as set by previous versions. */ - - client = gconf_client_get_default (); - key_value = gconf_client_get (client, key, NULL); - if (key_value && key_value->type == GCONF_VALUE_STRING) { - gchar *value = gconf_client_get_string (client, key, NULL); - GSList *lst = NULL; - GError *error = NULL; - - if (value && *value) { - gchar **split = g_strsplit (value, ",", -1); - - if (split) { - gint ii; - - for (ii = 0; split[ii]; ii++) { - const gchar *tmp = split[ii]; - - if (tmp && *tmp) { - gchar *val = g_strstrip (g_strdup (tmp)); - - if (val && *val) - lst = g_slist_append (lst, val); - else - g_free (val); - } - } - } - - g_strfreev (split); - } - - gconf_client_unset (client, key, NULL); - gconf_client_set_list (client, key, GCONF_VALUE_STRING, lst, &error); - - g_slist_foreach (lst, (GFunc) g_free, NULL); - g_slist_free (lst); - g_free (value); - - if (error) { - fprintf ( - stderr, "%s: Failed to set a list values " - "with error: %s\n", G_STRFUNC, error->message); - g_error_free (error); - } - } - - if (key_value) - gconf_value_free (key_value); - g_object_unref (client); -} - static void em_rename_view_in_folder (gpointer data, gpointer user_data) @@ -860,23 +652,6 @@ e_mail_migrate (EShellBackend *shell_backend, if (major == 0) return emm_setup_initial (data_dir); -#ifndef G_OS_WIN32 - if (major < 2 || (major == 2 && minor < 22)) - em_update_message_notify_settings_2_21 (); - - if (major < 2 || (major == 2 && minor < 24)) - em_update_sa_junk_setting_2_23 (); -#else - if (major < 2 || (major == 2 && minor < 24)) - g_warning ( - "Upgrading from ancient versions %d.%d " - "not supported on Windows", major, minor); -#endif - - if (major < 2 || (major == 2 && minor < 32)) { - em_ensure_proxy_ignore_hosts_being_list (); - } - if (!migrate_local_store (shell_backend)) return FALSE; diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c index d1c3d3d7e5..2030350d1b 100644 --- a/mail/e-mail-reader-utils.c +++ b/mail/e-mail-reader-utils.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include "libevolution-utils/e-alert-dialog.h" diff --git a/mail/em-utils.c b/mail/em-utils.c index 9be80fbf79..f4b9891f4f 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -975,7 +975,7 @@ em_utils_selection_set_urilist (GtkSelectionData *data, gchar *tmpdir; gchar *uri; gint fd; - GConfClient *client; + GSettings *settings; gchar *exporttype; gint exportname; @@ -983,20 +983,21 @@ em_utils_selection_set_urilist (GtkSelectionData *data, if (tmpdir == NULL) return; - client = gconf_client_get_default (); - exporttype = gconf_client_get_string ( - client, "/apps/evolution/mail/save_file_format", NULL); - if (exporttype == NULL) + settings = g_settings_new ("org.gnome.evolution.mail"); + exporttype = g_settings_get_string (settings, "drag-and-drop-save-file-format"); + if (g_strcmp0 (exporttype, "mbox") != 0 && g_strcmp0 (exporttype, "pdf") != 0) { + g_free (exporttype); exporttype = g_strdup ("mbox"); - exportname = gconf_client_get_int ( - client, "/apps/evolution/mail/save_name_format", NULL); + } + exportname = g_settings_get_int (settings, "drag-and-drop-save-name-format"); + g_object_unref (settings); - if (g_ascii_strcasecmp (exporttype, "mbox")==0) { + if (g_ascii_strcasecmp (exporttype, "mbox") == 0) { gchar * file = NULL; CamelStream *fstream; if (uids->len > 1) { - gchar * tmp = g_strdup_printf(_("Messages from %s"), camel_folder_get_display_name (folder)); + gchar * tmp = g_strdup_printf (_("Messages from %s"), camel_folder_get_display_name (folder)); e_filename_make_safe (tmp); file = g_build_filename (tmpdir, tmp, NULL); g_free (tmp); @@ -1004,11 +1005,11 @@ em_utils_selection_set_urilist (GtkSelectionData *data, file = em_utils_build_export_filename (folder, uids->pdata[0], exporttype, exportname, tmpdir); } - g_free (tmpdir); fd = g_open (file, O_WRONLY | O_CREAT | O_EXCL | O_BINARY, 0666); if (fd == -1) { g_free (file); g_free (exporttype); + g_free (tmpdir); return; } @@ -1029,9 +1030,10 @@ em_utils_selection_set_urilist (GtkSelectionData *data, close (fd); g_free (exporttype); + g_free (tmpdir); g_free (file); g_free (uri); - } else if(g_ascii_strcasecmp (exporttype, "pdf")==0) { + } else if (g_ascii_strcasecmp (exporttype, "pdf") == 0) { gchar ** filenames, **uris; gint i, uris_count = 0; @@ -1066,7 +1068,6 @@ em_utils_selection_set_urilist (GtkSelectionData *data, uris[uris_count] = NULL; gtk_selection_data_set_uris (data, uris); - g_free (tmpdir); for (i = 0; i < uids->len; i++) { g_free (filenames[i]); } @@ -1076,10 +1077,10 @@ em_utils_selection_set_urilist (GtkSelectionData *data, } g_free (uris); g_free (exporttype); - - } else { g_free (tmpdir); + } else { g_free (exporttype); + g_free (tmpdir); } } diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in deleted file mode 100644 index 0e3eef3061..0000000000 --- a/mail/evolution-mail.schemas.in +++ /dev/null @@ -1,1828 +0,0 @@ - - - - - - - /schemas/apps/evolution/mail/composer/charset - /apps/evolution/mail/composer/charset - evolution-mail - string - - - Default charset in which to compose messages - - Default charset in which to compose messages. - - - - - - /schemas/apps/evolution/mail/composer/inline_spelling - /apps/evolution/mail/composer/inline_spelling - evolution-mail - bool - true - - Spell check inline - - Draw spelling error indicators on words as you type. - - - - - - /schemas/apps/evolution/mail/composer/magic_links - /apps/evolution/mail/composer/magic_links - evolution-mail - bool - true - - Automatic link recognition - - Recognize links in text and replace them. - - - - - - /schemas/apps/evolution/mail/composer/magic_smileys - /apps/evolution/mail/composer/magic_smileys - evolution-mail - bool - false - - Automatic emoticon recognition - - Recognize emoticons in text and replace them with images. - - - - - - /schemas/apps/evolution/mail/composer/group_reply_to_list - /apps/evolution/mail/composer/group_reply_to_list - evolution-mail - bool - false - - Group Reply replies to list - - Instead of the normal "Reply to All" behaviour, this option will - make the 'Group Reply' toolbar button try to reply only to the - mailing list through which you happened to receive the copy of - the message to which you're replying. - - - - - - /schemas/apps/evolution/mail/composer/sign_reply_if_signed - /apps/evolution/mail/composer/sign_reply_if_signed - evolution-mail - bool - false - - Digitally sign messages when original message signed (PGP or S/MIME) - - Automatically enable PGP or S/MIME signatures when replying - to a message which is also PGP or S/MIME signed. - - - - - - /schemas/apps/evolution/mail/composer/reply_start_bottom - /apps/evolution/mail/composer/reply_start_bottom - evolution-mail - bool - false - - Put the cursor at the bottom of replies - Users get all up in arms over where the cursor should go when - replying to a message. This determines whether the cursor is placed - at the top of the message or the bottom. - - - - - /schemas/apps/evolution/mail/composer/request_receipt - /apps/evolution/mail/composer/request_receipt - evolution-mail - bool - false - - Always request read receipt - - Whether a read receipt request gets added to every message by default. - - - - - - /schemas/apps/evolution/mail/composer/send_html - /apps/evolution/mail/composer/send_html - evolution-mail - bool - false - - Send HTML mail by default - - Send HTML mail by default. - - - - - - /schemas/apps/evolution/mail/composer/spell_color - /apps/evolution/mail/composer/spell_color - evolution-mail - string - #FFFF00000000 - - Spell checking color - - Underline color for misspelled words when using inline spelling. - - - - - - /schemas/apps/evolution/mail/composer/spell_languages - /apps/evolution/mail/composer/spell_languages - evolution-mail - list - string - [] - - Spell checking languages - - List of dictionary language codes used for spell checking. - - - - - - /schemas/apps/evolution/mail/composer/show_mail_bcc - /apps/evolution/mail/composer/show_mail_bcc - evolution-mail - bool - false - - Show "Bcc" field when sending a mail message - - Show the "Bcc" field when sending a mail message. This is - controlled from the View menu when a mail account is chosen. - - - - - - /schemas/apps/evolution/mail/composer/show_mail_cc - /apps/evolution/mail/composer/show_mail_cc - evolution-mail - bool - true - - Show "Cc" field when sending a mail message - - Show the "Cc" field when sending a mail message. This is - controlled from the View menu when a mail account is chosen. - - - - - - /schemas/apps/evolution/mail/composer/show_mail_reply_to - /apps/evolution/mail/composer/show_mail_reply_to - evolution-mail - bool - false - - Show "Reply To" field when sending a mail message - - Show the "Reply To" field when sending a mail message. This - is controlled from the View menu when a mail account is chosen. - - - - - - /schemas/apps/evolution/mail/composer/show_post_from - /apps/evolution/mail/composer/show_post_from - evolution-mail - bool - true - - Show "From" field when posting to a newsgroup - - Show the "From" field when posting to a newsgroup. This is - controlled from the View menu when a news account is chosen. - - - - - - /schemas/apps/evolution/mail/composer/show_post_reply_to - /apps/evolution/mail/composer/show_post_reply_to - evolution-mail - bool - false - - Show "Reply To" field when posting to a newsgroup - - Show the "Reply To" field when posting to a newsgroup. This - is controlled from the View menu when a news account is chosen. - - - - - - /schemas/apps/evolution/mail/composer/outlook_filenames - /apps/evolution/mail/composer/outlook_filenames - evolution-mail - bool - false - - Encode filenames in an Outlook/GMail way - - Encode filenames in the mail headers same as Outlook or GMail do, to let them display correctly filenames with UTF-8 letters sent by Evolution, because they do not follow the RFC 2231, but use the incorrect RFC 2047 standard. - - - - - - /schemas/apps/evolution/mail/composer/top_signature - /apps/evolution/mail/composer/top_signature - evolution-mail - bool - false - - Put personalized signatures at the top of replies - Users get all up in arms over where their signature should go - when replying to a message. This determines whether the signature is - placed at the top of the message or the bottom. - - - - - /schemas/apps/evolution/mail/composer/no_signature_delim - /apps/evolution/mail/composer/no_signature_delim - evolution-mail - bool - false - - Do not add signature delimiter - Set to TRUE in case you do not want to add signature delimiter - before your signature when composing a mail. - - - - - /schemas/apps/evolution/mail/composer/width - /apps/evolution/mail/composer/width - evolution-mail - int - 600 - - Composer Window default width - Default width of the Composer Window. - - - - - /schemas/apps/evolution/mail/composer/height - /apps/evolution/mail/composer/height - evolution-mail - int - 500 - - Composer Window default height - Default height of the Composer Window. - - - - - /schemas/apps/evolution/mail/composer/ignore_list_reply_to - /apps/evolution/mail/composer/ignore_list_reply_to - evolution-mail - bool - false - - Ignore list Reply-To: - - Some mailing lists set a Reply-To: header to trick users into - sending replies to the list, even when they ask Evolution to - make a private reply. Setting this option to TRUE will attempt - to ignore such Reply-To: headers, so that Evolution will do - as you ask it. If you use the private reply action, it will - reply privately, while if you use the 'Reply to List' action - it will do that. It works by comparing the Reply-To: header - with a List-Post: header, if there is one. - - - - - - /schemas/apps/evolution/mail/composer/message_attribution - /apps/evolution/mail/composer/message_attribution - evolution-mail - string - - - Attribute message. - The text that is inserted when replying to a message, - attributing the message to the original author. - - - - - /schemas/apps/evolution/mail/composer/message_forward - /apps/evolution/mail/composer/message_forward - evolution-mail - string - - - Forward message. - The text that is inserted when forwarding a message, - saying that the forwarded message follows. - - - - - /schemas/apps/evolution/mail/composer/message_original - /apps/evolution/mail/composer/message_original - evolution-mail - string - - - Original message. - The text that is inserted when replying to a message (top - posting), saying that the original message follows. - - - - - /schemas/apps/evolution/mail/composer/gallery_path - /apps/evolution/mail/composer/gallery_path - evolution-mail - string - - - Path where picture gallery should search for its content - This value can be an empty string, which means it'll use - the system Picture folder, usually set to ~/Pictures. This folder will - be also used when the set path is not pointing to the existent folder. - - - - - - - /schemas/apps/evolution/mail/display/animated_images - /apps/evolution/mail/display/animated_images - evolution-mail - bool - false - - Show image animations - Enable animated images in HTML mail. Many users find animated - images annoying and prefer to see a static image instead. - - - - - /schemas/apps/evolution/mail/display/side_bar_search - /apps/evolution/mail/display/side_bar_search - evolution-mail - bool - true - - Enable or disable type ahead search feature - - Enable the side bar search feature to allow interactive searching of folder names. - - - - - - /schemas/apps/evolution/mail/display/no_folder_dots - /apps/evolution/mail/display/no_folder_dots - evolution-mail - bool - false - - Disable or enable ellipsizing of folder names in side bar - - Whether disable ellipsizing feature of folder names in side bar. - - - - - - /schemas/apps/evolution/mail/display/magic_spacebar - /apps/evolution/mail/display/magic_spacebar - evolution-mail - bool - true - - Enable or disable magic space bar - Enable this to use Space bar key to scroll in message preview, message list and folders. - - - - - - /schemas/apps/evolution/mail/display/global_view_setting - /apps/evolution/mail/display/global_view_setting - evolution-mail - bool - false - - Enable to use a similar message list view settings for all folders - Enable to use a similar message list view settings for all folders. - - - - - - /schemas/apps/evolution/mail/display/mark_citations - /apps/evolution/mail/display/mark_citations - evolution-mail - bool - true - - Mark citations in the message "Preview" - - Mark citations in the message "Preview". - - - - - - /schemas/apps/evolution/mail/display/citation_colour - /apps/evolution/mail/display/citation_colour - evolution-mail - string - #737373 - - Citation highlight color - - Citation highlight color. - - - - - - /schemas/apps/evolution/mail/display/caret_mode - /apps/evolution/mail/display/caret_mode - evolution-mail - bool - false - - Enable/disable caret mode - - Enable caret mode, so that you can see a cursor when reading mail. - - - - - - /schemas/apps/evolution/mail/display/charset - /apps/evolution/mail/display/charset - evolution-mail - string - - - Default charset in which to display messages - - Default charset in which to display messages. - - - - - - /schemas/apps/evolution/mail/display/load_http_images - /apps/evolution/mail/display/load_http_images - evolution-mail - int - 0 - - Load images for HTML messages over HTTP - - Load images for HTML messages over HTTP(S). Possible values are: - "0" - Never load images off the net. - "1" - Load images in messages from contacts. - "2" - Always load images off the net. - - - - - - /schemas/apps/evolution/mail/display/animate_images - /apps/evolution/mail/display/animate_images - evolution-mail - bool - true - - Show Animations - - Show animated images as animations. - - - - - - /schemas/apps/evolution/mail/display/show_all_headers - /apps/evolution/mail/display/show_all_headers - evolution-mail - bool - false - - Show all message headers - - Show all the headers when viewing a messages. - - - - - - /schemas/apps/evolution/mail/display/headers - /apps/evolution/mail/display/headers - evolution-mail - list - string - [] - - List of custom headers and whether they are enabled. - - This key should contain a list of XML structures specifying custom headers, - and whether they are to be displayed. The format of the XML structure is - <header enabled> - set enabled if the header is to be displayed - in the mail view. - - - - - - /schemas/apps/evolution/mail/display/sender_photo - /apps/evolution/mail/display/sender_photo - evolution-mail - bool - false - - Show photo of the sender - - Show the photo of the sender in the message reading pane. - - - - - /schemas/apps/evolution/mail/display/photo_local - /apps/evolution/mail/display/photo_local - evolution-mail - bool - true - - Search for the sender photo in local address books - - This option would help in improving the speed of fetching. - - - - - - /schemas/apps/evolution/mail/display/mime_types - /apps/evolution/mail/display/mime_types - evolution-mail - list - string - [] - - List of MIME types to check for Bonobo component viewers - - If there isn't a builtin viewer for a particular MIME type inside Evolution, - any MIME types appearing in this list which map to a Bonobo component viewer - in GNOME's MIME type database may be used for displaying content. - - - - - - /schemas/apps/evolution/mail/display/mark_seen - /apps/evolution/mail/display/mark_seen - evolution-mail - bool - true - - Mark as Seen after specified timeout - - Mark as Seen after specified timeout. - - - - - - /schemas/apps/evolution/mail/display/show_email - /apps/evolution/mail/display/show_email - evolution-mail - bool - false - - Sender email-address column in the message list - - Show the email-address of the sender in a separate column in the message list. - - - - - - /schemas/apps/evolution/mail/display/vertical_view_fonts - /apps/evolution/mail/display/vertical_view_fonts - evolution-mail - bool - false - - Determines whether to use the same fonts for both "From" and "Subject" lines in the "Messages" column in vertical view. - - Determines whether to use the same fonts for both "From" and "Subject" lines in the "Messages" column in vertical view. - - - - - - /schemas/apps/evolution/mail/display/mark_seen_timeout - /apps/evolution/mail/display/mark_seen_timeout - evolution-mail - int - 1500 - - Timeout for marking messages as seen - - Timeout in milliseconds for marking messages as seen. - - - - - - /schemas/apps/evolution/mail/display/show_deleted - /apps/evolution/mail/display/show_deleted - evolution-mail - bool - false - - Show deleted messages in the message-list - - Show deleted messages (with a strike-through) in the message-list. - - - - - - /schemas/apps/evolution/mail/display/enable_vfolders - /apps/evolution/mail/display/enable_vfolders - evolution-mail - bool - true - - Enable search folders - - Enable search folders on startup. - - - - - - /schemas/apps/evolution/mail/display/enable_local - /apps/evolution/mail/display/enable_local - evolution-mail - bool - true - - Enable local folders - - Whether to show local folders (On This Computer) in a folder tree. - - - - - - /schemas/apps/evolution/mail/display/safe_list - /apps/evolution/mail/display/safe_list - evolution-mail - bool - false - - Hides the per-folder preview and removes the selection - - This key is read only once and reset to "false" after read. This - unselects the mail in the list and removes the preview for that - folder. - - - - - - /schemas/apps/evolution/mail/display/paned_size - /apps/evolution/mail/display/paned_size - evolution-mail - int - 144 - - Height of the message-list pane - - Height of the message-list pane. - - - - - - /schemas/apps/evolution/mail/display/hpaned_size - /apps/evolution/mail/display/hpaned_size - evolution-mail - int - 450 - - Width of the message-list pane - - Width of the message-list pane. - - - - - - /schemas/apps/evolution/mail/display/layout - /apps/evolution/mail/display/layout - evolution-mail - int - 0 - - Layout style - - The layout style determines where to place the preview pane - in relation to the message list. "0" (Classic View) places - the preview pane below the message list. "1" (Vertical View) - places the preview pane next to the message list. - - - - - - /schemas/apps/evolution/mail/display/fonts/variable - /apps/evolution/mail/display/fonts/variable - evolution-mail - string - Sans 12 - - Variable width font - - The variable width font for mail display. - - - - - - /schemas/apps/evolution/mail/display/fonts/monospace - /apps/evolution/mail/display/fonts/monospace - evolution-mail - string - Monospace 12 - - Terminal font - - The terminal font for mail display. - - - - - - /schemas/apps/evolution/mail/display/fonts/use_custom - /apps/evolution/mail/display/fonts/use_custom - evolution-mail - bool - false - - Use custom fonts - - Use custom fonts for displaying mail. - - - - - - /schemas/apps/evolution/mail/display/address_compress - /apps/evolution/mail/display/address_compress - evolution-mail - bool - true - - Compress display of addresses in TO/CC/BCC - - Compress display of addresses in TO/CC/BCC to the number - specified in address_count. - - - - - - /schemas/apps/evolution/mail/display/force_message_limit - /apps/evolution/mail/display/force_message_limit - evolution-mail - bool - true - - Display only message texts not exceeding certain size - - Enable to display only message texts not exceeding size defined in 'message_text_part_limit' key. - - - - - - /schemas/apps/evolution/mail/display/message_text_part_limit - /apps/evolution/mail/display/message_text_part_limit - evolution-mail - int - 4096 - - Message text limit for display - - This decides the max size of the message text that will be displayed under - Evolution, specified in terms of KB. The default is 4096 (4MB). This value - is used only when 'force_message_limit' key is activated. - - - - - - /schemas/apps/evolution/mail/display/address_count - /apps/evolution/mail/display/address_count - evolution-mail - int - 5 - - Number of addresses to display in TO/CC/BCC - - This sets the number of addresses to show in default message list - view, beyond which a '...' is shown. - - - - - - /schemas/apps/evolution/mail/display/thread_subject - /apps/evolution/mail/display/thread_subject - evolution-mail - bool - false - - Thread the message-list based on Subject - - Whether or not to fall back on threading by subjects when the - messages do not contain In-Reply-To or References headers. - - - - - - /schemas/apps/evolution/mail/display/thread_expand - /apps/evolution/mail/display/thread_expand - evolution-mail - bool - true - - Default value for thread expand state - - This setting specifies whether the threads should be in expanded - or collapsed state by default. Requires a restart to apply. - - - - - - /schemas/apps/evolution/mail/display/thread_latest - /apps/evolution/mail/display/thread_latest - evolution-mail - bool - true - - Whether sort threads based on latest message in that thread - - This setting specifies whether the threads should be sorted based - on latest message in each thread, rather than by message's date. - Evolution requires a restart. - - - - - - /schemas/apps/evolution/mail/display/paned_view_headers_state - /apps/evolution/mail/display/paned_view_headers_state - evolution-mail - int - 0 - - State of message headers in paned view - - Describes whether message headers in paned view should be collapsed or expanded by default. - "0" = expanded - "1" = collapsed - - - - - - /schemas/apps/evolution/mail/display/sort_accounts_alpha - /apps/evolution/mail/display/sort_accounts_alpha - evolution-mail - bool - true - - Sort accounts alphabetically in a folder tree - - Tells how to sort accounts in a folder tree used in a Mail view. - When set to true accounts are sorted alphabetically, with an exception - of On This Computer and Search folders, otherwise accounts are - sorted based on an order given by a user. - - - - - - - - /schemas/apps/evolution/mail/mail_browser_width - /apps/evolution/mail/mail_browser_width - evolution-mail - int - 600 - - Mail browser width - Default width of the mail browser window. - - - - - /schemas/apps/evolution/mail/mail_browser_height - /apps/evolution/mail/mail_browser_height - evolution-mail - int - 400 - - Mail browser height - Default height of the mail browser window. - - - - - /schemas/apps/evolution/mail/mail_browser_maximized - /apps/evolution/mail/mail_browser_maximized - evolution-mail - bool - false - - Mail browser maximized - Default maximized state of the mail browser window. - - - - - - - /schemas/apps/evolution/mail/subscription_editor_height - /apps/evolution/mail/subscription_editor_height - evolution-mail - int - 400 - - "Folder Subscriptions" window height - - Initial height of the "Folder Subscriptions" window. - The value updates as the user resizes the window vertically. - - - - - - /schemas/apps/evolution/mail/subscription_editor_maximized - /apps/evolution/mail/subscription_editor_maximized - bool - false - - "Folder Subscriptions" window maximize state - - Initial maximize state of the "Folder Subscriptions" window. - The value updates when the user maximizes or unmaximizes the - window. Note, this particular value is not used by Evolution - since the "Folder Subscriptions" window cannot be maximized. - This key exists only as an implementation detail. - - - - - - /schemas/apps/evolution/mail/subscription_editor_width - /apps/evolution/mail/subscription_editor_width - evolution-mail - int - 600 - - "Folder Subscriptions" window width - - Initial width of the "Folder Subscriptions" window. - The value updates as the user resizes the window horizontally. - - - - - - - - /schemas/apps/evolution/mail/filters/log - /apps/evolution/mail/filters/log - evolution-mail - bool - false - - Log filter actions - - Log filter actions to the specified log file. - - - - - - /schemas/apps/evolution/mail/filters/logfile - /apps/evolution/mail/filters/logfile - evolution-mail - string - - - Logfile to log filter actions - - Logfile to log filter actions. - - - - - - /schemas/apps/evolution/mail/filters/flush-outbox - /apps/evolution/mail/filters/flush-outbox - evolution-mail - bool - false - - Flush Outbox after filtering - - Whether to flush Outbox after filtering is done. Outbox flush will happen - only when there was used any 'Forward to' filter action and approximately - one minute after the last action invocation. - - - - - - - - /schemas/apps/evolution/mail/format/forward_style - /apps/evolution/mail/format/forward_style - evolution-mail - int - 0 - - Default forward style - - - - - - - - /schemas/apps/evolution/mail/format/reply_style - /apps/evolution/mail/format/reply_style - evolution-mail - int - 0 - - Default reply style - - - - - - - - /schemas/apps/evolution/mail/format/message_display_style - /apps/evolution/mail/format/message_display_style - evolution-mail - int - 0 - - Message-display style ("normal", "full headers", "source") - - - - - - - - - - /schemas/apps/evolution/mail/prompts/empty_subject - /apps/evolution/mail/prompts/empty_subject - evolution-mail - bool - true - - Prompt on empty subject - - Prompt the user when he or she tries to send a message - without a Subject. - - - - - - /schemas/apps/evolution/mail/prompts/expunge - /apps/evolution/mail/prompts/expunge - evolution-mail - bool - true - - Prompt when user expunges - - Prompt the user when he or she tries to expunge a folder. - - - - - - /schemas/apps/evolution/mail/prompts/only_bcc - /apps/evolution/mail/prompts/only_bcc - evolution-mail - bool - true - - Prompt when user only fills Bcc - - Prompt when user tries to send a message with no To or Cc recipients. - - - - - - /schemas/apps/evolution/mail/prompts/unwanted_html - /apps/evolution/mail/prompts/unwanted_html - evolution-mail - bool - true - - Prompt when user tries to send unwanted HTML - - Prompt when user tries to send HTML mail to recipients that - may not want to receive HTML mail. - - - - - - /schemas/apps/evolution/mail/prompts/open_many - /apps/evolution/mail/prompts/open_many - evolution-mail - bool - true - - Prompt when user tries to open 10 or more messages at once - - If a user tries to open 10 or more messages at one time, ask the user - if they really want to do it. - - - - - - /schemas/apps/evolution/mail/prompts/mark_all_read - /apps/evolution/mail/prompts/mark_all_read - evolution-mail - bool - true - - Prompt while marking multiple messages - - Enable or disable the prompt whilst marking multiple messages. - - - - - - /schemas/apps/evolution/mail/prompts/delete_in_vfolder - /apps/evolution/mail/prompts/delete_in_vfolder - evolution-mail - bool - false - - Prompt when deleting messages in search folder - - It disables/enables the repeated prompts to warn that deleting - messages from a search folder permanently deletes the message, not - simply removing it from the search results. - - - - - - /schemas/apps/evolution/mail/prompts/private_list_reply - /apps/evolution/mail/prompts/private_list_reply - evolution-mail - bool - true - - Prompt when replying privately to list messages - - It disables/enables the repeated prompts to warn that you are - sending a private reply to a message which arrived via a - mailing list. - - - - - - /schemas/apps/evolution/mail/prompts/list_reply_to - /apps/evolution/mail/prompts/list_reply_to - evolution-mail - bool - true - - Prompt when mailing list hijacks private replies - It disables/enables the repeated prompts to warn that you are trying sending a private reply to a message which arrived via a mailing list, but the list sets a Reply-To: header which redirects your reply back to the list - - - - - /schemas/apps/evolution/mail/prompts/reply_many_recips - /apps/evolution/mail/prompts/reply_many_recips - evolution-mail - bool - true - - Prompt when replying to many recipients - - It disables/enables the repeated prompts to warn that you are - sending a reply to many people. - - - - - - /schemas/apps/evolution/mail/prompts/reply_close_browser - /apps/evolution/mail/prompts/reply_close_browser - evolution-mail - string - ask - - Asks whether to close the message window when the user forwards or replies to the message shown in the window - - Possible values are: - never - to never close browser window - always - to always close browser window - ask - (or any other value) will ask user - - - - - - /schemas/apps/evolution/mail/prompts/send_invalid_recip - /apps/evolution/mail/prompts/send_invalid_recip - evolution-mail - bool - true - - Prompt before sending to recipients not entered as mail addresses - It disables/enables the repeated prompts to warn that you are trying to send a message to recipients not entered as mail addresses - - - - - - - /schemas/apps/evolution/mail/trash/empty_on_exit - /apps/evolution/mail/trash/empty_on_exit - evolution-mail - bool - false - - Empty Trash folders on exit - - Empty all Trash folders when exiting Evolution. - - - - - - /schemas/apps/evolution/mail/trash/empty_on_exit_days - /apps/evolution/mail/trash/empty_on_exit_days - evolution-mail - int - 0 - - Minimum days between emptying the trash on exit - - Minimum time between emptying the trash on exit, in days. - - - - - - /schemas/apps/evolution/mail/trash/empty_date - /apps/evolution/mail/trash/empty_date - evolution-mail - int - 0 - - Last time Empty Trash was run - - The last time Empty Trash was run, in days since January 1st, 1970 (Epoch). - - - - - - /schemas/apps/evolution/mail/display/error_timeout - /apps/evolution/mail/display/error_timeout - evolution-mail - int - 60 - - Amount of time in seconds the error should be shown on the status bar. - - Amount of time in seconds the error should be shown on the status bar. - - - - - /schemas/apps/evolution/mail/display/error_level - /apps/evolution/mail/display/error_level - evolution-mail - int - 0 - - Level beyond which the message should be logged. - - This can have three possible values. "0" for errors. - "1" for warnings. "2" for debug messages. - - - - - - /schemas/apps/evolution/mail/display/show_real_date - /apps/evolution/mail/display/show_real_date - evolution-mail - bool - true - - Show original "Date" header value. - - Show the original "Date" header (with a local time only if the time zone differs). - Otherwise always show "Date" header value in a user preferred format and local time zone. - - - - - - - - - /schemas/apps/evolution/mail/labels - /apps/evolution/mail/labels - evolution-mail - list - string - [I_mportant:#EF2929,_Work:#F57900,_Personal:#4E9A06,_To Do:#3465A4,_Later:#75507B] - - List of Labels and their associated colors - - List of labels known to the mail component of - Evolution. The list contains strings containing name:color - where color uses the HTML hex encoding. - - - - - - - - /schemas/apps/evolution/mail/junk/check_incoming - /apps/evolution/mail/junk/check_incoming - evolution-mail - bool - true - - Check incoming mail being junk - - Run junk test on incoming mail. - - - - - - /schemas/apps/evolution/mail/junk/empty_on_exit - /apps/evolution/mail/junk/empty_on_exit - evolution-mail - bool - false - - Empty Junk folders on exit - - Empty all Junk folders when exiting Evolution. - - - - - - /schemas/apps/evolution/mail/junk/empty_on_exit_days - /apps/evolution/mail/junk/empty_on_exit_days - evolution-mail - int - 0 - - Minimum days between emptying the junk on exit - - Minimum time between emptying the junk on exit, in days. - - - - - - /schemas/apps/evolution/mail/junk/empty_date - /apps/evolution/mail/junk/empty_date - evolution-mail - int - 0 - - Last time Empty Junk was run - - The last time Empty Junk was run, in days since January 1st, 1970 (Epoch). - - - - - - /schemas/apps/evolution/mail/junk/default_plugin - /apps/evolution/mail/junk/default_plugin - evolution-mail - string - Bogofilter - - The default plugin for Junk hook - - This is the default junk plugin, even though there are multiple plugins - enabled. If the default listed plugin is disabled, then it won't fall back - to the other available plugins. - - - - - - /schemas/apps/evolution/mail/junk/lookup_addressbook - /apps/evolution/mail/junk/lookup_addressbook - evolution-mail - bool - false - - Determines whether to lookup in address book for sender email - - Determines whether to lookup the sender email in address book. If found, it shouldn't be a spam. It looks up in the books marked for autocompletion. It can be slow, if remote address books (like LDAP) are marked for autocompletion. - - - - - - /schemas/apps/evolution/mail/junk/lookup_addressbook_local_only - /apps/evolution/mail/junk/lookup_addressbook_local_only - evolution-mail - bool - false - - Determines whether to look up addresses for junk filtering in local address book only - - This option is related to the key lookup_addressbook and is used to determine whether to look up addresses in local address book only to exclude mail sent by known contacts from junk filtering. - - - - - - /schemas/apps/evolution/mail/junk/check_custom_header - /apps/evolution/mail/junk/check_custom_header - evolution-mail - bool - true - - Determines whether to use custom headers to check for junk - - Determines whether to use custom headers to check for junk. If this option is enabled and the headers are mentioned, it will be improve the junk checking speed. - - - - - /schemas/apps/evolution/mail/junk/custom_header - /apps/evolution/mail/junk/custom_header - evolution-mail - list - string - [X-Spam-Flag=YES,X-Spam-Level=*****] - - Custom headers to use while checking for junk. - - Custom headers to use while checking for junk. The list elements - are string in the format "headername=value". - - - - - - - /schemas/apps/evolution/mail/default_account - /apps/evolution/mail/default_account - evolution-mail - string - - - UID string of the default account. - - UID string of the default account. - - - - - - /schemas/apps/evolution/mail/accounts - /apps/evolution/mail/accounts - evolution-mail - list - string - [] - - List of accounts - - List of accounts known to the mail component of - Evolution. The list contains strings naming - subdirectories relative to /apps/evolution/mail/accounts. - - - - - - /schemas/apps/evolution/mail/licenses - /apps/evolution/mail/licenses - evolution-mail - list - string - [] - - List of accepted licenses - - List of protocol names whose license has been accepted. - - - - - - - - /schemas/apps/evolution/mail/save_dir - /apps/evolution/mail/save_dir - evolution-mail - string - - - Save directory - - Directory for saving mail component files. - - - - - - - - /schemas/apps/evolution/mail/filter_editor_height - /apps/evolution/mail/filter_editor_height - int - 650 - - "Filter Editor" window height - - Initial height of the "Filter Editor" window. - The value updates as the user resizes the window vertically. - - - - - - /schemas/apps/evolution/mail/filter_editor_maximized - /apps/evolution/mail/filter_editor_maximized - bool - false - - "Filter Editor" window maximize state - - Initial maximize state of the "Filter Editor" window. - The value updates when the user maximizes or unmaximizes the - window. Note, this particular value is not used by Evolution - since the "Filter Editor" window cannot be maximized. This - key exists only as an implementation detail. - - - - - - /schemas/apps/evolution/mail/filter_editor_width - /apps/evolution/mail/filter_editor_width - int - 400 - - "Filter Editor" window width - - Initial width of the "Filter Editor" window. - The value updates as the user resizes the window horizontally. - - - - - - /schemas/apps/evolution/mail/send_recv_on_start - /apps/evolution/mail/send_recv_on_start - evolution-mail - bool - true - - Check for new messages on start - - Whether check for new messages when Evolution is started. - This includes also sending messages from Outbox. - - - - - - /schemas/apps/evolution/mail/send_recv_all_on_start - /apps/evolution/mail/send_recv_all_on_start - evolution-mail - bool - false - - Check for new messages in all active accounts - - Whether check for new messages in all active accounts regardless - of the account "Check for new messages every X minutes" option - when Evolution is started. This option is used only together - with 'send_recv_on_start' option. - - - - - - /schemas/apps/evolution/mail/send_recv_height - /apps/evolution/mail/send_recv_height - evolution-mail - int - 200 - - "Send and Receive Mail" window height - - Initial height of the "Send and Receive Mail" window. - The value updates as the user resizes the window vertically. - - - - - - /schemas/apps/evolution/mail/send_recv_maximized - /apps/evolution/mail/send_recv_maximized - evolution-mail - bool - false - - "Send and Receive Mail" window maximize state - - Initial maximize state of the "Send and Receive Mail" window. - The value updates when the user maximizes or unmaximizes the - window. Note, this particular value is not used by Evolution - since the "Send and Receive Mail" window cannot be maximized. - This key exists only as an implementation detail. - - - - - - /schemas/apps/evolution/mail/send_recv_width - /apps/evolution/mail/send_recv_width - evolution-mail - int - 600 - - "Send and Receive Mail" window width - - Initial width of the "Send and Receive Mail" window. - The value updates as the user resizes the window horizontally. - - - - - - /schemas/apps/evolution/mail/vfolder_editor_height - /apps/evolution/mail/vfolder_editor_height - int - 650 - - "Search Folder Editor" window height - - Initial height of the "Search Folder Editor" window. - The value updates as the user resizes the window vertically. - - - - - - /schemas/apps/evolution/mail/vfolder_editor_maximized - /apps/evolution/mail/vfolder_editor_maximized - bool - false - - "Search Folder Editor" window maximize state - - Initial maximize state of the "Search Folder Editor" window. - The value updates when the user maximizes or unmaximizes the - window. Note, this particular value is not used by Evolution - since the "Search Folder Editor" window cannot be maximized. - This key exists only as an implementation detail. - - - - - - /schemas/apps/evolution/mail/vfolder_editor_width - /apps/evolution/mail/vfolder_editor_width - int - 400 - - "Search Folder Editor" window width - - Initial width of the "Search Folder Editor" window. - The value updates as the user resizes the window horizontally. - - - - - - - - /schemas/apps/evolution/mail/save_file_format - /apps/evolution/mail/save_file_format - evolution-mail - string - mbox - - Drag'n'drop export format - - Define the email export format when doing drag'n'drop. - Possible values are mbox or pdf - - - - - - /schemas/apps/evolution/mail/save_name_format - /apps/evolution/mail/save_name_format - evolution-mail - int - 1 - - Format of the drag'n'drop export filename - - Exported filename will be YYYYmmDDHHMMSS_email_title - Possible values: 1 (: email sent date), 2 (: drag'n'drop date) - - - - - - - - /schemas/apps/evolution/mail/sync_interval - /apps/evolution/mail/sync_interval - evolution-mail - int - 60 - - Server synchronization interval - - Controls how frequently local changes are synchronized with the - remote mail server. The interval must be at least 30 seconds. - - - - - - diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c index bebcf97dd9..24db1041e3 100644 --- a/mail/importers/elm-importer.c +++ b/mail/importers/elm-importer.c @@ -36,8 +36,6 @@ #include #include -#include - #include "mail-importer.h" #include "libemail-utils/mail-mt.h" @@ -221,18 +219,6 @@ elm_import_exec (struct _elm_import_msg *m, static void elm_import_done (struct _elm_import_msg *m) { - printf("importing complete\n"); - - if (m->base.error == NULL) { - GConfClient *gconf; - const gchar *key; - - gconf = gconf_client_get_default (); - key = "/apps/evolution/importer/elm/mail"; - gconf_client_set_bool (gconf, key, TRUE, NULL); - g_object_unref (gconf); - } - e_import_complete (m->import, (EImportTarget *) m->target); } @@ -337,21 +323,14 @@ elm_getwidget (EImport *ei, EImportImporter *im) { GtkWidget *box, *w; - GConfClient *gconf; - gboolean done_mail; - - gconf = gconf_client_get_default (); - done_mail = gconf_client_get_bool ( - gconf, "/apps/evolution/importer/elm/mail", NULL); - g_object_unref (gconf); g_datalist_set_data ( - &target->data, "elm-do-mail", GINT_TO_POINTER(!done_mail)); + &target->data, "elm-do-mail", GINT_TO_POINTER(TRUE)); box = gtk_vbox_new (FALSE, 2); w = gtk_check_button_new_with_label(_("Mail")); - gtk_toggle_button_set_active ((GtkToggleButton *) w, !done_mail); + gtk_toggle_button_set_active ((GtkToggleButton *) w, TRUE); g_signal_connect ( w, "toggled", G_CALLBACK (checkbox_toggle_cb), target); diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c index b5dcd38cd7..dbcc488f03 100644 --- a/mail/importers/pine-importer.c +++ b/mail/importers/pine-importer.c @@ -36,8 +36,6 @@ #include #include -#include - #include #include "mail-importer.h" @@ -291,23 +289,6 @@ pine_import_exec (struct _pine_import_msg *m, static void pine_import_done (struct _pine_import_msg *m) { - printf("importing complete\n"); - - if (m->base.error == NULL) { - GConfClient *gconf; - - gconf = gconf_client_get_default (); - if (GPOINTER_TO_INT(g_datalist_get_data(&m->target->data, "pine-do-addr"))) - gconf_client_set_bool ( - gconf, "/apps/evolution/importer/pine/addr", - TRUE, NULL); - if (GPOINTER_TO_INT(g_datalist_get_data(&m->target->data, "pine-do-mail"))) - gconf_client_set_bool ( - gconf, "/apps/evolution/importer/pine/mail", - TRUE, NULL); - g_object_unref (gconf); - } - e_import_complete (m->import, (EImportTarget *) m->target); } @@ -429,34 +410,25 @@ pine_getwidget (EImport *ei, EImportImporter *im) { GtkWidget *box, *w; - GConfClient *gconf; - gboolean done_mail, done_addr; - - gconf = gconf_client_get_default (); - done_mail = gconf_client_get_bool ( - gconf, "/apps/evolution/importer/pine/mail", NULL); - done_addr = gconf_client_get_bool ( - gconf, "/apps/evolution/importer/pine/address", NULL); - g_object_unref (gconf); g_datalist_set_data ( &target->data, "pine-do-mail", - GINT_TO_POINTER (!done_mail)); + GINT_TO_POINTER (TRUE)); g_datalist_set_data ( &target->data, "pine-do-addr", - GINT_TO_POINTER (!done_addr)); + GINT_TO_POINTER (TRUE)); box = gtk_vbox_new (FALSE, 2); w = gtk_check_button_new_with_label(_("Mail")); - gtk_toggle_button_set_active ((GtkToggleButton *) w, !done_mail); + gtk_toggle_button_set_active ((GtkToggleButton *) w, TRUE); g_signal_connect ( w, "toggled", G_CALLBACK (checkbox_mail_toggle_cb), target); gtk_box_pack_start ((GtkBox *) box, w, FALSE, FALSE, 0); w = gtk_check_button_new_with_label(_("Address Book")); - gtk_toggle_button_set_active ((GtkToggleButton *) w, !done_addr); + gtk_toggle_button_set_active ((GtkToggleButton *) w, TRUE); g_signal_connect ( w, "toggled", G_CALLBACK (checkbox_addr_toggle_cb), target); diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index a132327585..1670cf04c2 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -58,9 +58,6 @@ /* pseudo-uri to key the send task on */ #define SEND_URI_KEY "send-task:" -/* Prefix for window size GConf keys */ -#define GCONF_KEY_PREFIX "/apps/evolution/mail/send_recv" - /* send/receive email */ /* ********************************************************************** */ -- cgit v1.2.3