[evolution-patches] enable shared folders (Groupwise features plugin and camel)

[Vivek Jain <jvivek novell com>]

hi,

I am re-enabling the shared folder functionality as the gw-server is now
fixed to support it properly.

Attached patches remove the env. check from respective places.

Thanks,
Vivek Jain

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/ChangeLog,v
retrieving revision 1.115
diff -u -p -r1.115 ChangeLog
--- ChangeLog	26 Sep 2005 10:34:45 -0000	1.115
+++ ChangeLog	30 Sep 2005 07:10:40 -0000
@@ -1,3 +1,9 @@
+2005-09-30 Vivek Jain <jvivek novell com>
+	
+	* camel-groupwise-store.c: (get_folder_info)
+	remove env chceck GROUPWISE_SHARED_FOLDER
+	to enable shared folder functionality
+
 2005-09-26 Vivek Jain <jvivek novell com>
 	
 	* camel-groupwise-folder.c :(update_junk_list)
Index: camel-groupwise-store.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/camel-groupwise-store.c,v
retrieving revision 1.76
diff -u -p -r1.76 camel-groupwise-store.c
--- camel-groupwise-store.c	23 Sep 2005 05:53:03 -0000	1.76
+++ camel-groupwise-store.c	30 Sep 2005 07:10:40 -0000
@@ -713,14 +713,11 @@ convert_to_folder_info (CamelGroupwiseSt
 	/*name_hash returns the container id given the name */
 	g_hash_table_insert (priv->name_hash, g_strdup(fi->full_name), g_strdup(id));
 
-	/*XXX: Remove this condition check when server has a fix to show mails in shared-folder*/
-	if (getenv("GROUPWISE_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_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 (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;

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/ChangeLog,v
retrieving revision 1.34
diff -u -p -r1.34 ChangeLog
--- ChangeLog	27 Sep 2005 10:10:16 -0000	1.34
+++ ChangeLog	30 Sep 2005 07:16:13 -0000
@@ -1,3 +1,10 @@
+2005-09-30  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)
+	enable shared-folder functionalilty, remove env check 
+
 2005-09-27  Vivek Jain <jvivek novell com>
 	
 	* install-shared.c: (accept_clicked): 
Index: share-folder-common.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/share-folder-common.c,v
retrieving revision 1.7
diff -u -p -r1.7 share-folder-common.c
--- share-folder-common.c	24 Aug 2005 03:15:26 -0000	1.7
+++ share-folder-common.c	30 Sep 2005 07:16:13 -0000
@@ -351,9 +351,6 @@ 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("GROUPWISE_SHARED_FOLDER"))
-		return;
 
 	if (! g_strrstr (t->uri, "groupwise://"))
 		return ;
@@ -407,10 +404,6 @@ 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("GROUPWISE_SHARED_FOLDER"))
-		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.5
diff -u -p -r1.5 install-shared.c
--- install-shared.c	27 Sep 2005 10:10:16 -0000	1.5
+++ install-shared.c	30 Sep 2005 07:16:13 -0000
@@ -193,10 +193,6 @@ org_gnome_popup_wizard (EPlugin *ep, EME
 	char *notification;
 	char *start_message;
 
-	/* XXX:Remove this when server has a fix to show mails in shared-folder*/
-	if (!getenv("GROUPWISE_SHARED_FOLDER"))
-		return;
-
 	if (!msg)
 		return ;