Hello community,
here is the log from the commit of package evolution-data-server
checked in at Wed Dec 19 14:43:46 CET 2007.
--------
--- GNOME/evolution-data-server/evolution-data-server.changes 2007-12-05 01:21:08.000000000 +0100
+++ /mounts/work_src_done/STABLE/evolution-data-server/evolution-data-server.changes 2007-12-18 23:24:55.748804000 +0100
@@ -1,0 +2,19 @@
+Tue Dec 18 13:06:54 CST 2007 - maw@suse.de
+
+- Update to version 2.21.4:
+ + The large version bump is due to evolution and related packages
+ synchronizing their version numbers with those of GNOME
+ + Bugs (bugzilla.gnome.org, except where otherwise indicated)
+ fixed: #322917, #336074, #339510, #462593, #466499, #486126,
+ #487687, #501548, #501622, #501969, #502866, #308815, #376425,
+ #415817, #461979, #492426, #494314, #318842, #345135, #359267,
+ #430420, #460649, #487229, #488156, #492130, #494304,
+ bnc#203480, #231178, #271777, #417999, #420167, #469657,
+ #474000, #475487, #475493, #475494, #478404, #483301, #487270,
+ #488173, and #488351
+ + Support for Google Calendar
+ + Updated translations
+ + Protect against a NULL subject string
+- Remove old patches, and refresh and renumber the remaining ones.
+
+-------------------------------------------------------------------
Old:
----
167566-camel-groupwise-summary.patch
167640-camel-groupwise-store.patch
backend-timeout-fix.patch
beagle-meta-summary.patch
bgo-272307-evolution-clobbers-mail-address.patch
bgo-310433-eds-deny-rename-stdfolders.diff
bgo-315976-INBOX-not-shown-when-override-namespace.patch
bgo-321797.patch
bgo-323275-eds-crash-at-startup.patch
bgo-329371-eds-fix-full-username-email-format.patch
bgo-331146-eds-crash-at-startup.patch
bgo-334000-unexpected-dialog-creating-appt.patch
bgo-334807-eds-crasher.patch
bgo-369168-buffer-overrun.patch
bnc-137357-newly-configured-gw-dont-work.patch
bnc-138047-password-passphrase-msg-inconsistency.patch
bnc-152062-evolution-wont-show-attachment.patch
bnc-152355-mails-doesnt-show-gw.patch
bnc-153522-evo-doesnt-update-msg-status-workaround.patch
bnc-153522-evolution-doesnt-update-message-status.patch
bnc-156584-evo-wont-shutdown.patch
bnc-156823-newly-configured-gw-dont-work.patch
bnc-157323-messages-deleted-from-gw-remain-in-evo.patch
bnc-158093-sent-folder-have-to-not-from.patch
bnc-158107-no-notification-canceled-mtgs.patch
bnc-158112-send-receive-dlg-takes-time.patch
bnc-159934-eds-CPU-spikes.patch
bnc-160147-cant-delete-created-calendar-accounts.patch
bnc-160915-evolution-crash-clickng-goto-cal-view.patch
bnc-161000-junk-mail-dont-work.patch
bnc-161290-eds-crashed-forwarding-mail.patch
bnc-162005-e-d-s-crash-deleting-recur-appt.patch
bnc-163664-eds-crashes-on-invalid-utf8-contacts.patch
bnc-164323-random-mark-unread.patch
bnc-164323-random-mark-unread-updated.patch
bnc-164676-eds-stuck-tight-loop.patch
bnc-165714-eds-delegate-multiple-events.diff
bnc-167330-default-GW-alarms.patch
bnc-169034-eds-pub-folder-download.diff
bnc-169997-eds-infinite-loop.diff
bnc-170052-eds-crash.patch
bnc-173454.patch
bnc-176277-2.patch
bnc-177394.patch
bnc-179350.patch
bnc-181906-eds-ex-crash.diff
bnc-187529-calendar-cache-population.patch
bulk-delete.patch
cal-attachment-filename-handling.patch
camel-partha-gw-fixes.patch
camel-vfs-stream.diff
crash-while-browsing-through-mails.patch
datarootdir.diff
e-d-s-configure-break-fix.patch
eds-kerb-check.diff
eds-translations-updated.diff
eds-updated-translations.diff
email-appears-twice.patch
empty-trash-notify.patch
evolution-data-server-1.12.0.tar.bz2
fwd-mail.patch
german-translation-eds.diff
gw-proxy-issues.patch
gw-trash-fix.diff
imap4-removal.diff
imap-locking.patch
imap-perf.patch
nameselectorlist-keychange.diff
nss-nspr.patch
patch-for-random-eds-addr-crashes.patch
New:
----
evolution-data-server-2.21.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ evolution-data-server.spec ++++++
--- /var/tmp/diff_new_pack.zn5940/_old 2007-12-19 14:42:36.000000000 +0100
+++ /var/tmp/diff_new_pack.zn5940/_new 2007-12-19 14:42:36.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package evolution-data-server (Version 1.12.0)
+# spec file for package evolution-data-server (Version 2.21.4)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,102 +16,33 @@
Group: Development/Libraries/GNOME
AutoReqProv: on
Summary: Evolution Data Server
-Version: 1.12.0
-Release: 37
-Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.11/%{name}-%{version}.tar.bz2
-#Patch3: evolution-data-server-gcc4.patch
-Patch5: evolution-data-server-configure.patch
-Patch6: nss-nspr.patch
-Patch7: evolution-data-server-decl.patch
-Patch8: eds-warnings.patch
-# Patch9: evolution-fix-function-declarations.patch
-# FIXME: After upgrade, use patch# - 100
-#Patch108: eds-1.5.5-warnings.patch
-#Patch10: keyring-integration.patch
-Patch11: backend-timeout-fix.patch
-Patch12: bnc-156823-newly-configured-gw-dont-work.patch
-Patch13: bnc-156584-evo-wont-shutdown.patch
-Patch14: beagle-meta-summary.patch
-Patch15: bnc-137357-newly-configured-gw-dont-work.patch
-Patch16: bnc-152355-mails-doesnt-show-gw.patch
-Patch17: bnc-157323-messages-deleted-from-gw-remain-in-evo.patch
-Patch18: bnc-153522-evolution-doesnt-update-message-status.patch
-Patch19: bnc-158093-sent-folder-have-to-not-from.patch
-Patch20: bnc-138047-password-passphrase-msg-inconsistency.patch
-Patch21: bnc-153522-evo-doesnt-update-msg-status-workaround.patch
-Patch22: bnc-152062-evolution-wont-show-attachment.patch
-Patch23: bgo-272307-evolution-clobbers-mail-address.patch
-Patch24: bgo-331146-eds-crash-at-startup.patch
-Patch25: bgo-334807-eds-crasher.patch
-Patch26: bgo-323275-eds-crash-at-startup.patch
-Patch27: bgo-334000-unexpected-dialog-creating-appt.patch
-Patch28: patch-for-random-eds-addr-crashes.patch
-Patch29: camel-partha-gw-fixes.patch
-Patch30: bnc-158112-send-receive-dlg-takes-time.patch
-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
-Patch36: bnc-161290-eds-crashed-forwarding-mail.patch
-Patch37: bnc-162005-e-d-s-crash-deleting-recur-appt.patch
-Patch38: bnc-163664-eds-crashes-on-invalid-utf8-contacts.patch
-# Looks upstreamed to me.
-Patch39: bnc-160915-evolution-crash-clickng-goto-cal-view.patch
-Patch40: bnc-164367-gw-attachments-appts-throw-error.patch
-Patch41: bnc-163982-system-hang-with-126-error-popups.patch
-Patch42: bnc-164676-eds-stuck-tight-loop.patch
-Patch43: bnc-152070-eds-crash.patch
-Patch44: bnc-164140-eds-crash-evolution--offline.patch
-#Patch45: gw-force-use-imap.patch
-Patch46: bnc-164323-random-mark-unread.patch
-Patch47: 167566-camel-groupwise-summary.patch
-Patch48: 167640-camel-groupwise-store.patch
-Patch49: bnc-159934-eds-CPU-spikes.patch
-Patch50: eds-kerb-check.diff
-Patch51: bnc-165714-eds-delegate-multiple-events.diff
-Patch52: bgo-310433-eds-deny-rename-stdfolders.diff
-Patch53: bgo-329371-eds-fix-full-username-email-format.patch
-Patch54: bnc-164323-random-mark-unread-updated.patch
-Patch55: bulk-delete.patch
-Patch56: imap-perf.patch
-Patch57: nameselectorlist-keychange.diff
-Patch58: imap4-removal.diff
-Patch59: bgo-321797.patch
-Patch60: bgo-315976-INBOX-not-shown-when-override-namespace.patch
-Patch61: bnc-167638.patch
-Patch62: empty-trash-notify.patch
-Patch63: bnc-169034-eds-pub-folder-download.diff
-Patch64: bnc-169997-eds-infinite-loop.diff
-Patch65: bnc-173454.patch
-Patch66: gw-trash-fix.diff
-Patch67: imap-locking.patch
-Patch68: bnc-177394.patch
-Patch69: eds-updated-translations.diff
-Patch70: camel-vfs-stream.diff
-Patch71: bnc-174255-honour-system-proxy-settings.patch
-Patch72: bnc-176277-2.patch
-Patch73: german-translation-eds.diff
-Patch74: bnc-181906-eds-ex-crash.diff
-Patch75: eds-translations-updated.diff
-Patch76: bnc-179350.patch
-Patch77: bnc-170052-eds-crash.patch
-Patch78: email-appears-twice.patch
-Patch79: bnc-183819-evo-crashed-closing-offline.patch
-Patch80: bnc-187529-calendar-cache-population.patch
-Patch81: e-d-s-configure-break-fix.patch
-Patch82: fwd-mail.patch
-Patch83: datarootdir.diff
-Patch84: cal-attachment-filename-handling.patch
-Patch85: bnc-167330-default-GW-alarms.patch
-Patch86: eds-compiler-warning.patch
-Patch89: bgo-369168-buffer-overrun.patch
-Patch90: evolution-data-server-1.11.5-cert-auth-complete.patch
-Patch91: bnc-304835-ex-crash-after-restart.patch
-Patch92: bnc-307861-calendar-auth.diff
+Version: 2.21.4
+Release: 1
+Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.11/%{name}-%{version}.tar.bz2
+Patch0: evolution-data-server-configure.patch
+Patch1: evolution-data-server-decl.patch
+Patch2: eds-warnings.patch
+Patch3: bnc-164367-gw-attachments-appts-throw-error.patch
+Patch4: bnc-163982-system-hang-with-126-error-popups.patch
+Patch5: bnc-152070-eds-crash.patch
+Patch6: bnc-164140-eds-crash-evolution--offline.patch
+Patch7: bnc-167638.patch
+Patch8: bnc-174255-honour-system-proxy-settings.patch
+Patch9: bnc-183819-evo-crashed-closing-offline.patch
+Patch10: eds-compiler-warning.patch
+Patch11: evolution-data-server-1.11.5-cert-auth-complete.patch
+Patch12: bnc-304835-ex-crash-after-restart.patch
+Patch13: bnc-307861-calendar-auth.diff
# Change patch below if we move away from /opt/gnome
# It avoids a build dependency on libgnomeui to speed up bootstrap
Patch99: libgnomeui-dep.patch
+# The following has been reported upstream (with a patch) and should be
+# fixed in the next release:
+# I: Program is using uninitialized variables.
+# Note the difference between "is used" and "may be used"
+# W: evolution-data-server uninitialized-variable e-book-backend-groupwise.c: 2425
+# See:
+# http://bugzilla.gnome.org/show_bug.cgi?id=504346
Url: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: libsoup >= 2.2.6 mozilla-nss
@@ -127,7 +58,7 @@
Summary: Evolution Data Server Development Files
Group: Development/Libraries/GNOME
Requires: evolution-data-server = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires: libsoup-devel libbonobo-devel libgnome-devel gnome-vfs2-devel libxml2-devel orbit2-devel openldap2-devel libglade2-devel
+Requires: libgpg-error-devel libsoup-devel libbonobo-devel libgnome-devel gnome-vfs2-devel libxml2-devel orbit2-devel openldap2-devel libglade2-devel
Requires: gtk2-devel gconf2-devel glib2-devel gnome-keyring-devel gnome-certauth-devel
%if %suse_version >= 930
Requires: krb5-devel
@@ -159,92 +90,21 @@
%lang_package
%prep
%setup -q
-#%patch3
+%patch0
+%patch1
+%patch2
+%patch3
+%patch4
%patch5
-#%patch6
+%patch6
%patch7
-#%patch108
%patch8
-# %patch9
-#%patch10
-#%patch11
-#%patch12
-#%patch13
-#%patch14
-#%patch15
-#%patch16
-#%patch17
-#%patch18
-#%patch19
-#%patch20
-#%patch21
-#%patch22
-#%patch23
-#%patch24
-#%patch25
-#%patch26
-#%patch27
-#%patch28 -p0
-#%patch29
-#%patch30
-#%patch31
-#%patch32
-#%patch33
-#%patch34
-#%patch35
-#%patch36
-#%patch37
-#%patch38
-# %patch39
-%patch40
-%patch41
-#%patch42
-%patch43
-%patch44
-#%patch45
-#%patch46
-#%patch47
-#%patch48
-#%patch49
-#%patch50
-#%patch51
-#%patch52
-#%patch53
-#%patch54
-#%patch55
-#%patch56
-#%patch57
-#%patch58
-#%patch59
-#%patch60
-%patch61
-#%patch62
-#%patch63
-#%patch64
-#%patch65
-#%patch66
-#%patch67
-#%patch68
-#%patch69
-#%patch70
-%patch71
-#%patch72
-#%patch73
-#%patch74
-#%patch75
-#%patch77
-#%patch78
-%patch79
-#%patch80
-#%patch81
-#%patch82
-#%patch83
-%patch86
-#%patch89
-%patch90
-%patch91
-%patch92
-%patch99 -p1
+%patch9
+%patch10
+%patch11
+%patch12
+%patch13
+%patch99
%build
libtoolize --force --copy
@@ -266,7 +126,7 @@
%install
make DESTDIR=$RPM_BUILD_ROOT install
-%find_lang evolution-data-server-1.12
+%find_lang evolution-data-server-2.22
rm $RPM_BUILD_ROOT%{_libdir}/*/*/*.*a
%fdupes $RPM_BUILD_ROOT
@@ -280,19 +140,19 @@
%files
%defattr(-,root,root)
%doc README COPYING ChangeLog NEWS TODO AUTHORS
-%{_datadir}/evolution-data-server-1.12
+%{_datadir}/evolution-data-server-2.22
%{_datadir}/idl/evolution-data-server-1.2
%{_datadir}/pixmaps/evolution-data-server
%{_libdir}/*.so.*
%{_libdir}/bonobo/servers/*
-%{_libdir}/evolution-data-server-1.2
%{_prefix}/lib/evolution-data-server
+%{_libdir}/evolution-data-server-1.2
-%files lang -f evolution-data-server-1.12.lang
+%files lang -f evolution-data-server-2.22.lang
%files devel
%defattr(-, root, root)
-%{_includedir}/evolution-data-server-1.12
+%{_includedir}/evolution-data-server-2.22
%{_libdir}/*.so
%{_libdir}/*.*a
%{_libdir}/pkgconfig/*.pc
@@ -302,6 +162,22 @@
%{_datadir}/gtk-doc/html/*
%changelog
+* Tue Dec 18 2007 - maw@suse.de
+- Update to version 2.21.4:
+ + The large version bump is due to evolution and related packages
+ synchronizing their version numbers with those of GNOME
+ + Bugs (bugzilla.gnome.org, except where otherwise indicated)
+ fixed: #322917, #336074, #339510, #462593, #466499, #486126,
+ [#487687], #501548, #501622, #501969, #502866, #308815, #376425,
+ [#415817], #461979, #492426, #494314, #318842, #345135, #359267,
+ [#430420], #460649, #487229, #488156, #492130, #494304,
+ bnc#203480, #231178, #271777, #417999, #420167, #469657,
+ [#474000], #475487, #475493, #475494, #478404, #483301, #487270,
+ [#488173], and #488351
+ + Support for Google Calendar
+ + Updated translations
+ + Protect against a NULL subject string
+- Remove old patches, and refresh and renumber the remaining ones.
* Wed Dec 05 2007 - maw@suse.de
- Don't require openldap2 to build.
* Thu Oct 11 2007 - sbrabec@suse.cz
++++++ bnc-152070-eds-crash.patch ++++++
--- /var/tmp/diff_new_pack.zn5940/_old 2007-12-19 14:42:36.000000000 +0100
+++ /var/tmp/diff_new_pack.zn5940/_new 2007-12-19 14:42:36.000000000 +0100
@@ -1,13 +1,9 @@
-Index: addressbook/backends/groupwise/e-book-backend-groupwise.c
-===================================================================
-RCS file: /cvs/gnome/evolution-data-server/addressbook/backends/groupwise/e-book-backend-groupwise.c,v
-retrieving revision 1.74
-diff -u -p -r1.74 e-book-backend-groupwise.c
---- addressbook/backends/groupwise/e-book-backend-groupwise.c 10 Apr 2006 11:02:36 -0000 1.74
-+++ addressbook/backends/groupwise/e-book-backend-groupwise.c 16 Apr 2006 07:30:20 -0000
-@@ -2334,6 +2334,11 @@ find_book_view (EBookBackendGroupwise *e
- return NULL;
- EIterator *iter = e_list_get_iterator (views);
+=== modified file 'addressbook/backends/groupwise/e-book-backend-groupwise.c'
+--- addressbook/backends/groupwise/e-book-backend-groupwise.c 2007-12-18 16:36:30 +0000
++++ addressbook/backends/groupwise/e-book-backend-groupwise.c 2007-12-18 16:42:36 +0000
+@@ -2421,6 +2421,11 @@
+ EList *views = e_book_backend_get_book_views (E_BOOK_BACKEND (ebgw));
+ EIterator *iter;
EDataBookView *rv = NULL;
+
+ if (!iter) {
@@ -15,5 +11,6 @@
+ return NULL;
+ }
- if (e_iterator_is_valid (iter)) {
- /* just always use the first book view */
+ if (!views)
+ return NULL;
+
++++++ bnc-163982-system-hang-with-126-error-popups.patch ++++++
--- /var/tmp/diff_new_pack.zn5940/_old 2007-12-19 14:42:36.000000000 +0100
+++ /var/tmp/diff_new_pack.zn5940/_new 2007-12-19 14:42:36.000000000 +0100
@@ -1,16 +1,15 @@
-Index: calendar/backends/file/e-cal-backend-file.c
-===================================================================
---- calendar/backends/file/e-cal-backend-file.c.orig
-+++ calendar/backends/file/e-cal-backend-file.c
-@@ -134,6 +134,7 @@ save_file_when_idle (gpointer user_data)
+=== modified file 'calendar/backends/file/e-cal-backend-file.c'
+--- calendar/backends/file/e-cal-backend-file.c 2007-12-18 16:36:30 +0000
++++ calendar/backends/file/e-cal-backend-file.c 2007-12-18 16:42:10 +0000
+@@ -128,6 +128,7 @@
GnomeVFSFileSize out;
gchar *tmp, *backup_uristr;
char *buf;
+ char *error = NULL;
ECalBackendFile *cbfile = user_data;
-
+
priv = cbfile->priv;
-@@ -206,12 +207,15 @@ save_file_when_idle (gpointer user_data)
+@@ -200,12 +201,15 @@
g_static_rec_mutex_unlock (&priv->idle_save_rmutex);
e_cal_backend_notify_error (E_CAL_BACKEND (cbfile),
_("Cannot save calendar data: Malformed URI."));
@@ -29,7 +28,7 @@
}
static void
-@@ -526,8 +530,6 @@ add_component (ECalBackendFile *cbfile,
+@@ -520,8 +524,6 @@
g_assert (icalcomp != NULL);
icalcomponent_add_component (priv->icalcomp, icalcomp);
@@ -38,3 +37,4 @@
}
}
+
++++++ bnc-164140-eds-crash-evolution--offline.patch ++++++
--- /var/tmp/diff_new_pack.zn5940/_old 2007-12-19 14:42:36.000000000 +0100
+++ /var/tmp/diff_new_pack.zn5940/_new 2007-12-19 14:42:36.000000000 +0100
@@ -1,14 +1,14 @@
-Index: addressbook/backends/file/e-book-backend-file.c
-===================================================================
---- addressbook/backends/file/e-book-backend-file.c.orig
-+++ addressbook/backends/file/e-book-backend-file.c
-@@ -684,6 +684,9 @@ e_book_backend_file_stop_book_view (EBoo
+=== modified file 'addressbook/backends/file/e-book-backend-file.c'
+--- addressbook/backends/file/e-book-backend-file.c 2007-12-18 16:36:30 +0000
++++ addressbook/backends/file/e-book-backend-file.c 2007-12-18 16:42:54 +0000
+@@ -666,6 +666,9 @@
FileBackendSearchClosure *closure = get_closure (book_view);
- gboolean need_join = FALSE;
+ gboolean need_join;
+ if (!closure)
+ return;
+
d(printf ("stopping query\n"));
- g_mutex_lock (closure->mutex);
- if (!closure->stopped)
+ need_join = e_flag_is_set (closure->running);
+ e_flag_clear (closure->running);
+
++++++ bnc-164367-gw-attachments-appts-throw-error.patch ++++++
--- /var/tmp/diff_new_pack.zn5940/_old 2007-12-19 14:42:36.000000000 +0100
+++ /var/tmp/diff_new_pack.zn5940/_new 2007-12-19 14:42:36.000000000 +0100
@@ -1,19 +1,16 @@
-Index: calendar/backends/groupwise/e-cal-backend-groupwise-utils.c
-===================================================================
-RCS file: /cvs/gnome/evolution-data-server/calendar/backends/groupwise/e-cal-backend-groupwise-utils.c,v
-retrieving revision 1.73
-diff -u -p -r1.73 e-cal-backend-groupwise-utils.c
---- calendar/backends/groupwise/e-cal-backend-groupwise-utils.c 9 Dec 2005 11:21:49 -0000 1.73
-+++ calendar/backends/groupwise/e-cal-backend-groupwise-utils.c 11 Apr 2006 09:12:09 -0000
-@@ -300,9 +300,10 @@ e_cal_backend_groupwise_set_attachments_
+=== modified file 'calendar/backends/groupwise/e-cal-backend-groupwise-utils.c'
+--- calendar/backends/groupwise/e-cal-backend-groupwise-utils.c 2007-12-18 16:36:30 +0000
++++ calendar/backends/groupwise/e-cal-backend-groupwise-utils.c 2007-12-18 16:41:31 +0000
+@@ -300,9 +300,10 @@
/* FIXME the member does not follow the naming convention.
* Should be fixed in e-gw-item*/
attach_item->contentType = g_strdup (gnome_vfs_get_mime_type (attach_filename_full));
-- g_free (attach_filename_full);
-
- attach_item->name = g_strdup (filename + strlen(uid) + 1);
-+ g_free (attach_filename_full);
+
++ attach_item->name = g_strdup (filename + strlen(uid) + 1);
+ g_free (attach_filename_full);
+
+- attach_item->name = g_strdup (filename + strlen(uid) + 1);
/* do a base64 encoding so it can be embedded in a soap
* message */
- encoded_data = soup_base64_encode (file_contents, file_len);
+ encoded_data = g_base64_encode (file_contents, file_len);
+
++++++ bnc-167638.patch ++++++
--- /var/tmp/diff_new_pack.zn5940/_old 2007-12-19 14:42:36.000000000 +0100
+++ /var/tmp/diff_new_pack.zn5940/_new 2007-12-19 14:42:36.000000000 +0100
@@ -1,8 +1,7 @@
-Index: camel/camel.c
-===================================================================
---- camel/camel.c.orig
-+++ camel/camel.c
-@@ -44,6 +44,8 @@
+=== modified file 'camel/camel.c'
+--- camel/camel.c 2007-12-18 16:36:30 +0000
++++ camel/camel.c 2007-12-18 16:43:25 +0000
+@@ -46,6 +46,8 @@
static int initialised = FALSE;
@@ -11,11 +10,43 @@
static void
camel_shutdown (void)
{
-Index: camel/providers/imap/camel-imap-folder.c
-===================================================================
---- camel/providers/imap/camel-imap-folder.c.orig
-+++ camel/providers/imap/camel-imap-folder.c
-@@ -605,6 +605,7 @@ imap_rescan (CamelFolder *folder, int ex
+
+=== modified file 'camel/providers/groupwise/camel-groupwise-folder.c'
+--- camel/providers/groupwise/camel-groupwise-folder.c 2007-12-18 16:41:03 +0000
++++ camel/providers/groupwise/camel-groupwise-folder.c 2007-12-18 16:43:25 +0000
+@@ -66,7 +66,7 @@
+ #define ADD_JUNK_ENTRY 1
+ #define REMOVE_JUNK_ENTRY -1
+ #define JUNK_FOLDER "Junk Mail"
+-#define READ_CURSOR_MAX_IDS 500
++#define READ_CURSOR_MAX_IDS 50
+ #define MAX_ATTACHMENT_SIZE 1*1024*1024 /*In bytes*/
+ #define GROUPWISE_BULK_DELETE_LIMIT 100
+
+@@ -867,6 +867,9 @@
+ static void
+ update_update (CamelSession *session, CamelSessionThreadMsg *msg)
+ {
++
++ extern int camel_application_is_exiting;
++
+ struct _folder_update_msg *m = (struct _folder_update_msg *)msg;
+ EGwConnectionStatus status;
+ CamelException *ex = NULL;
+@@ -885,7 +888,7 @@
+ done = FALSE;
+ m->slist = NULL;
+
+- while (!done) {
++ while (!done && !camel_application_is_exiting) {
+ item_list = NULL;
+ status = e_gw_connection_get_all_mail_uids (m->cnc, m->container_id, cursor, FALSE, READ_CURSOR_MAX_IDS, position, &item_list);
+ if (status != E_GW_CONNECTION_STATUS_OK) {
+
+=== modified file 'camel/providers/imap/camel-imap-folder.c'
+--- camel/providers/imap/camel-imap-folder.c 2007-12-18 16:36:30 +0000
++++ camel/providers/imap/camel-imap-folder.c 2007-12-18 16:43:25 +0000
+@@ -652,6 +652,7 @@
{
CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);
CamelImapStore *store = CAMEL_IMAP_STORE (folder->parent_store);
@@ -23,7 +54,7 @@
struct {
char *uid;
guint32 flags;
-@@ -618,6 +619,9 @@ imap_rescan (CamelFolder *folder, int ex
+@@ -665,6 +666,9 @@
gboolean ok;
CamelFolderChangeInfo *changes = NULL;
@@ -31,9 +62,9 @@
+ return;
+
imap_folder->need_rescan = FALSE;
-
+
summary_len = camel_folder_summary_count (folder->summary);
-@@ -2634,6 +2638,7 @@ camel_imap_folder_changed (CamelFolder *
+@@ -2738,6 +2742,7 @@
GArray *expunged, CamelException *ex)
{
CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);
@@ -41,44 +72,13 @@
CamelFolderChangeInfo *changes;
CamelMessageInfo *info;
int len;
-@@ -2661,7 +2666,7 @@ camel_imap_folder_changed (CamelFolder *
+@@ -2765,7 +2770,7 @@
}
-
+
len = camel_folder_summary_count (folder->summary);
- if (exists > len)
+ if (exists > len && !camel_application_is_exiting)
imap_update_summary (folder, exists, changes, ex);
-
- if (camel_folder_change_info_changed (changes))
-Index: camel/providers/groupwise/camel-groupwise-folder.c
-===================================================================
---- camel/providers/groupwise/camel-groupwise-folder.c.orig
-+++ camel/providers/groupwise/camel-groupwise-folder.c
-@@ -60,7 +60,7 @@
- #define ADD_JUNK_ENTRY 1
- #define REMOVE_JUNK_ENTRY -1
- #define JUNK_FOLDER "Junk Mail"
--#define READ_CURSOR_MAX_IDS 500
-+#define READ_CURSOR_MAX_IDS 50
- #define MAX_ATTACHMENT_SIZE 1*1024*1024 /*In bytes*/
- #define GROUPWISE_BULK_DELETE_LIMIT 100
-
-@@ -856,6 +856,9 @@ struct _folder_update_msg {
- static void
- update_update (CamelSession *session, CamelSessionThreadMsg *msg)
- {
-+
-+ extern int camel_application_is_exiting;
-+
- struct _folder_update_msg *m = (struct _folder_update_msg *)msg;
- EGwConnectionStatus status;
- CamelException *ex = NULL;
-@@ -874,7 +877,7 @@ update_update (CamelSession *session, Ca
- done = FALSE;
- m->slist = NULL;
-- while (!done) {
-+ while (!done && !camel_application_is_exiting) {
- item_list = NULL;
- status = e_gw_connection_get_all_mail_uids (m->cnc, m->container_id, cursor, FALSE, READ_CURSOR_MAX_IDS, position, &item_list);
- if (status != E_GW_CONNECTION_STATUS_OK) {
+ if (camel_folder_change_info_changed (changes))
+
++++++ bnc-174255-honour-system-proxy-settings.patch ++++++
--- /var/tmp/diff_new_pack.zn5940/_old 2007-12-19 14:42:36.000000000 +0100
+++ /var/tmp/diff_new_pack.zn5940/_new 2007-12-19 14:42:36.000000000 +0100
@@ -1,43 +1,6 @@
---- libedataserver/Makefile.am
-+++ libedataserver/Makefile.am
-@@ -7,7 +7,8 @@
- -DE_DATA_SERVER_EXTENSIONDIR=\"$(extensiondir)\" \
- -DE_DATA_SERVER_IMAGESDIR=\"$(imagesdir)\" \
- -DE_DATA_SERVER_UI_GLADEDIR=\""$(gladedir)"\" \
-- $(E_DATA_SERVER_CFLAGS)
-+ $(E_DATA_SERVER_CFLAGS) \
-+ $(SOUP_CFLAGS)
-
- # The marshallers
- MARSHAL_GENERATED = e-data-server-marshal.c e-data-server-marshal.h
-@@ -32,6 +33,7 @@
- e-list-iterator.c \
- e-memory.c \
- e-msgport.c \
-+ e-proxy.c \
- e-sexp.c \
- e-source-group.c \
- e-source-list.c \
-@@ -50,7 +52,8 @@
- $(E_DATA_SERVER_LIBS) \
- $(ICONV_LIBS) \
- $(DB_LIBS) \
-- $(SOCKET_LIBS)
-+ $(SOCKET_LIBS) \
-+ $(SOUP_LIBS)
-
- libedataserver_1_2_la_LDFLAGS = \
- -version-info $(LIBEDATASERVER_CURRENT):$(LIBEDATASERVER_REVISION):$(LIBEDATASERVER_AGE) $(NO_UNDEFINED)
-@@ -72,6 +75,7 @@
- e-list-iterator.h \
- e-memory.h \
- e-msgport.h \
-+ e-proxy.h \
- e-sexp.h \
- e-source-group.h \
- e-source-list.h \
---- libedataserver/e-proxy.c
-+++ libedataserver/e-proxy.c
+=== added file 'libedataserver/e-proxy.c'
+--- libedataserver/e-proxy.c 1970-01-01 00:00:00 +0000
++++ libedataserver/e-proxy.c 2007-12-18 17:02:13 +0000
@@ -0,0 +1,647 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
@@ -686,8 +649,10 @@
+
+ return ret;
+}
---- libedataserver/e-proxy.h
-+++ libedataserver/e-proxy.h
+
+=== added file 'libedataserver/e-proxy.h'
+--- libedataserver/e-proxy.h 1970-01-01 00:00:00 +0000
++++ libedataserver/e-proxy.h 2007-12-18 17:02:13 +0000
@@ -0,0 +1,63 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
@@ -752,9 +717,51 @@
+G_END_DECLS
+
+#endif
---- servers/exchange/lib/e2k-context.c
-+++ servers/exchange/lib/e2k-context.c
-@@ -49,6 +49,7 @@
+
+=== modified file 'libedataserver/Makefile.am'
+--- libedataserver/Makefile.am 2007-12-18 16:36:30 +0000
++++ libedataserver/Makefile.am 2007-12-18 17:02:13 +0000
+@@ -7,7 +7,8 @@
+ -DE_DATA_SERVER_EXTENSIONDIR=\"$(extensiondir)\" \
+ -DE_DATA_SERVER_IMAGESDIR=\"$(imagesdir)\" \
+ -DE_DATA_SERVER_UI_GLADEDIR=\""$(gladedir)"\" \
+- $(E_DATA_SERVER_CFLAGS)
++ $(E_DATA_SERVER_CFLAGS) \
++ $(SOUP_CFLAGS)
+
+ lib_LTLIBRARIES = libedataserver-1.2.la
+ noinst_PROGRAMS = test-source-list
+@@ -28,6 +29,7 @@
+ e-list-iterator.c \
+ e-memory.c \
+ e-msgport.c \
++ e-proxy.c \
+ e-sexp.c \
+ e-source-group.c \
+ e-source-list.c \
+@@ -46,7 +48,8 @@
+ $(E_DATA_SERVER_LIBS) \
+ $(ICONV_LIBS) \
+ $(DB_LIBS) \
+- $(SOCKET_LIBS)
++ $(SOCKET_LIBS) \
++ $(SOUP_LIBS)
+
+ libedataserver_1_2_la_LDFLAGS = \
+ -version-info $(LIBEDATASERVER_CURRENT):$(LIBEDATASERVER_REVISION):$(LIBEDATASERVER_AGE) $(NO_UNDEFINED)
+@@ -69,6 +72,7 @@
+ e-list-iterator.h \
+ e-memory.h \
+ e-msgport.h \
++ e-proxy.h \
+ e-sexp.h \
+ e-source-group.h \
+ e-source-list.h \
+
+=== modified file 'servers/exchange/lib/e2k-context.c'
+--- servers/exchange/lib/e2k-context.c 2007-12-18 16:36:30 +0000
++++ servers/exchange/lib/e2k-context.c 2007-12-18 17:02:13 +0000
+@@ -48,6 +48,7 @@
#include "e2k-utils.h"
#include "e2k-xml-utils.h"
@@ -762,7 +769,7 @@
#include