Hello community, here is the log from the commit of package evolution-data-server checked in at Wed Apr 5 17:20:19 CEST 2006. -------- --- GNOME/evolution-data-server/evolution-data-server.changes 2006-04-03 15:29:05.000000000 +0200 +++ evolution-data-server/evolution-data-server.changes 2006-04-05 10:39:01.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Apr 5 10:38:02 CEST 2006 - vvaradhan@novell.com + +- Updated bnc-158107-no-notification-canceled-mtgs.patch - Fixes + sending user specified comments during cancellation of meetings. +- Fixes (bnc) + 161000 Junk mail features in evolution cannot be shut off. - Sankar + 158617 Evolution crashed after few minutes after marking few + mails junk - Sankar - (single patch) +- GW Proxy optimizations - Do not do GetQM while refreshing on proxy. + +------------------------------------------------------------------- New: ---- bnc-161000-junk-mail-dont-work.patch gw-proxy-issues.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution-data-server.spec ++++++ --- /var/tmp/diff_new_pack.4LO3RA/_old 2006-04-05 17:19:26.000000000 +0200 +++ /var/tmp/diff_new_pack.4LO3RA/_new 2006-04-05 17:19:26.000000000 +0200 @@ -18,7 +18,7 @@ Autoreqprov: on Summary: Evolution Data Server Version: 1.6.0 -Release: 13 +Release: 14 Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.6/%{name}-%{version}.tar.bz2 #Patch3: evolution-data-server-gcc4.patch Patch5: evolution-data-server-configure.patch @@ -52,6 +52,8 @@ Patch31: crash-while-browsing-through-mails.patch Patch32: bnc-158107-no-notification-canceled-mtgs.patch Patch33: bnc-160147-cant-delete-created-calendar-accounts.patch +Patch34: bnc-161000-junk-mail-dont-work.patch +Patch35: gw-proxy-issues.patch Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libsoup >= 2.2.6 mozilla-nss @@ -115,6 +117,8 @@ %patch31 %patch32 %patch33 +%patch34 +%patch35 %build rename no nb po/no.* @@ -164,6 +168,14 @@ %{prefix}/share/gtk-doc/html/* %changelog -n evolution-data-server +* Wed Apr 05 2006 - vvaradhan@novell.com +- Updated bnc-158107-no-notification-canceled-mtgs.patch - Fixes + sending user specified comments during cancellation of meetings. +- Fixes (bnc) + 161000 Junk mail features in evolution cannot be shut off. - Sankar + 158617 Evolution crashed after few minutes after marking few + mails junk - Sankar - (single patch) +- GW Proxy optimizations - Do not do GetQM while refreshing on proxy. * Mon Apr 03 2006 - vvaradhan@novell.com - Fixes (bnc) 160889 Evolution shows summary folders in tree ++++++ bnc-158107-no-notification-canceled-mtgs.patch ++++++ --- /var/tmp/diff_new_pack.4LO3RA/_old 2006-04-05 17:19:27.000000000 +0200 +++ /var/tmp/diff_new_pack.4LO3RA/_new 2006-04-05 17:19:27.000000000 +0200 @@ -259,3 +259,28 @@ g_object_unref (comp); } +Index: servers/groupwise/e-gw-connection.c +=================================================================== +RCS file: /cvs/gnome/evolution-data-server/servers/groupwise/e-gw-connection.c,v +retrieving revision 1.141 +diff -u -p -r1.141 e-gw-connection.c +--- servers/groupwise/e-gw-connection.c 23 Mar 2006 10:08:37 -0000 1.141 ++++ servers/groupwise/e-gw-connection.c 3 Apr 2006 08:41:02 -0000 +@@ -1463,7 +1463,16 @@ e_gw_connection_retract_request (EGwConn + soup_soap_message_start_element (msg, "items", NULL, NULL); + e_gw_message_write_string_parameter (msg, "item", NULL, id); + soup_soap_message_end_element (msg); +- /* comment, FALSE, FALSE to be filled in later. */ ++ ++ if (retract_all) ++ e_gw_message_write_string_parameter (msg, "retractingAllInstances", NULL, "1"); ++ ++ if (comment) ++ e_gw_message_write_string_parameter (msg, "comment", NULL, comment); ++ ++ if (resend) ++ e_gw_message_write_string_parameter (msg, "retractCausedByResend", NULL, "1"); ++ + e_gw_message_write_footer (msg); + + response = e_gw_connection_send_message (cnc, msg); ++++++ bnc-161000-junk-mail-dont-work.patch ++++++ Index: camel/providers/groupwise/camel-groupwise-folder.c =================================================================== RCS file: /cvs/gnome/evolution-data-server/camel/providers/groupwise/camel-groupwise-folder.c,v retrieving revision 1.126 diff -u -p -r1.126 camel-groupwise-folder.c --- camel/providers/groupwise/camel-groupwise-folder.c 3 Apr 2006 06:36:11 -0000 1.126 +++ camel/providers/groupwise/camel-groupwise-folder.c 3 Apr 2006 06:42:45 -0000 @@ -491,7 +491,8 @@ update_junk_list (CamelStore *store, Cam goto error; email = g_strsplit_set (from, "<>", -1); - if (!email[1]) + + if (!email || !email[1]) goto error; if (flag == ADD_JUNK_ENTRY) @@ -617,6 +618,7 @@ groupwise_sync (CamelFolder *folder, gbo if ((flags & CAMEL_MESSAGE_JUNK) && !(flags & CAMEL_GW_MESSAGE_JUNK)) /*marked a message junk*/ move_to_junk (folder, info, ex); + else if ((flags & CAMEL_MESSAGE_JUNK) && (flags & CAMEL_GW_MESSAGE_JUNK)) /*message was marked as junk, now unjunk*/ move_to_mailbox (folder, info, ex); @@ -1171,12 +1173,17 @@ gw_update_cache (CamelFolder *folder, GL org = e_gw_item_get_organizer (item); if (org) { - if (exists) - camel_pstring_free(mi->info.from); - if (org->display_name && org->display_name[0]) - mi->info.from = camel_pstring_strdup (org->display_name); - else if (org->email && org->email[0]) - mi->info.from = camel_pstring_strdup (org->email); + GString *str; + str = g_string_new (""); + if (org->display_name && org->display_name[0]) + str = g_string_append (str, org->display_name); + if (org->email && org->email[0]) { + g_string_append (str, "<"); + str = g_string_append (str, org->email); + g_string_append (str, ">"); + } + mi->info.from = camel_pstring_strdup (str->str); + g_string_free (str, TRUE); } g_string_truncate (str, 0); recp_list = e_gw_item_get_recipient_list (item); @@ -1369,10 +1376,17 @@ gw_update_summary ( CamelFolder *folder, org = e_gw_item_get_organizer (item); if (org) { - if (org->display_name && org->display_name[0]) - mi->info.from = camel_pstring_strdup (org->display_name); - else if (org->email && org->email[0]) - mi->info.from = camel_pstring_strdup (org->email); + GString *str; + str = g_string_new (""); + if (org->display_name && org->display_name[0]) + str = g_string_append (str, org->display_name); + if (org->email && org->email[0]) { + g_string_append (str, "<"); + str = g_string_append (str, org->email); + g_string_append (str, ">"); + } + mi->info.from = camel_pstring_strdup (str->str); + g_string_free (str, TRUE); } g_string_truncate (str, 0); recp_list = e_gw_item_get_recipient_list (item); ++++++ gw-proxy-issues.patch ++++++ --- camel/providers/groupwise/camel-groupwise-folder.c.orig 2006-04-04 17:00:02.054008863 +0200 +++ camel/providers/groupwise/camel-groupwise-folder.c 2006-04-04 17:00:05.509122536 +0200 @@ -914,7 +914,7 @@ groupwise_refresh_folder(CamelFolder *fo if (!camel_groupwise_store_connected (gw_store, ex)) goto end1; - if (!strcmp (folder->full_name, "Trash") || is_proxy) { + if (!strcmp (folder->full_name, "Trash")) { status = e_gw_connection_get_items (cnc, container_id, "peek recipient distribution created delivered attachments subject status size", NULL, &list); if (status != E_GW_CONNECTION_STATUS_OK) { if (status ==E_GW_CONNECTION_STATUS_OTHER) { @@ -939,71 +939,73 @@ groupwise_refresh_folder(CamelFolder *fo /*Get the New Items*/ - status = e_gw_connection_get_quick_messages (cnc, container_id, - "peek id", - &t_str, "New", NULL, NULL, -1, &slist); - if (status != E_GW_CONNECTION_STATUS_OK) { - camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_INVALID, _("Authentication failed")); - goto end2; - } + if (!is_proxy) { + status = e_gw_connection_get_quick_messages (cnc, container_id, + "peek id", + &t_str, "New", NULL, NULL, -1, &slist); + if (status != E_GW_CONNECTION_STATUS_OK) { + camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_INVALID, _("Authentication failed")); + goto end2; + } - /* - * The value in t_str is the one that has to be used for the next set of calls. - * so store this value in the summary. - */ - if (summary->time_string) - g_free (summary->time_string); + /* + * The value in t_str is the one that has to be used for the next set of calls. + * so store this value in the summary. + */ + if (summary->time_string) + g_free (summary->time_string); - summary->time_string = g_strdup (t_str); - g_free (t_str); - t_str = NULL; + summary->time_string = g_strdup (t_str); + g_free (t_str); + t_str = NULL; - /* - for ( sl = slist ; sl != NULL; sl = sl->next) - list = g_list_append (list, sl->data);*/ + /* + for ( sl = slist ; sl != NULL; sl = sl->next) + list = g_list_append (list, sl->data);*/ - if (slist && g_slist_length(slist) != 0) - check_all = TRUE; + if (slist && g_slist_length(slist) != 0) + check_all = TRUE; - g_slist_free (slist); - slist = NULL; + g_slist_free (slist); + slist = NULL; - t_str = g_strdup (time_string); + t_str = g_strdup (time_string); - /*Get those items which have been modifed*/ + /*Get those items which have been modifed*/ - status = e_gw_connection_get_quick_messages (cnc, container_id, - "peek id", - &t_str, "Modified", NULL, NULL, -1, &slist); + status = e_gw_connection_get_quick_messages (cnc, container_id, + "peek id", + &t_str, "Modified", NULL, NULL, -1, &slist); - if (status != E_GW_CONNECTION_STATUS_OK) { - camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_INVALID, _("Authentication failed")); - goto end3; - } + if (status != E_GW_CONNECTION_STATUS_OK) { + camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_INVALID, _("Authentication failed")); + goto end3; + } - /* The storing of time-stamp to summary code below should be commented if the - above commented code is uncommented */ + /* The storing of time-stamp to summary code below should be commented if the + above commented code is uncommented */ - /* if (summary->time_string) - g_free (summary->time_string); + /* if (summary->time_string) + g_free (summary->time_string); - summary->time_string = g_strdup (t_str); + summary->time_string = g_strdup (t_str); - g_free (t_str), t_str = NULL;*/ + g_free (t_str), t_str = NULL;*/ - for ( sl = slist ; sl != NULL; sl = sl->next) - list = g_list_prepend (list, sl->data); + for ( sl = slist ; sl != NULL; sl = sl->next) + list = g_list_prepend (list, sl->data); - g_slist_free (slist); - slist = NULL; + g_slist_free (slist); + slist = NULL; - if (gw_store->current_folder != folder) { - gw_store->current_folder = folder; - } + if (gw_store->current_folder != folder) { + gw_store->current_folder = folder; + } - if (list) { - gw_update_cache (folder, list, ex, FALSE); + if (list) { + gw_update_cache (folder, list, ex, FALSE); + } } @@ -1017,7 +1019,7 @@ groupwise_refresh_folder(CamelFolder *fo * this folder, and update the summary. */ /*create a new session thread for the update all operation*/ - if (check_all) { + if (check_all || is_proxy) { msg = camel_session_thread_msg_new (session, &update_ops, sizeof(*msg)); msg->cnc = cnc; msg->t_str = g_strdup (time_string); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...