** Fix for bug #308636

2007-08-23  Milan Crha  <mcrha@redhat.com>

        ** Fix for bug #308636

        * camel-gw-listener.c: (add_esource):
        Set "create_source=yes" property to source group based on new
        parameter
        and always set property "delete=no" to new source.
        * camel-gw-listener.c: , (add_calendar_tasks_sources),
        (add_proxy_sources): Uses add_source.


svn path=/trunk/; revision=34067

2 files changed, 21 insertions, 7 deletions

diff --git a/plugins/groupwise-account-setup/ChangeLog b/plugins/groupwise-account-setup/ChangeLog
index 32b5b08a54..1d4ed2d539 100644
--- a/plugins/groupwise-account-setup/ChangeLog
+++ b/plugins/groupwise-account-setup/ChangeLog
@@ -1,3 +1,13 @@
+2007-08-23  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #308636
+
+	* camel-gw-listener.c: (add_esource):
+	Set "create_source=yes" property to source group based on new parameter
+	and always set property "delete=no" to new source.
+	* camel-gw-listener.c: , (add_calendar_tasks_sources),
+	(add_proxy_sources): Uses add_source.
+
 2007-05-25  Matthew Barnes  <mbarnes@redhat.com>
 
 	* camel-gw-listener.c (remove_esource), (modify_esource):
diff --git a/plugins/groupwise-account-setup/camel-gw-listener.c b/plugins/groupwise-account-setup/camel-gw-listener.c
index 4e5fc3490b..841822ccbf 100644
--- a/plugins/groupwise-account-setup/camel-gw-listener.c
+++ b/plugins/groupwise-account-setup/camel-gw-listener.c
@@ -168,7 +168,7 @@ lookup_account_info (const char *key)
 #define SELECTED_NOTES   "/apps/evolution/calendar/memos/selected_memos"
 
 static void
-add_esource (const char *conf_key, const char *group_name,  const char *source_name, CamelURL *url, const char* parent_id_name)
+add_esource (const char *conf_key, const char *group_name,  const char *source_name, CamelURL *url, const char* parent_id_name, gboolean can_create)
 {
 	ESourceList *source_list;
 	ESourceGroup *group;
@@ -203,6 +203,9 @@ add_esource (const char *conf_key, const char *group_name,  const char *source_n
 	if (!e_source_list_add_group (source_list, group, -1))
 		return;
 
+	if (!can_create)
+		e_source_group_set_property (group, "create_source", "no");
+
 	relative_uri = g_strdup_printf ("%s@%s/", url->user, poa_address);
 	source = e_source_new (source_name, relative_uri);
 	e_source_set_property (source, "auth", "1");
@@ -211,6 +214,7 @@ add_esource (const char *conf_key, const char *group_name,  const char *source_n
 	e_source_set_property (source, "auth-domain", "Groupwise");
 	e_source_set_property (source, "use_ssl", use_ssl);
 	e_source_set_property (source, "offline_sync", offline_sync ? "1" : "0" );
+	e_source_set_property (source, "delete", "no");
 	if (parent_id_name) {
 		e_source_set_property (source, "parent_id_name", parent_id_name);
 		e_source_set_color_spec (source, camel_url_get_param (url, "color"));
@@ -393,9 +397,9 @@ add_calendar_tasks_sources (GwAccountInfo *info)
 	CamelURL *url;
 	
 	url = camel_url_new (info->source_url, NULL);
-	add_esource ("/apps/evolution/calendar/sources", info->name, _("Calendar"), url, NULL);
-	add_esource ("/apps/evolution/tasks/sources", info->name, _("Tasks"), url, NULL);
-	add_esource ("/apps/evolution/memos/sources", info->name, _("Notes"), url, NULL);
+	add_esource ("/apps/evolution/calendar/sources", info->name, _("Calendar"), url, NULL, FALSE);
+	add_esource ("/apps/evolution/tasks/sources", info->name, _("Tasks"), url, NULL, FALSE);
+	add_esource ("/apps/evolution/memos/sources", info->name, _("Notes"), url, NULL, TRUE);
 	
 	camel_url_free (url);
 
@@ -537,9 +541,9 @@ add_proxy_sources (GwAccountInfo *info, const char *parent_name)
 
 	camel_url_set_param (url, "color", color);
 
-	add_esource ("/apps/evolution/calendar/sources", info->name, _("Calendar"), url, parent_name);
-	add_esource ("/apps/evolution/tasks/sources", info->name, _("Tasks"), url, parent_name);
-	add_esource ("/apps/evolution/memos/sources", info->name, _("Notes"), url, parent_name);
+	add_esource ("/apps/evolution/calendar/sources", info->name, _("Calendar"), url, parent_name, FALSE);
+	add_esource ("/apps/evolution/tasks/sources", info->name, _("Tasks"), url, parent_name, FALSE);
+	add_esource ("/apps/evolution/memos/sources", info->name, _("Notes"), url, parent_name, TRUE);
 
 	g_free (color);
 	camel_url_free (url);