callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove default_ports.

Browse Source 
* camel-provider.h: Remove default_ports.

	* camel-remote-store.c (remote_connect): Get default_port from
	CamelRemoteStore rather than CamelProvider.

	* providers/{imap,nntp,pop3}/camel-*-store.c: Initialize
	CamelRemoteStore::default_port

	* providers/*/camel-*-provider.c: Remove default_ports.

svn path=/trunk/; revision=5669
This commit is contained in:
Dan Winship
2000-10-02 20:14:57 +00:00
parent bfe2227dd0
commit 853d2b99ff
16 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
camel/ChangeLog
View File

@ -1,3 +1,15 @@
2000-10-02 Dan Winship <danw@helixcode.com>
* camel-provider.h: Remove default_ports.
* camel-remote-store.c (remote_connect): Get default_port from
CamelRemoteStore rather than CamelProvider.
* providers/{imap,nntp,pop3}/camel-*-store.c: Initialize
CamelRemoteStore::default_port
* providers/*/camel-*-provider.c: Remove default_ports.
2000-10-02 Dan Winship <danw@helixcode.com>
* camel-folder.[ch]: Remove

1
camel/camel-provider.h
View File

@ -79,7 +79,6 @@ typedef struct {
int flags;
CamelType object_types [CAMEL_NUM_PROVIDER_TYPES];
gint default_ports [CAMEL_NUM_PROVIDER_TYPES];
GHashTable *service_cache;

9
camel/camel-remote-store.c
View File

@ -218,13 +218,8 @@ remote_connect (CamelService *service, CamelException *ex)
if (service->url->port)
port = service->url->port;
else {
CamelProvider *prov = camel_service_get_provider (service);
port = prov->default_ports[CAMEL_PROVIDER_STORE];
g_assert (port); /* a remote service MUST define a valid default port */
}
else
port = store->default_port;
sin.sin_port = htons (port);
memcpy (&sin.sin_addr, h->h_addr, sizeof (sin.sin_addr));

2
camel/camel-remote-store.h
View File

@ -42,7 +42,7 @@ typedef struct {
CamelStore parent_object;
CamelStream *istream, *ostream;
guint timeout_id;
guint timeout_id, default_port;
} CamelRemoteStore;

1
camel/providers/cache/camel-cache-provider.c vendored
View File

@ -38,7 +38,6 @@ static CamelProvider cache_provider = {
0,
{ 0, 0 },
{ 0, 0 }
};

1
camel/providers/imap/camel-imap-provider.c
View File

@ -45,7 +45,6 @@ static CamelProvider imap_provider = {
CAMEL_PROVIDER_IS_REMOTE | CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE,
{ 0, 0 },
{ 143, 0 },
NULL
};

3
camel/providers/imap/camel-imap-store.c
View File

@ -100,12 +100,15 @@ static void
camel_imap_store_init (gpointer object, gpointer klass)
{
CamelService *service = CAMEL_SERVICE (object);
CamelRemoteStore *remote_store = CAMEL_REMOTE_STORE (object);
CamelImapStore *imap_store = CAMEL_IMAP_STORE (object);
service->url_flags |= (CAMEL_SERVICE_URL_NEED_USER |
CAMEL_SERVICE_URL_NEED_HOST |
CAMEL_SERVICE_URL_ALLOW_PATH |
CAMEL_SERVICE_URL_ALLOW_AUTH);
remote_store->default_port = 143;
imap_store->dir_sep = NULL;
imap_store->current_folder = NULL;

1
camel/providers/mbox/camel-mbox-provider.c
View File

@ -40,7 +40,6 @@ static CamelProvider mbox_provider = {
CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE,
{ 0, 0 },
{ 0, 0 },
NULL

1
camel/providers/mh/camel-mh-provider.c
View File

@ -39,7 +39,6 @@ static CamelProvider mh_provider = {
CAMEL_PROVIDER_IS_STORAGE,
{0, 0},
{0, 0},
NULL

2
camel/providers/nntp/camel-nntp-provider.c
View File

@ -39,7 +39,6 @@ static CamelProvider news_provider = {
CAMEL_PROVIDER_IS_REMOTE | CAMEL_PROVIDER_IS_STORAGE,
{ 0, 0 },
{ 119, 0 },
NULL
};
@ -56,7 +55,6 @@ static CamelProvider nntp_provider = {
CAMEL_PROVIDER_IS_REMOTE,
{ 0, 0 },
{ 119, 0 },
NULL
};

2
camel/providers/nntp/camel-nntp-store.c
View File

@ -386,8 +386,10 @@ static void
camel_nntp_store_init (gpointer object, gpointer klass)
{
CamelService *service = CAMEL_SERVICE (object);
CamelRemoteStore *remote_store = CAMEL_REMOTE_STORE (object);
service->url_flags = CAMEL_SERVICE_URL_NEED_HOST;
remote_store->default_port = 119;
}
CamelType

1
camel/providers/pop3/camel-pop3-provider.c
View File

@ -42,7 +42,6 @@ static CamelProvider pop3_provider = {
CAMEL_PROVIDER_IS_REMOTE | CAMEL_PROVIDER_IS_SOURCE,
{ 0, 0 },
{ 110, 0 },
NULL
};

5
camel/providers/pop3/camel-pop3-store.c
View File

@ -113,9 +113,12 @@ static void
camel_pop3_store_init (gpointer object, gpointer klass)
{
CamelService *service = CAMEL_SERVICE (object);
CamelRemoteStore *remote_store = CAMEL_REMOTE_STORE (object);
service->url_flags |= (CAMEL_SERVICE_URL_NEED_USER | CAMEL_SERVICE_URL_NEED_HOST |
service->url_flags |= (CAMEL_SERVICE_URL_NEED_USER |
CAMEL_SERVICE_URL_NEED_HOST |
CAMEL_SERVICE_URL_ALLOW_AUTH);
remote_store->default_port = 110;
}
CamelType

1
camel/providers/sendmail/camel-sendmail-provider.c
View File

@ -40,7 +40,6 @@ static CamelProvider sendmail_provider = {
0,
{ 0, 0 },
{ 0, 0 },
NULL

1
camel/providers/smtp/camel-smtp-provider.c
View File

@ -40,7 +40,6 @@ static CamelProvider smtp_provider = {
0,
{ 0, 0 },
{ 0, 25 },
NULL
};

1
camel/providers/vee/camel-vee-provider.c
View File

@ -35,7 +35,6 @@ static CamelProvider vee_provider = {
0,
{ 0, 0 },
{ 0, 0 },
NULL