From 86cf63042a32b425a75796c63bf45ea7ca89b879 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 26 Jun 2012 18:43:26 +0200 Subject: [PATCH] Incorrect check for CamelSettings value change This was causing runtime warnings on evolution start from IMAP provider, which reads values from settings for junk/trash real folder, but the settings object was set as NULL, which means "create default settings for this class", but the test I added for object pointer change did succeed for the NULL object (both internal and passed in settings are NULL at the beginning), thus the default settings object was not created. --- camel/camel-service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camel/camel-service.c b/camel/camel-service.c index d3a321a..a0350f2 100644 --- a/camel/camel-service.c +++ b/camel/camel-service.c @@ -1502,7 +1502,7 @@ camel_service_set_settings (CamelService *service, g_return_if_fail (CAMEL_IS_SERVICE (service)); - if (service->priv->settings == settings) + if (settings && service->priv->settings == settings) return; class = CAMEL_SERVICE_GET_CLASS (service); -- 2.7.4