[evolution-data-server] Bug #624228 - Gerror with Usenet / nntp

[Milan Crha <mcrha src gnome org>]

commit 4c16692c299e02853e0eb9d4b0c76c30584f023f
Author: Milan Crha <mcrha redhat com>
Date:   Thu Sep 2 13:05:54 2010 +0200

    Bug #624228 - Gerror with Usenet / nntp

 camel/camel-disco-store.c |    9 ++++++---
 camel/camel-store.c       |    3 ++-
 2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/camel/camel-disco-store.c b/camel/camel-disco-store.c
index 83ad1a6..2732d5e 100644
--- a/camel/camel-disco-store.c
+++ b/camel/camel-disco-store.c
@@ -202,7 +202,8 @@ disco_store_get_folder_info (CamelStore *store,
 	switch (camel_disco_store_status (disco_store)) {
 	case CAMEL_DISCO_STORE_ONLINE:
 		info = class->get_folder_info_online (store, top, flags, error);
-		CAMEL_CHECK_GERROR (store, get_folder_info_online, info != NULL, error);
+		if (!(flags & CAMEL_STORE_FOLDER_INFO_SUBSCRIBED))
+			CAMEL_CHECK_GERROR (store, get_folder_info_online, info != NULL, error);
 		return info;
 
 	case CAMEL_DISCO_STORE_OFFLINE:
@@ -214,12 +215,14 @@ disco_store_get_folder_info (CamelStore *store,
 		}
 
 		info = class->get_folder_info_offline (store, top, flags, error);
-		CAMEL_CHECK_GERROR (store, get_folder_info_offline, info != NULL, error);
+		if (!(flags & CAMEL_STORE_FOLDER_INFO_SUBSCRIBED))
+			CAMEL_CHECK_GERROR (store, get_folder_info_offline, info != NULL, error);
 		return info;
 
 	case CAMEL_DISCO_STORE_RESYNCING:
 		info = class->get_folder_info_resyncing (store, top, flags, error);
-		CAMEL_CHECK_GERROR (store, get_folder_info_resyncing, info != NULL, error);
+		if (!(flags & CAMEL_STORE_FOLDER_INFO_SUBSCRIBED))
+			CAMEL_CHECK_GERROR (store, get_folder_info_resyncing, info != NULL, error);
 		return info;
 	}
 
diff --git a/camel/camel-store.c b/camel/camel-store.c
index 5edb7bf..c9c5e73 100644
--- a/camel/camel-store.c
+++ b/camel/camel-store.c
@@ -1120,7 +1120,8 @@ camel_store_get_folder_info (CamelStore *store,
 	g_return_val_if_fail (class->get_folder_info != NULL, NULL);
 
 	info = class->get_folder_info (store, top, flags, error);
-	CAMEL_CHECK_GERROR (store, get_folder_info, info != NULL, error);
+	if (!(flags & CAMEL_STORE_FOLDER_INFO_SUBSCRIBED))
+		CAMEL_CHECK_GERROR (store, get_folder_info, info != NULL, error);
 
 	if (info && (top == NULL || *top == '\0') && (flags & CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL) == 0) {
 		if (info->uri && (store->flags & CAMEL_STORE_VTRASH))