[evolution-data-server] IMAPX: Remove unused CAMEL_IMAPX_COMMAND_STREAM option.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] IMAPX: Remove unused CAMEL_IMAPX_COMMAND_STREAM option.
- Date: Thu, 30 Jan 2014 14:43:30 +0000 (UTC)
commit 1eb12f58131d3b87b1e31ba1aedd2a41ad919ada
Author: Matthew Barnes <mbarnes redhat com>
Date: Thu Jan 30 09:35:48 2014 -0500
IMAPX: Remove unused CAMEL_IMAPX_COMMAND_STREAM option.
99% sure this is unused. Or at least can't find any cases of "%S" in
CamelIMAPXCommand format strings.
camel/providers/imapx/camel-imapx-command.c | 18 ++----------------
camel/providers/imapx/camel-imapx-command.h | 1 -
camel/providers/imapx/camel-imapx-server.c | 9 ---------
3 files changed, 2 insertions(+), 26 deletions(-)
---
diff --git a/camel/providers/imapx/camel-imapx-command.c b/camel/providers/imapx/camel-imapx-command.c
index 9c0db65..4462f1f 100644
--- a/camel/providers/imapx/camel-imapx-command.c
+++ b/camel/providers/imapx/camel-imapx-command.c
@@ -270,7 +270,6 @@ camel_imapx_command_addv (CamelIMAPXCommand *ic,
glong l;
guint32 f;
CamelFlag *F;
- CamelStream *S;
CamelDataWrapper *D;
CamelSasl *A;
gchar literal_format[16];
@@ -329,11 +328,6 @@ camel_imapx_command_addv (CamelIMAPXCommand *ic,
A = va_arg (ap, CamelSasl *);
camel_imapx_command_add_part (ic, CAMEL_IMAPX_COMMAND_AUTH, A);
break;
- case 'S': /* stream */
- S = va_arg (ap, CamelStream *);
- c (ic->is->tagprefix, "got stream '%p'\n", S);
- camel_imapx_command_add_part (ic, CAMEL_IMAPX_COMMAND_STREAM, S);
- break;
case 'D': /* datawrapper */
D = va_arg (ap, CamelDataWrapper *);
c (ic->is->tagprefix, "got data wrapper '%p'\n", D);
@@ -458,19 +452,11 @@ camel_imapx_command_add_part (CamelIMAPXCommand *ic,
/* TODO: literal+? */
switch (type & CAMEL_IMAPX_COMMAND_MASK) {
- case CAMEL_IMAPX_COMMAND_DATAWRAPPER:
- case CAMEL_IMAPX_COMMAND_STREAM: {
+ case CAMEL_IMAPX_COMMAND_DATAWRAPPER: {
CamelObject *ob = data;
- /* TODO: seekable streams we could just seek to the end and back */
null = (CamelStreamNull *) camel_stream_null_new ();
- if ( (type & CAMEL_IMAPX_COMMAND_MASK) == CAMEL_IMAPX_COMMAND_DATAWRAPPER) {
- camel_data_wrapper_write_to_stream_sync ((CamelDataWrapper *) ob, (CamelStream *)
null, NULL, NULL);
- } else {
- g_seekable_seek (G_SEEKABLE (ob), 0, G_SEEK_SET, NULL, NULL);
- camel_stream_write_to_stream ((CamelStream *) ob, (CamelStream *) null, NULL, NULL);
- g_seekable_seek (G_SEEKABLE (ob), 0, G_SEEK_SET, NULL, NULL);
- }
+ camel_data_wrapper_write_to_stream_sync ((CamelDataWrapper *) ob, (CamelStream *) null, NULL,
NULL);
type |= CAMEL_IMAPX_COMMAND_LITERAL_PLUS;
g_object_ref (ob);
ob_size = null->written;
diff --git a/camel/providers/imapx/camel-imapx-command.h b/camel/providers/imapx/camel-imapx-command.h
index 8b95f03..a82a27d 100644
--- a/camel/providers/imapx/camel-imapx-command.h
+++ b/camel/providers/imapx/camel-imapx-command.h
@@ -39,7 +39,6 @@ typedef void (*CamelIMAPXCommandFunc) (struct _CamelIMAPXServer *is,
typedef enum {
CAMEL_IMAPX_COMMAND_SIMPLE = 0,
CAMEL_IMAPX_COMMAND_DATAWRAPPER,
- CAMEL_IMAPX_COMMAND_STREAM,
CAMEL_IMAPX_COMMAND_AUTH,
CAMEL_IMAPX_COMMAND_FILE,
CAMEL_IMAPX_COMMAND_STRING,
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index 76399f9..c5e959f 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -3180,15 +3180,6 @@ imapx_continuation (CamelIMAPXServer *is,
if (n_bytes_written < 0)
return FALSE;
break;
- case CAMEL_IMAPX_COMMAND_STREAM:
- c (is->tagprefix, "writing stream to literal\n");
- n_bytes_written = camel_stream_write_to_stream (
- CAMEL_STREAM (cp->ob),
- CAMEL_STREAM (stream),
- cancellable, error);
- if (n_bytes_written < 0)
- return FALSE;
- break;
case CAMEL_IMAPX_COMMAND_AUTH: {
gchar *resp;
guchar *token;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]