[evolution-data-server/gnome-3-16] Bug 746732 - [IMAPx] Custom command doesn't have connection

[Milan Crha <mcrha src gnome org>]

commit 880bedc2a50f36df174cc5e78ff85cfa56ff24da
Author: Milan Crha <mcrha redhat com>
Date:   Wed Apr 1 09:28:56 2015 +0200

    Bug 746732 - [IMAPx] Custom command doesn't have connection

 camel/providers/imapx/camel-imapx-server.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index 6620ee2..1944bd5 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -1226,7 +1226,8 @@ imapx_server_set_connection_timeout (GIOStream *connection,
                g_object_get (G_OBJECT (connection), "base-io-stream", &base_io_stream, NULL);
 
                connection = base_io_stream;
-       } else {
+       } else if (connection) {
+               /* Connection can be NULL, when a custom command (GSubProcess) is used instead */
                g_object_ref (connection);
        }