[evolution/evolution-3-12] Revert "[EMailBackend] Provide cancellable and show in UI prepare for a quit"



commit f653d78bcd1d8e325bb2b3e950e49fdda0d41fcf
Author: Milan Crha <mcrha redhat com>
Date:   Fri Nov 7 12:46:03 2014 +0100

    Revert "[EMailBackend] Provide cancellable and show in UI prepare for a quit"
    
    This reverts commit 7c1aba6df6695e22900188c6b8e01549f391b79d.
    
    It turned out that the Evolution won't quit when the quit was initiated
    with a "busy" EShellBackend. In that case the EShellBackend itself
    references the activity and lets it alive until the activity is completed.
    The problem is that the activity is completed only after it is freed,
    thus there happens a circular dependency on the reference count of
    that activity.

 mail/e-mail-backend.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)
---
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index 8e8c11b..d3113ba 100644
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@ -396,14 +396,8 @@ mail_backend_prepare_for_quit_cb (EShell *shell,
                   camel_operation_cancel_all() had been called, but we want
                   it alive for the following operations, thus reset it. */
                g_cancellable_reset (cancellable);
-       } else {
-               cancellable = camel_operation_new ();
-               e_activity_set_cancellable (activity, cancellable);
-               g_object_unref (cancellable);
        }
 
-       e_shell_backend_add_activity (E_SHELL_BACKEND (backend), activity);
-
        list = camel_session_list_services (CAMEL_SESSION (session));
 
        if (delete_junk) {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]