From ae478d1e3cbdf46dd9a34e2d84eddfb37e9dd961 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 18 Oct 2010 14:22:58 -0400 Subject: Collect mail enum types in e-mail-enums.h. And generate GTypes for each of them in e-mail-enumtypes.[ch]. Also, the glib-gen.mak script forced me to add a top-level header, which really isn't a bad idea anyway. TODO: We should do this for calendar and addressbook too. --- mail/em-account-editor.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'mail/em-account-editor.c') diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index 0cec4159a8..13468e87ac 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -251,11 +251,11 @@ emae_set_original_account (EMAccountEditor *emae, e_account_set_string ( modified_account, E_ACCOUNT_DRAFTS_FOLDER_URI, - e_mail_local_get_folder_uri (E_MAIL_FOLDER_DRAFTS)); + e_mail_local_get_folder_uri (E_MAIL_LOCAL_FOLDER_DRAFTS)); e_account_set_string ( modified_account, E_ACCOUNT_SENT_FOLDER_URI, - e_mail_local_get_folder_uri (E_MAIL_FOLDER_SENT)); + e_mail_local_get_folder_uri (E_MAIL_LOCAL_FOLDER_SENT)); /* encrypt to self by default */ e_account_set_bool (modified_account, E_ACCOUNT_PGP_ENCRYPT_TO_SELF, TRUE); @@ -617,11 +617,11 @@ default_folders_clicked (GtkButton *button, gpointer user_data) EMAccountEditor *emae = user_data; const gchar *uri; - uri = e_mail_local_get_folder_uri (E_MAIL_FOLDER_DRAFTS); + uri = e_mail_local_get_folder_uri (E_MAIL_LOCAL_FOLDER_DRAFTS); em_folder_selection_button_set_selection ((EMFolderSelectionButton *)emae->priv->drafts_folder_button, uri); emae_account_folder_changed ((EMFolderSelectionButton *)emae->priv->drafts_folder_button, emae); - uri = e_mail_local_get_folder_uri (E_MAIL_FOLDER_SENT); + uri = e_mail_local_get_folder_uri (E_MAIL_LOCAL_FOLDER_SENT); em_folder_selection_button_set_selection ((EMFolderSelectionButton *)emae->priv->sent_folder_button, uri); emae_account_folder_changed ((EMFolderSelectionButton *)emae->priv->sent_folder_button, emae); @@ -2955,14 +2955,14 @@ emae_defaults_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget button = emae_account_folder ( emae, "drafts_button", E_ACCOUNT_DRAFTS_FOLDER_URI, - E_MAIL_FOLDER_DRAFTS, builder); + E_MAIL_LOCAL_FOLDER_DRAFTS, builder); em_folder_selection_button_set_session (button, session); priv->drafts_folder_button = GTK_BUTTON (button); button = emae_account_folder ( emae, "sent_button", E_ACCOUNT_SENT_FOLDER_URI, - E_MAIL_FOLDER_SENT, builder); + E_MAIL_LOCAL_FOLDER_SENT, builder); em_folder_selection_button_set_session (button, session); priv->sent_folder_button = GTK_BUTTON (button); -- cgit v1.2.3