diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-10-19 02:22:58 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-10-19 02:31:16 +0800 |
| commit | ae478d1e3cbdf46dd9a34e2d84eddfb37e9dd961 (patch) | |
| tree | 0e7ad99f50070f6c52d7c4b6e225c3c044afe04c /plugins | |
| parent | 0e7b23b94da808d3935f76aae53ad8a96ac06dd9 (diff) | |
| download | gsoc2013-evolution-ae478d1e3cbdf46dd9a34e2d84eddfb37e9dd961.tar gsoc2013-evolution-ae478d1e3cbdf46dd9a34e2d84eddfb37e9dd961.tar.gz gsoc2013-evolution-ae478d1e3cbdf46dd9a34e2d84eddfb37e9dd961.tar.bz2 gsoc2013-evolution-ae478d1e3cbdf46dd9a34e2d84eddfb37e9dd961.tar.lz gsoc2013-evolution-ae478d1e3cbdf46dd9a34e2d84eddfb37e9dd961.tar.xz gsoc2013-evolution-ae478d1e3cbdf46dd9a34e2d84eddfb37e9dd961.tar.zst gsoc2013-evolution-ae478d1e3cbdf46dd9a34e2d84eddfb37e9dd961.zip | |
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 <mail/e-mail.h>
top-level header, which really isn't a bad idea anyway.
TODO: We should do this for calendar and addressbook too.
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/dbx-import/dbx-importer.c | 2 | ||||
| -rw-r--r-- | plugins/pst-import/pst-importer.c | 2 | ||||
| -rw-r--r-- | plugins/templates/templates.c | 7 |
3 files changed, 6 insertions, 5 deletions
diff --git a/plugins/dbx-import/dbx-importer.c b/plugins/dbx-import/dbx-importer.c index 3079442ad6..28db6b175f 100644 --- a/plugins/dbx-import/dbx-importer.c +++ b/plugins/dbx-import/dbx-importer.c @@ -220,7 +220,7 @@ org_gnome_evolution_readdbx_getwidget (EImport *ei, EImportTarget *target, EImpo } #endif if (!select_uri) - select_uri = g_strdup (e_mail_local_get_folder_uri (E_MAIL_FOLDER_INBOX)); + select_uri = g_strdup (e_mail_local_get_folder_uri (E_MAIL_LOCAL_FOLDER_INBOX)); hbox = gtk_hbox_new (FALSE, 0); diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c index e9203d1dd7..2e994f78e4 100644 --- a/plugins/pst-import/pst-importer.c +++ b/plugins/pst-import/pst-importer.c @@ -234,7 +234,7 @@ get_suggested_foldername (EImportTargetURI *target) /* Suggest a folder that is in the same mail storage as the users' inbox, with a name derived from the .PST file */ - inbox = e_mail_local_get_folder_uri (E_MAIL_FOLDER_INBOX); + inbox = e_mail_local_get_folder_uri (E_MAIL_LOCAL_FOLDER_INBOX); delim = g_strrstr (inbox, "#"); if (delim != NULL) { diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c index a2bac3dec9..815ee69882 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -479,7 +479,7 @@ create_new_message (CamelFolder *folder, const gchar *uid, CamelMimeMessage *mes /* FIXME Pass this in somehow. */ shell = e_shell_get_default (); - folder = e_mail_local_get_folder (E_MAIL_FOLDER_TEMPLATES); + folder = e_mail_local_get_folder (E_MAIL_LOCAL_FOLDER_TEMPLATES); template = g_object_get_data (G_OBJECT (action), "template"); /* The new message we are creating */ @@ -700,7 +700,7 @@ got_message_draft_cb (EMsgComposer *composer, g_return_if_fail (CAMEL_IS_MIME_MESSAGE (message)); /* Get the templates folder and all UIDs of the messages there. */ - folder = e_mail_local_get_folder (E_MAIL_FOLDER_TEMPLATES); + folder = e_mail_local_get_folder (E_MAIL_LOCAL_FOLDER_TEMPLATES); info = camel_message_info_new (NULL); @@ -778,7 +778,8 @@ update_actions_cb (EShellView *shell_view) /* Now recursively build template submenus in the pop-up menu. */ store = e_mail_local_get_store (); - templates_folder = e_mail_local_get_folder (E_MAIL_FOLDER_TEMPLATES); + templates_folder = e_mail_local_get_folder ( + E_MAIL_LOCAL_FOLDER_TEMPLATES); full_name = camel_folder_get_full_name (templates_folder); /* FIXME Not passing a GCancellable or GError here. */ |