File bnc-156823-newly-configured-gw-dont-work.patch of Package evolution-data-server-2.6

Overview Repositories Revisions Requests Users Attributes Meta

File bnc-156823-newly-configured-gw-dont-work.patch of Package evolution-data-server-2.6

===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/camel-groupwise-store.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- camel/providers/groupwise/camel-groupwise-store.c	2006/01/31 06:55:50	1.91
+++ camel/providers/groupwise/camel-groupwise-store.c	2006/03/09 12:58:56	1.92
@@ -1305,11 +1305,7 @@
 	if (((CamelOfflineStore *) store)->state == CAMEL_OFFLINE_STORE_NETWORK_AVAIL
 	    && camel_service_connect ((CamelService *)store, ex))
 		return TRUE;
-
-	if (!camel_exception_is_set (ex))
-		camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				_("You must be working online to complete this operation"));
-
+	/*Not online, so return FALSE*/
 	return FALSE;
 }
 
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/camel-groupwise-folder.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- camel/providers/groupwise/camel-groupwise-folder.c	2006/03/09 10:54:43	1.115
+++ camel/providers/groupwise/camel-groupwise-folder.c	2006/03/11 09:52:29	1.116
@@ -849,7 +849,7 @@
 		/* We probably could not get the messages the first time. (get_folder) failed???!
 		 * so do a get_folder again. And hope that it works
 		 */
-		camel_store_get_folder ((CamelStore *)gw_store, folder->name, 0, ex);
+		gw_store_reload_folder ((CamelStore *)gw_store, folder->name, 0, ex);
 	}
 }
 
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/camel-groupwise-store.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- camel/providers/groupwise/camel-groupwise-store.c	2006/03/09 12:58:56	1.92
+++ camel/providers/groupwise/camel-groupwise-store.c	2006/03/11 09:52:29	1.93
@@ -267,8 +267,11 @@
 
 	d("in groupwise store connect\n");
 	
-	if (((CamelOfflineStore *) store)->state == CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL || 
+/*	if (((CamelOfflineStore *) store)->state == CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL || 
 	     (service->status == CAMEL_SERVICE_DISCONNECTED)) 
+		return FALSE; */
+	
+	if (((CamelOfflineStore *) store)->state == CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL)
 		return FALSE;
 
 	if (!priv) {
@@ -592,10 +595,10 @@
 		return NULL;
 	}
 	g_free (folder_dir);
-
+	
 	si = camel_store_summary_path ((CamelStoreSummary *)gw_store->summary, folder_name);
 	if (si) {
-		camel_object_get (folder, NULL, CAMEL_FOLDER_TOTAL, &total, NULL);
+		total = si->total;
 		camel_store_summary_info_free ((CamelStoreSummary *)(gw_store)->summary, si);
 	}
 
@@ -670,6 +673,11 @@
 	return folder;
 }
 
+void 
+gw_store_reload_folder (CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex)
+{
+}
+
 CamelFolderInfo *
 convert_to_folder_info (CamelGroupwiseStore *store, EGwContainer *container, const char *url, CamelException *ex)
 {
@@ -754,10 +762,11 @@
 	if (e_gw_container_get_is_shared_by_me (container))
 		fi->flags |= CAMEL_FOLDER_SHARED_BY_ME;
 
-	if (type == E_GW_CONTAINER_TYPE_INBOX) {
+	/*if (type == E_GW_CONTAINER_TYPE_INBOX) {
 		fi->total = -1;
 		fi->unread = -1;
-	} else	if (type == E_GW_CONTAINER_TYPE_TRASH) {
+	} else	if (type == E_GW_CONTAINER_TYPE_TRASH) {*/
+	if (type == E_GW_CONTAINER_TYPE_TRASH) {
 		fi->total = e_gw_container_get_total_count (container);
 		fi->unread = 0;
 	}else {
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/camel-groupwise-store.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- camel/providers/groupwise/camel-groupwise-store.h	2005/09/18 18:21:10	1.11
+++ camel/providers/groupwise/camel-groupwise-store.h	2006/03/11 09:52:29	1.12
@@ -82,6 +82,7 @@
 const char *groupwise_base_url_lookup (CamelGroupwiseStorePrivate *priv);
 CamelFolderInfo * create_junk_folder (CamelStore *store);
 gboolean camel_groupwise_store_connected (CamelGroupwiseStore *store, CamelException *ex);
+void gw_store_reload_folder (CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex);
 
 #ifdef __cplusplus
 }

Places

File bnc-156823-newly-configured-gw-dont-work.patch of Package evolution-data-server-2.6

Places