aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/mail-tools.c20
2 files changed, 8 insertions, 19 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index cc7326654e..562b01c30a 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2001-10-07 Dan Winship <danw@ximian.com>
+
+ * mail-tools.c (mail_tool_do_movemail): Remove #ifndef
+ MOVEMAIL_PATH code, since the setting of that variable has been
+ meaningless for a while now, and the rest of the code DTRT whether
+ that code executes or not.
+
2001-10-05 Jeffrey Stedfast <fejj@ximian.com>
* mail-mt.c (pass_got): Fix a merge-conflict leftover.
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index d134bfd4ca..96ef278567 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -115,30 +115,12 @@ mail_tool_do_movemail (const gchar *source_url, CamelException *ex)
gchar *dest_path;
const gchar *source;
struct stat sb;
-#ifndef MOVEMAIL_PATH
- int tmpfd;
-#endif
+
g_return_val_if_fail (strncmp (source_url, "mbox:", 5) == 0, NULL);
/* Set up our destination. */
dest_path = mail_tool_get_local_movemail_path();
- /* Create a new movemail mailbox file of 0 size */
-
-#ifndef MOVEMAIL_PATH
- tmpfd = open (dest_path, O_RDWR | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR);
-
- if (tmpfd == -1) {
- camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
- _("Couldn't create temporary mbox `%s': %s"),
- dest_path, g_strerror (errno));
- g_free (dest_path);
- return NULL;
- }
-
- close (tmpfd);
-#endif
-
/* Skip over "mbox:" plus host part (if any) of url. */
source = source_url + 5;
if (!strncmp (source, "//", 2))