diff options
| author | Michael Zucci <zucchi@src.gnome.org> | 2004-09-20 13:59:55 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2004-09-20 13:59:55 +0800 |
| commit | ef6a3af717132e0750f226fa8a0ee0f3c98e19f0 (patch) | |
| tree | f4ed25f7a247a8ccb855a8d940777e7a3d21a3e3 /camel/providers/pop3 | |
| parent | 96111b1f1487ca3fe454b340a73ba927cc6bfb83 (diff) | |
| download | gsoc2013-evolution-ef6a3af717132e0750f226fa8a0ee0f3c98e19f0.tar gsoc2013-evolution-ef6a3af717132e0750f226fa8a0ee0f3c98e19f0.tar.gz gsoc2013-evolution-ef6a3af717132e0750f226fa8a0ee0f3c98e19f0.tar.bz2 gsoc2013-evolution-ef6a3af717132e0750f226fa8a0ee0f3c98e19f0.tar.lz gsoc2013-evolution-ef6a3af717132e0750f226fa8a0ee0f3c98e19f0.tar.xz gsoc2013-evolution-ef6a3af717132e0750f226fa8a0ee0f3c98e19f0.tar.zst gsoc2013-evolution-ef6a3af717132e0750f226fa8a0ee0f3c98e19f0.zip | |
Merged notzed-eplugin-2-branch to head.
svn path=/trunk/; revision=27300
Diffstat (limited to 'camel/providers/pop3')
| -rw-r--r-- | camel/providers/pop3/camel-pop3-engine.c | 7 | ||||
| -rw-r--r-- | camel/providers/pop3/camel-pop3-folder.c | 1 | ||||
| -rw-r--r-- | camel/providers/pop3/camel-pop3-provider.c | 3 | ||||
| -rw-r--r-- | camel/providers/pop3/camel-pop3-store.c | 1 |
4 files changed, 7 insertions, 5 deletions
diff --git a/camel/providers/pop3/camel-pop3-engine.c b/camel/providers/pop3/camel-pop3-engine.c index 9c3f8423e9..e79a382359 100644 --- a/camel/providers/pop3/camel-pop3-engine.c +++ b/camel/providers/pop3/camel-pop3-engine.c @@ -33,8 +33,9 @@ #include "camel-pop3-engine.h" #include "camel-pop3-stream.h" -#include <camel/camel-service.h> -#include <camel/camel-sasl.h> +#include "camel-service.h" +#include "camel-sasl.h" +#include "camel-i18n.h" /* max 'outstanding' bytes in output stream, so we can't deadlock waiting for the server to accept our data when pipelining */ @@ -224,8 +225,6 @@ static void get_capabilities(CamelPOP3Engine *pe) { CamelPOP3Command *pc; - unsigned char *line; - unsigned int len; if (!(pe->flags & CAMEL_POP3_ENGINE_DISABLE_EXTENSIONS)) { pc = camel_pop3_engine_command_new(pe, CAMEL_POP3_COMMAND_MULTI, cmd_capa, NULL, "CAPA\r\n"); diff --git a/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c index 1c17079006..23a5bc7d88 100644 --- a/camel/providers/pop3/camel-pop3-folder.c +++ b/camel/providers/pop3/camel-pop3-folder.c @@ -37,6 +37,7 @@ #include "camel-mime-message.h" #include "camel-operation.h" #include "camel-data-cache.h" +#include "camel-i18n.h" #include <e-util/md5-utils.h> diff --git a/camel/providers/pop3/camel-pop3-provider.c b/camel/providers/pop3/camel-pop3-provider.c index 7c3db155a7..7253edfbf4 100644 --- a/camel/providers/pop3/camel-pop3-provider.c +++ b/camel/providers/pop3/camel-pop3-provider.c @@ -32,9 +32,10 @@ #include "camel-session.h" #include "camel-url.h" #include "camel-sasl.h" +#include "camel-i18n.h" CamelProviderConfEntry pop3_conf_entries[] = { - { CAMEL_PROVIDER_CONF_SECTION_START, NULL, NULL, + { CAMEL_PROVIDER_CONF_SECTION_START, "storage", NULL, N_("Message storage") }, { CAMEL_PROVIDER_CONF_CHECKBOX, "keep_on_server", NULL, N_("Leave messages on server"), "0" }, diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c index 96f9295b52..a63aa137e1 100644 --- a/camel/providers/pop3/camel-pop3-store.c +++ b/camel/providers/pop3/camel-pop3-store.c @@ -54,6 +54,7 @@ #ifdef HAVE_SSL #include "camel-tcp-stream-ssl.h" #endif +#include "camel-i18n.h" /* Specified in RFC 1939 */ #define POP3_PORT 110 |