File eds-foriegn-noalarm-dave.diff of Package evolution-data-server

Overview Repositories Revisions Requests Users Attributes Meta

File eds-foriegn-noalarm-dave.diff of Package evolution-data-server

Index: servers/exchange/storage/exchange-hierarchy-foreign.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/exchange/storage/exchange-hierarchy-foreign.c,v
retrieving revision 1.8
diff -u -p -r1.8 exchange-hierarchy-foreign.c
--- servers/exchange/storage/exchange-hierarchy-foreign.c	6 Feb 2006 08:01:53 -0000	1.8
+++ servers/exchange/storage/exchange-hierarchy-foreign.c	26 Sep 2006 05:05:21 -0000
@@ -429,6 +429,7 @@ exchange_hierarchy_foreign_add_folder (E
 	const char *folder_type = NULL;
 	const char *physical_uri = NULL;
 	char *new_folder_name;
+	guint folder_mask = 0;
 
 	result =  create_internal (hier, hier->toplevel, folder_name, NULL, folder);
 	if (result == EXCHANGE_ACCOUNT_FOLDER_OK) {
@@ -440,23 +441,26 @@ exchange_hierarchy_foreign_add_folder (E
 
 		if (!(strcmp (folder_type, "calendar")) ||
 		!(strcmp (folder_type, "calendar/public"))) {
+			folder_mask = EXCHANGE_CALENDAR_FOLDER | FORIEGN_FOLDER_FLAG;
 			add_folder_esource (hier->account,
-				     	    EXCHANGE_CALENDAR_FOLDER,
+				     	    folder_mask,
 				     	    new_folder_name,
 				    	    physical_uri);
 		}
 		else if (!(strcmp (folder_type, "tasks")) ||
 			 !(strcmp (folder_type, "tasks/public"))) {
+			folder_mask = EXCHANGE_TASKS_FOLDER | FORIEGN_FOLDER_FLAG;
 				add_folder_esource (hier->account,
-				     		    EXCHANGE_TASKS_FOLDER,
+				     		    folder_mask,
 				     		    new_folder_name,
 				     		    physical_uri);
 		}
 		else if (!(strcmp (folder_type, "contacts")) ||
 			 !(strcmp (folder_type, "contacts/public")) ||
 			 !(strcmp (folder_type, "contacts/ldap"))) {
+				folder_mask = EXCHANGE_CONTACTS_FOLDER | FORIEGN_FOLDER_FLAG;
 				add_folder_esource (hier->account,
-				     		    EXCHANGE_CONTACTS_FOLDER,
+				     		    folder_mask,
 				     		    new_folder_name,
 				     		    physical_uri);
 		}
Index: servers/exchange/storage/exchange-constants.h
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/exchange/storage/exchange-constants.h,v
retrieving revision 1.3
diff -u -p -r1.3 exchange-constants.h
--- servers/exchange/storage/exchange-constants.h	14 Jan 2006 09:42:25 -0000	1.3
+++ servers/exchange/storage/exchange-constants.h	26 Sep 2006 05:05:21 -0000
@@ -17,6 +17,10 @@ typedef enum {
 	EXCHANGE_CONTACTS_FOLDER
 }FolderType;
 
+/* This flag indicates that its other user's folder. We encode this flag
+   with the FolderType to identify the same. We are doing this to
+   avoid ABI/API break. */
+#define FORIEGN_FOLDER_FLAG 0x0100
 
 #define EXCHANGE_COMPONENT_FACTORY_IID  "OAFIID:GNOME_Evolution_Exchange_Component_Factory:" BASE_VERSION
 #define EXCHANGE_COMPONENT_IID		"OAFIID:GNOME_Evolution_Exchange_Component:" BASE_VERSION
Index: servers/exchange/storage/exchange-esource.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/exchange/storage/exchange-esource.c,v
retrieving revision 1.13
diff -u -p -r1.13 exchange-esource.c
--- servers/exchange/storage/exchange-esource.c	11 May 2006 09:39:41 -0000	1.13
+++ servers/exchange/storage/exchange-esource.c	26 Sep 2006 05:05:21 -0000
@@ -48,10 +48,16 @@ add_folder_esource (ExchangeAccount *acc
 	char *username, *authtype = NULL;
 	int mode;
 	ESourceList *source_list = NULL;
-	gboolean offline_flag, update_selection = TRUE;
+	gboolean offline_flag, update_selection = TRUE, foriegn_folder;
 
 	client = gconf_client_get_default ();
 
+	/* decode the flag */
+	foriegn_folder = folder_type & FORIEGN_FOLDER_FLAG;
+
+	/* Unset the flag */
+	folder_type = folder_type & ~FORIEGN_FOLDER_FLAG;
+	
 	if (folder_type == EXCHANGE_CONTACTS_FOLDER) {
 		source_list = e_source_list_new_for_gconf ( client, 
 							CONF_KEY_CONTACTS);
@@ -103,6 +109,10 @@ add_folder_esource (ExchangeAccount *acc
 			 */
 			e_source_set_property (source, "offline_sync", "1");
 		}
+		
+		if (foriegn_folder && (folder_type != EXCHANGE_CONTACTS_FOLDER))
+			e_source_set_property (source, "alarm", "never");
+
 		e_source_set_property (source, "username", username);
 		e_source_set_property (source, "auth-domain", "Exchange");
 		if (authtype)
@@ -140,6 +150,10 @@ add_folder_esource (ExchangeAccount *acc
 				e_source_set_property (source, "auth", "plain/password");
 			else
 				e_source_set_property (source, "auth", "1");
+
+			if (foriegn_folder && (folder_type != EXCHANGE_CONTACTS_FOLDER))
+				e_source_set_property (source, "alarm", "never");
+
 			e_source_group_add_source (source_group, source, -1);
 			source_new = TRUE;
 			e_source_list_sync (source_list, NULL);

Places

File eds-foriegn-noalarm-dave.diff of Package evolution-data-server

Places