From fee5916b60c605ff5086d8fdc2a85c5ea21351f6 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 31 Jan 2009 19:03:12 +0000 Subject: Merge revisions 37108:37199 from trunk. svn path=/branches/kill-bonobo/; revision=37200 --- plugins/groupwise-account-setup/ChangeLog | 7 +++++++ plugins/groupwise-account-setup/groupwise-account-setup.c | 11 ----------- 2 files changed, 7 insertions(+), 11 deletions(-) (limited to 'plugins/groupwise-account-setup') diff --git a/plugins/groupwise-account-setup/ChangeLog b/plugins/groupwise-account-setup/ChangeLog index 474e27d7ec..cde1135294 100644 --- a/plugins/groupwise-account-setup/ChangeLog +++ b/plugins/groupwise-account-setup/ChangeLog @@ -1,3 +1,10 @@ +2009-01-29 Bharath Acharya + + ** Fix for bug #470474 (bugzilla.novell.com) + + * groupwise-account-setup.c (set_esource_props): a corruption. Cleanup + unused strings. + 2008-11-11 Suman Manjunath ** Fix for bug #440646 (bugzilla.novell.com) diff --git a/plugins/groupwise-account-setup/groupwise-account-setup.c b/plugins/groupwise-account-setup/groupwise-account-setup.c index 5ca57d7c7f..fca171aab5 100644 --- a/plugins/groupwise-account-setup/groupwise-account-setup.c +++ b/plugins/groupwise-account-setup/groupwise-account-setup.c @@ -51,17 +51,9 @@ set_esource_props (const char *path, EAccount *a, GConfClient *client, const cha { ESourceList *list; GSList *groups; - char *old_relative_uri; - const char *poa_address; - CamelURL *url = camel_url_new (a->source->url, NULL); - old_relative_uri = g_strdup_printf ("%s@%s/", url->user, poa_address); list = e_source_list_new_for_gconf (client, path); groups = e_source_list_peek_groups (list); - poa_address = url->host; - - if (!poa_address || !*poa_address) - return; for ( ; groups != NULL; groups = g_slist_next (groups)) { ESourceGroup *group = E_SOURCE_GROUP (groups->data); @@ -87,9 +79,6 @@ set_esource_props (const char *path, EAccount *a, GConfClient *client, const cha e_source_list_sync (list, NULL); g_object_unref (list); - g_free (old_relative_uri); - camel_url_free (url); - } void -- cgit v1.2.3