Hello community, here is the log from the commit of package evolution checked in at Sun May 7 15:55:21 CEST 2006. -------- --- GNOME/evolution/evolution.changes 2006-05-02 14:48:42.000000000 +0200 +++ STABLE/evolution/evolution.changes 2006-05-02 22:16:28.000000000 +0200 @@ -0,0 +1,7 @@ +------------------------------------------------------------------- +Tue May 2 22:15:15 CEST 2006 - fejj@suse.de + +- Added bnc-167638.patch: Fixes the long Evolution quit times when + the user tries to close Evolution when it is in the middle of + syncing stuff to an IMAP/GW server. + New: ---- bnc-167638.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution.spec ++++++ --- /var/tmp/diff_new_pack.PbSCbL/_old 2006-05-07 15:54:56.000000000 +0200 +++ /var/tmp/diff_new_pack.PbSCbL/_new 2006-05-07 15:54:56.000000000 +0200 @@ -21,7 +21,7 @@ Autoreqprov: on Obsoletes: bonobo-conf Version: 2.6.0 -Release: 39 +Release: 42 Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.6/%{name}-%{version}.tar.bz2 Source1: summerdance-about2.png @@ -87,6 +87,7 @@ Patch68: bnc-153180-evo-gw-disabled-cal-new-event.diff Patch69: bnc-339266-evo-folder-size-offline.diff Patch70: nameselectorlist-enable.diff +Patch71: bnc-167638.patch URL: http://gnome.org/projects/evolution/ BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: filesystem gconf2 shared-mime-info @@ -312,55 +313,56 @@ %if %suse_version > 1000 #%patch19 -p1 downgrade to pilot-link 0.11.8 - see #161722 %endif -%patch20 -p0 -%patch23 -p0 -%patch24 -p0 -%patch25 -p0 -%patch26 -p0 -%patch27 -p0 -#%patch28 -p0 -%patch29 -p0 -%patch30 -p0 -%patch31 -p0 -%patch32 -p0 -%patch33 -p0 -%patch34 -p0 -%patch35 -p0 -%patch36 -p0 -%patch37 -p0 -%patch38 -p0 -%patch39 -p0 -%patch40 -p0 -%patch41 -p0 -%patch42 -p0 -%patch43 -p0 -%patch44 -p0 -%patch45 -p0 -%patch46 -p0 -%patch47 -p0 -%patch48 -p0 -%patch49 -p0 -%patch50 -p0 -%patch51 -p0 -%patch52 -p0 -%patch53 -p0 -%patch54 -p0 -%patch55 -p0 -%patch56 -p0 -%patch57 -p0 -%patch58 -p0 -%patch59 -p0 -%patch60 -p0 -%patch61 -p0 -%patch62 -p0 -%patch63 -p0 -%patch64 -p0 -%patch65 -p0 -%patch66 -p0 -%patch67 -p0 -%patch68 -p0 -%patch69 -p0 -%patch70 -p0 +%patch20 +%patch23 +%patch24 +%patch25 +%patch26 +%patch27 +#%patch28 +%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 %build rename no nb po/no.* @@ -482,6 +484,10 @@ %{prefix}/share/gnome-pilot/conduits/*.conduit %changelog -n evolution +* Tue May 02 2006 - fejj@suse.de +- Added bnc-167638.patch: Fixes the long Evolution quit times when + the user tries to close Evolution when it is in the middle of + syncing stuff to an IMAP/GW server. * Tue May 02 2006 - pchenthill@novell.com - Update the patch bnc-158107-no-notification-canceled-mtgs.patch Fixes https://bugzilla.novell.com/show_bug.cgi?id=171531 ++++++ bnc-167638.patch ++++++ Index: mail/mail-component.c =================================================================== RCS file: /cvs/gnome/evolution/mail/mail-component.c,v retrieving revision 1.132 diff -u -r1.132 mail/mail-component.c --- mail/mail-component.c 8 Feb 2006 11:51:32 -0000 1.132 +++ mail/mail-component.c 20 Apr 2006 21:13:55 -0000 @@ -731,9 +731,12 @@ mail_config_prune_proxies (); switch (mc->priv->quit_state) { case MC_QUIT_START: { + extern int camel_application_is_exiting; int now = time(NULL)/60/60/24, days; GConfClient *gconf = mail_config_get_gconf_client(); - + + camel_application_is_exiting = TRUE; + mail_vfolder_shutdown(); mc->priv->quit_expunge = gconf_client_get_bool(gconf, "/apps/evolution/mail/trash/empty_on_exit", NULL) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...