add for translators.

2004-05-12  Not Zed  <NotZed@Ximian.com>

        * mail-errors.xml.h: add for translators.

        * Makefile.am (%.xml.h): fix for xml i18n stuff.

        * mail-errors.xml: moved from the .xml.in file.

2004-05-11  Not Zed  <NotZed@Ximian.com>

        * em-utils.c (em_uri_from_camel): pass an exception to
        provider_get, it relies on one.

        * em-migrate.c (em_migrate_1_4): fix some error messages, and fail
        with fatal errors properly.
        (em_migrate_local_folders_1_4): EEP!  Who cares if this fails!
        Well I do.  Setup exceptions and return codes.
        (em_migrate_dir): and here too.  Sloppy!
        (em_migrate_dir): change the code slightly, 1.4 would recurse all
        folders, even if the parent folder doesn't have a
        folder-metadata.xml.  Make sure we copy that mode.
        (get_local_store_uri): Make it copy the 1.4 behaviour properly.
        Any error -> use defaults.
        (em_migrate_dir): lots of changes.
        (mbox_build_filename): take the output string as an arg.
        (cp): add an argument to overwrite/append or require a unique
        empty file.
        (cp_r): add mode arg here too.
        (em_migrate_folder): split the folder copy stuff from em_migrate
        dir entirely.  blah.
        (em_upgrade_accounts_1_4): can't fail, remove return code, etc.
        (em_upgrade_xml_1_4): removed this rather redundant odd api.
        (upgrade_xml_uris): this can't fail, remove return codes etc.
        (em_upgrade_xml_1_0): another oddly redundant function.
        (em_migrate_pop_uid_caches_1_4): error messages, blah blah.
        (em_migrate_folder_expand_state_1_4): no fatal states here.
        (em_migrate_folder_view_settings_1_4): nor here.
        (emm_setup_initial): do i18n 'better', using
        gnome_i18n_get_language_list, rather than hacky code.

2004-05-10  Not Zed  <NotZed@Ximian.com>

        * mail-tools.c: remove e-meta.h, not used anymore.

svn path=/trunk/; revision=25870

1 files changed, 6 insertions, 2 deletions

diff --git a/mail/em-utils.c b/mail/em-utils.c
index 87b0d9b899..ca082a8423 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -1461,18 +1461,22 @@ char *em_uri_from_camel(const char *curi)
 	const char *uid, *path;
 	char *euri, *tmp;
 	CamelProvider *provider;
+	CamelException ex;
 
 	/* Easiest solution to code that shouldnt be calling us */
 	if (!strncmp(curi, "email:", 6))
 		return g_strdup(curi);
 
-	provider = camel_provider_get(curi, NULL);
+	camel_exception_init(&ex);
+	provider = camel_provider_get(curi, &ex);
 	if (provider == NULL) {
+		camel_exception_clear(&ex);
 		d(printf("em uri from camel failed '%s'\n", curi));
 		return g_strdup(curi);
 	}
 
-	curl = camel_url_new(curi, NULL);
+	curl = camel_url_new(curi, &ex);
+	camel_exception_clear(&ex);
 	if (curl == NULL)
 		return g_strdup(curi);