diff options
| author | Chris Toshok <toshok@helixcode.com> | 2000-10-05 05:32:32 +0800 |
|---|---|---|
| committer | Chris Toshok <toshok@src.gnome.org> | 2000-10-05 05:32:32 +0800 |
| commit | 076b83ed4fceedb7758f546719ea746737dacbe2 (patch) | |
| tree | fd07024157aa689106308a92e24be0ea39527e25 | |
| parent | aedfd03572bcbb2183b6bac4b429cc245aea45f1 (diff) | |
| download | gsoc2013-evolution-076b83ed4fceedb7758f546719ea746737dacbe2.tar.gz gsoc2013-evolution-076b83ed4fceedb7758f546719ea746737dacbe2.tar.zst gsoc2013-evolution-076b83ed4fceedb7758f546719ea746737dacbe2.zip | |
use "nntp:" instead of "news:" since "news:" urls aren't supposed to have
2000-10-04 Chris Toshok <toshok@helixcode.com>
* providers/nntp/camel-nntp-store.c (nntp_store_get_folder_info):
use "nntp:" instead of "news:" since "news:" urls aren't supposed
to have host/user/port info in them. also, if there's a user
defined in the url, put it in the urls for our folders.
svn path=/trunk/; revision=5717
| -rw-r--r-- | camel/ChangeLog | 7 | ||||
| -rw-r--r-- | camel/providers/nntp/camel-nntp-store.c | 9 |
2 files changed, 14 insertions, 2 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 3a2b1113ea..7e64d5597a 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,5 +1,12 @@ 2000-10-04 Chris Toshok <toshok@helixcode.com> + * providers/nntp/camel-nntp-store.c (nntp_store_get_folder_info): + use "nntp:" instead of "news:" since "news:" urls aren't supposed + to have host/user/port info in them. also, if there's a user + defined in the url, put it in the urls for our folders. + +2000-10-04 Chris Toshok <toshok@helixcode.com> + * providers/nntp/camel-nntp-auth.c (camel_nntp_auth_authenticate): borrow some code from the imap provider to query the user for their password, and pass the user/passwd to nntp. be extra diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c index d51e3b2cf6..b7466f7baf 100644 --- a/camel/providers/nntp/camel-nntp-store.c +++ b/camel/providers/nntp/camel-nntp-store.c @@ -46,6 +46,8 @@ #define NNTP_PORT 119 +#define DUMP_EXTENSIONS + static CamelRemoteStoreClass *remote_store_class = NULL; static CamelServiceClass *service_class = NULL; @@ -354,7 +356,10 @@ nntp_store_get_folder_info (CamelStore *store, const char *top, fi = g_new0 (CamelFolderInfo, 1); fi->name = g_strdup (names->pdata[i]); fi->full_name = g_strdup (names->pdata[i]); - fi->url = g_strdup_printf ("news://%s/%s", url->host, (char *)names->pdata[i]); + fi->url = g_strdup_printf ("nntp://%s%s%s/%s", + url->user ? url->user : "", + url->user ? "@" : "", + url->host, (char *)names->pdata[i]); /* FIXME */ fi->message_count = fi->unread_message_count = -1; @@ -374,7 +379,7 @@ nntp_store_get_folder_info (CamelStore *store, const char *top, fi = g_new0 (CamelFolderInfo, 1); fi->name = g_strdup (top); fi->full_name = g_strdup (top); - fi->url = g_strdup_printf ("news://%s/%s", url->host, top); + fi->url = g_strdup_printf ("nntp://%s/%s", url->host, top); /* FIXME */ fi->message_count = fi->unread_message_count = -1; |