[evolution-data-server] Bug 622828 - Don't recurse to parent class's ->disconnect() method.
- From: David Woodhouse <dwmw2 src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Bug 622828 - Don't recurse to parent class's ->disconnect() method.
- Date: Mon, 28 Jun 2010 11:10:08 +0000 (UTC)
commit 84a0c7d9d773980907ecf3966a659d218e64b657
Author: David Woodhouse <David Woodhouse intel com>
Date: Sun Jun 27 09:26:41 2010 +0100
Bug 622828 - Don't recurse to parent class's ->disconnect() method.
That seems to be our caller. Calling it back will just end in tears.
camel/providers/nntp/camel-nntp-store.c | 14 --------------
1 files changed, 0 insertions(+), 14 deletions(-)
---
diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
index 8d66e30..9fb7f5e 100644
--- a/camel/providers/nntp/camel-nntp-store.c
+++ b/camel/providers/nntp/camel-nntp-store.c
@@ -419,11 +419,8 @@ static gboolean
nntp_disconnect_online (CamelService *service, gboolean clean, CamelException *ex)
{
CamelNNTPStore *store = CAMEL_NNTP_STORE (service);
- CamelServiceClass *service_class;
gchar *line;
- service_class = CAMEL_SERVICE_GET_CLASS (service);
-
camel_service_lock (CAMEL_SERVICE (store), CAMEL_SERVICE_REC_CONNECT_LOCK);
if (clean) {
@@ -431,11 +428,6 @@ nntp_disconnect_online (CamelService *service, gboolean clean, CamelException *e
camel_exception_clear(ex);
}
- if (!service_class->disconnect (service, clean, ex)) {
- camel_service_unlock (CAMEL_SERVICE (store), CAMEL_SERVICE_REC_CONNECT_LOCK);
- return FALSE;
- }
-
g_object_unref (store->stream);
store->stream = NULL;
g_free(store->current_folder);
@@ -450,12 +442,6 @@ static gboolean
nntp_disconnect_offline (CamelService *service, gboolean clean, CamelException *ex)
{
CamelDiscoStore *disco = CAMEL_DISCO_STORE(service);
- CamelServiceClass *service_class;
-
- /* Chain up to parent's disconnect() method. */
- service_class = CAMEL_SERVICE_CLASS (camel_nntp_store_parent_class);
- if (!service_class->disconnect (service, clean, ex))
- return FALSE;
if (disco->diary) {
g_object_unref (disco->diary);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]