[evolution-patches] Temporarily disable shared-folder support (groupwise-features plugin, camel-groupwise)



I am disabling shared folder functionality temporarily as its broken
currently due to some changes in server (SOAP) APIs. As they are not
going to be resolved sometime in near future (?), its better to disable
it till then. However for testing purposes "SHARED_FOLDER" env variable
can be exported to get the functionality back.

Please let me know if it looks ok to be committed.

Thanks,
Vivek Jain
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/ChangeLog,v
retrieving revision 1.27
diff -u -p -r1.27 ChangeLog
--- ChangeLog	12 Aug 2005 07:42:10 -0000	1.27
+++ ChangeLog	22 Aug 2005 04:28:33 -0000
@@ -1,3 +1,12 @@
+2005-08-22  Vivek Jain <jvivek novell com>
+	
+	* shared-folder-common.c: (org_gnome_create_option)
+	 			: (org_gnome_shared_folder_factory)
+	* install-shared.c 	: (org_gnome_popup_wizard)
+	disable shared-folder functionalilty temporarily, (server doesn't show
+	mails in it)
+	export SHARED_FOLDER if you want to have it
+
 2005-08-11  Veerapuram Varadhan <vvaradhan novell com>
 
 	* proxy.c:
Index: share-folder-common.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/share-folder-common.c,v
retrieving revision 1.4
diff -u -p -r1.4 share-folder-common.c
--- share-folder-common.c	10 Aug 2005 03:52:58 -0000	1.4
+++ share-folder-common.c	22 Aug 2005 04:28:33 -0000
@@ -350,6 +350,10 @@ org_gnome_create_option(EPlugin *ep, EMP
 	int i = 0;
 	static int first = 0;
 	
+	/*XXX: Remove this when server has a fix to show mails in shared-folder*/
+	if (getenv("SHARED_FOLDER") == NULL)
+		return;
+
 	if (! g_strrstr (t->uri, "groupwise://"))
 		return ;
 	
@@ -402,6 +406,10 @@ org_gnome_shared_folder_factory (EPlugin
 	EMConfigTargetFolder *target=  (EMConfigTargetFolder *)hook_data->config->target;
 	CamelFolder *folder = target->folder;
 	
+	/*XXX: Remove this when server has a fix to show mails in shared-folder*/
+	if (getenv("SHARED_FOLDER") == NULL)
+		return NULL;
+
 	folder_name = g_strdup (folder->full_name);
 	folderuri = g_strdup(target->uri);
 	if (folderuri && folder_name) 
Index: install-shared.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/install-shared.c,v
retrieving revision 1.1
diff -u -p -r1.1 install-shared.c
--- install-shared.c	23 May 2005 09:44:26 -0000	1.1
+++ install-shared.c	22 Aug 2005 04:28:33 -0000
@@ -183,7 +183,11 @@ org_gnome_popup_wizard (EPlugin *ep, EME
 	char *notification;
 	char *start_message;
 	char *buffer = NULL;
-	
+
+	/* XXX:Remove this when server has a fix to show mails in shared-folder*/
+	if (getenv("SHARED_FOLDER") == NULL)
+		return;
+
 	if (!msg)
 		return ;
 
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/ChangeLog,v
retrieving revision 1.97
diff -u -p -r1.97 ChangeLog
--- ChangeLog	19 Aug 2005 07:24:03 -0000	1.97
+++ ChangeLog	22 Aug 2005 04:32:02 -0000
@@ -1,3 +1,10 @@
+2005-08-22 Vivek Jain <jvivek novell com>
+	
+	* camel-groupwise-store.c: (get_folder_info)
+	disabled support for shared folder temporarily
+	you have to export SHARED_FOLDER to see a shared folder
+	with diff icon.
+
 2005-08-19  Parthasarathi Susarla <sparthasarathi novell com>
 	
 	** see bug #313806
Index: camel-groupwise-store.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/camel-groupwise-store.c,v
retrieving revision 1.65
diff -u -p -r1.65 camel-groupwise-store.c
--- camel-groupwise-store.c	18 Aug 2005 06:03:02 -0000	1.65
+++ camel-groupwise-store.c	22 Aug 2005 04:32:03 -0000
@@ -761,11 +761,14 @@ groupwise_get_folder_info (CamelStore *s
 		/*name_hash returns the container id given the name */
 		g_hash_table_insert (priv->name_hash, g_strdup(fi->full_name), g_strdup(id));
 
-		if (e_gw_container_get_is_shared_to_me (container))
-                        fi->flags |= CAMEL_FOLDER_SHARED_TO_ME;
-                                                                                                                             
-                if (e_gw_container_get_is_shared_by_me (container))
-                        fi->flags |= CAMEL_FOLDER_SHARED_BY_ME;
+		/*XXX: Remove this condition check when server has a fix to show mails in shared-folder*/
+		if (getenv("SHARED_FOLDER")) {
+			if (e_gw_container_get_is_shared_to_me (container))
+				fi->flags |= CAMEL_FOLDER_SHARED_TO_ME;
+
+			if (e_gw_container_get_is_shared_by_me (container))
+				fi->flags |= CAMEL_FOLDER_SHARED_BY_ME;
+		}
 
 		if (type == E_GW_CONTAINER_TYPE_INBOX) {
 			fi->total = -1;


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