aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/mail-tools.c11
2 files changed, 8 insertions, 9 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 9b69b6db46..ffe5c73fd0 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-04 Chris Toshok <toshok@helixcode.com>
+
+ * mail-tools.c (mail_tool_get_root_of_store): remove news specific
+ check.
+ (mail_tool_uri_to_folder): news: -> nntp:
+
2000-10-04 Jeffrey Stedfast <fejj@helixcode.com>
* mail-ops.c (do_filter_ondemand): Don't expunge the source
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index 0c89fb4cdd..2646a8ad41 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -461,14 +461,7 @@ mail_tool_get_root_of_store (const char *source_uri, CamelException *ex)
mail_tool_camel_lock_up();
- if (!strncmp (source_uri, "news://", 7))
- store = (CamelStore*)camel_session_get_service (session, source_uri,
- CAMEL_PROVIDER_STORE, ex);
- else
- store = camel_session_get_store (session, source_uri, ex);
-
- mail_tool_camel_lock_up ();
-
+ store = camel_session_get_store (session, source_uri, ex);
if (!store) {
mail_tool_camel_lock_down ();
return NULL;
@@ -533,7 +526,7 @@ mail_tool_uri_to_folder (const char *uri, CamelException *ex)
mail_tool_camel_lock_down ();
- } else if (!strncmp (uri, "news:", 5)) {
+ } else if (!strncmp (uri, "nntp:", 5)) {
mail_tool_camel_lock_up();
store = camel_session_get_store (session, uri, ex);
if (store) {