|
 |
b57bd2 |
diff --git a/src/e-util/e-collection-account-wizard.c b/src/e-util/e-collection-account-wizard.c
|
|
|
b57bd2 |
index 49b1ac4a96..84ccd3fd53 100644
|
|
|
b57bd2 |
--- a/src/e-util/e-collection-account-wizard.c
|
|
|
b57bd2 |
+++ b/src/e-util/e-collection-account-wizard.c
|
|
|
b57bd2 |
@@ -1858,8 +1858,6 @@ collection_account_wizard_dispose (GObject *object)
|
|
|
b57bd2 |
wizard->priv->store_passwords = NULL;
|
|
|
b57bd2 |
}
|
|
|
b57bd2 |
|
|
|
b57bd2 |
- g_warn_if_fail (wizard->priv->running_result == NULL);
|
|
|
b57bd2 |
-
|
|
|
b57bd2 |
if (wizard->priv->running_result) {
|
|
|
b57bd2 |
e_simple_async_result_complete_idle (wizard->priv->running_result);
|
|
|
b57bd2 |
g_clear_object (&wizard->priv->running_result);
|
|
|
b57bd2 |
diff --git a/src/e-util/e-config-lookup.c b/src/e-util/e-config-lookup.c
|
|
|
b57bd2 |
index d0eff38ef2..3b68fa6876 100644
|
|
|
b57bd2 |
--- a/src/e-util/e-config-lookup.c
|
|
|
b57bd2 |
+++ b/src/e-util/e-config-lookup.c
|
|
|
b57bd2 |
@@ -277,6 +277,11 @@ config_lookup_dispose (GObject *object)
|
|
|
b57bd2 |
|
|
|
b57bd2 |
e_config_lookup_cancel_all (config_lookup);
|
|
|
b57bd2 |
|
|
|
b57bd2 |
+ if (config_lookup->priv->pool) {
|
|
|
b57bd2 |
+ g_thread_pool_free (config_lookup->priv->pool, TRUE, TRUE);
|
|
|
b57bd2 |
+ config_lookup->priv->pool = NULL;
|
|
|
b57bd2 |
+ }
|
|
|
b57bd2 |
+
|
|
|
b57bd2 |
g_mutex_lock (&config_lookup->priv->property_lock);
|
|
|
b57bd2 |
|
|
|
b57bd2 |
g_clear_object (&config_lookup->priv->run_cancellable);
|
|
|
b57bd2 |
@@ -305,7 +310,6 @@ config_lookup_finalize (GObject *object)
|
|
|
b57bd2 |
EConfigLookup *config_lookup = E_CONFIG_LOOKUP (object);
|
|
|
b57bd2 |
|
|
|
b57bd2 |
g_slist_free_full (config_lookup->priv->results, g_object_unref);
|
|
|
b57bd2 |
- g_thread_pool_free (config_lookup->priv->pool, TRUE, FALSE);
|
|
|
b57bd2 |
g_mutex_clear (&config_lookup->priv->property_lock);
|
|
|
b57bd2 |
|
|
|
b57bd2 |
/* Chain up to parent's method. */
|