File bnc-298095-calendar-folder-access.diff of Package evolution-data-server

Overview Repositories Revisions Requests Users Attributes Meta

File bnc-298095-calendar-folder-access.diff of Package evolution-data-server

Index: servers/groupwise/e-gw-container.c
===================================================================
--- servers/groupwise/e-gw-container.c	(revision 7903)
+++ servers/groupwise/e-gw-container.c	(working copy)
@@ -44,7 +44,7 @@
 	gboolean is_frequent_contacts; /*indicates  whether this folder is frequent contacts or not */
 	gboolean is_shared_by_me;   
 	gboolean is_shared_to_me;
-
+	gboolean is_system_folder;
 };
 
 static GObjectClass *parent_class = NULL;
@@ -262,6 +262,15 @@
 		g_free (value) ;
 	}
 
+	subparam = soup_soap_parameter_get_first_child_by_name (param, "isSystemFolder");
+	if (subparam) {
+		value = soup_soap_parameter_get_string_value (subparam);
+		if (!strcmp (value, "1"))
+			container->priv->is_system_folder = TRUE;
+		g_free (value);
+	}
+
+
 	/* retrive the unread and total count */
 	subparam = soup_soap_parameter_get_first_child_by_name (param, "hasUnread") ;
 	if (!subparam) {
@@ -523,6 +532,21 @@
 	container->priv->is_shared_to_me = is_shared_to_me;
 }
 
+gboolean
+e_gw_container_get_is_system_folder (EGwContainer *container)
+{
+	g_return_val_if_fail (E_IS_GW_CONTAINER (container), FALSE);
+	
+	return container->priv->is_system_folder;
+}
+
+void
+e_gw_container_set_is_system_folder (EGwContainer *container, gboolean is_system_folder)
+{
+	g_return_if_fail (E_IS_GW_CONTAINER (container));
+	
+	container->priv->is_system_folder = is_system_folder;
+}
 const char *
 e_gw_container_get_name (EGwContainer *container)
 {
Index: servers/groupwise/e-gw-container.h
===================================================================
--- servers/groupwise/e-gw-container.h	(revision 7903)
+++ servers/groupwise/e-gw-container.h	(working copy)
@@ -97,6 +97,8 @@
 EGwContainerType e_gw_container_get_container_type (EGwContainer *container) ;
 void 	      e_gw_container_get_user_list(EGwContainer *container, GList **user_list);
 void	      e_gw_container_form_message (SoupSoapMessage *msg, gchar *id, GList *new_list, const char *sub, const char *mesg, int flag);
+gboolean e_gw_container_get_is_system_folder (EGwContainer *container);
+void e_gw_container_set_is_system_folder (EGwContainer *container, gboolean is_system_folder);
 
 G_END_DECLS
 
Index: calendar/backends/groupwise/e-cal-backend-groupwise.c
===================================================================
--- calendar/backends/groupwise/e-cal-backend-groupwise.c	(revision 7903)
+++ calendar/backends/groupwise/e-cal-backend-groupwise.c	(working copy)
@@ -801,9 +801,9 @@
 	res =  GNOME_Evolution_Calendar_ObjectNotFound;
 	for (l = container_list; l != NULL; l = l->next) {
 		EGwContainer *container = E_GW_CONTAINER (l->data);
-		const char *name = e_gw_container_get_name (container);
 		
-		if (e_gw_container_get_container_type (container) == E_GW_CONTAINER_TYPE_CALENDAR && (name && strcmp (name, "Calendar") == 0)) {
+		if (e_gw_container_get_is_system_folder (container) && 
+				e_gw_container_get_container_type (container) == E_GW_CONTAINER_TYPE_CALENDAR) {
 			priv->container_id = g_strdup (e_gw_container_get_id (container));
 			priv->total_count = e_gw_container_get_total_count (container);
 			res = GNOME_Evolution_Calendar_Success;

Places

File bnc-298095-calendar-folder-access.diff of Package evolution-data-server

Places