diff options
| author | Not Zed <NotZed@Ximian.com> | 2002-02-06 23:16:41 +0000 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2002-02-06 23:16:41 +0000 |
| commit | 66c4d4c15c96d7826f254ced9d0869b107d1dbb0 (patch) | |
| tree | 337f09fea278e89f8bdd7c1252f28dbb053a01da | |
| parent | f52235e0230eac4bd3e46724e6d3779e06902fdd (diff) | |
| download | evolution-data-server-66c4d4c15c96d7826f254ced9d0869b107d1dbb0.tar.gz | |
Always set the connect_op to NULL when we're done with it. Fix for #19564.
2002-02-06 Not Zed <NotZed@Ximian.com>
* camel-service.c (camel_service_connect): Always set the
connect_op to NULL when we're done with it. Fix for #19564.
| -rw-r--r-- | camel/ChangeLog | 5 | ||||
| -rw-r--r-- | camel/camel-service.c | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 37d4aba87..4a5b20861 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,8 @@ +2002-02-06 Not Zed <NotZed@Ximian.com> + + * camel-service.c (camel_service_connect): Always set the + connect_op to NULL when we're done with it. Fix for #19564. + 2002-01-11 Jeffrey Stedfast <fejj@ximian.com> * providers/imap/camel-imap-folder.c (imap_update_summary): Kludge diff --git a/camel/camel-service.c b/camel/camel-service.c index a166fcc55..f2322c95c 100644 --- a/camel/camel-service.c +++ b/camel/camel-service.c @@ -260,12 +260,12 @@ camel_service_connect (CamelService *service, CamelException *ex) service->status = ret ? CAMEL_SERVICE_CONNECTED : CAMEL_SERVICE_DISCONNECTED; CAMEL_SERVICE_LOCK (service, connect_op_lock); - if (unreg) { - camel_operation_unregister (service->connect_op); + /* its impossible this is null from this code, but we check anyway */ + if (service->connect_op) { + if (unreg) + camel_operation_unregister (service->connect_op); camel_operation_unref (service->connect_op); service->connect_op = NULL; - } else { - camel_operation_unref (service->connect_op); } CAMEL_SERVICE_UNLOCK (service, connect_op_lock); |