rpms/evolution-data-server
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Add patch to revert GNOME bug #573240 (IMAP message loading regressions).

Browse Source
This commit is contained in:
Matthew Barnes 2009-03-07 19:23:45 +00:00
parent eaf94ec782
commit aa9f39541b
2 changed files with 83 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
evolution-data-server-2.25.92-unbreak-imap.patch Normal file
View File

@ -0,0 +1,75 @@
diff -up evolution-data-server-2.25.92/camel/providers/imap/camel-imap-command.c.unbreak-imap evolution-data-server-2.25.92/camel/providers/imap/camel-imap-command.c
--- evolution-data-server-2.25.92/camel/providers/imap/camel-imap-command.c.unbreak-imap 2009-02-26 12:18:38.000000000 -0500
+++ evolution-data-server-2.25.92/camel/providers/imap/camel-imap-command.c 2009-03-07 14:15:05.000000000 -0500
@@ -232,9 +232,8 @@ imap_command_start (CamelImapStore *stor
else
camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
g_strerror (errno));
-
- if (g_str_has_prefix (cmd, "LOGIN"))
- camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);
+
+ camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);
return FALSE;
}
@@ -276,14 +275,13 @@ camel_imap_command_continuation (CamelIm
if (camel_stream_write (store->ostream, cmd, cmdlen) == -1 ||
camel_stream_write (store->ostream, "\r\n", 2) == -1) {
- if (errno == EINTR) {
+ if (errno == EINTR)
camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
_("Operation cancelled"));
- } else {
+ else
camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
g_strerror (errno));
- camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);
- }
+ camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);
CAMEL_SERVICE_REC_UNLOCK (store, connect_lock);
return NULL;
}
@@ -491,15 +489,13 @@ imap_read_untagged (CamelImapStore *stor
do {
if ((n = camel_stream_read (store->istream, str->str + nread + 1, length - nread)) == -1) {
- if (errno == EINTR) {
+ if (errno == EINTR)
camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
_("Operation cancelled"));
- } else {
+ else
camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
g_strerror (errno));
- camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);
- }
-
+ camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);
g_string_free (str, TRUE);
goto lose;
}
diff -up evolution-data-server-2.25.92/camel/providers/imap/camel-imap-store.c.unbreak-imap evolution-data-server-2.25.92/camel/providers/imap/camel-imap-store.c
--- evolution-data-server-2.25.92/camel/providers/imap/camel-imap-store.c.unbreak-imap 2009-02-26 12:18:38.000000000 -0500
+++ evolution-data-server-2.25.92/camel/providers/imap/camel-imap-store.c 2009-03-07 14:15:05.000000000 -0500
@@ -3033,16 +3033,14 @@ camel_imap_store_readline (CamelImapStor
}
if (nread <= 0) {
- if (errno == EINTR) {
+ if (errno == EINTR)
camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, _("Operation cancelled"));
- } else {
+ else
camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
_("Server unexpectedly disconnected: %s"),
g_strerror (errno));
- camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);
- }
-
+ camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);
g_byte_array_free (ba, TRUE);
return -1;
}

9
evolution-data-server.spec
View File

@ -31,7 +31,7 @@
Name: evolution-data-server
Version: 2.25.92
Release: 1%{?dist}
Release: 2%{?dist}
Group: System Environment/Libraries
Summary: Backend data server for Evolution
License: LGPLv2+
@ -53,6 +53,9 @@ Patch11: evolution-data-server-1.10.1-camel-folder-summary-crash.patch
# RH bug #243296
Patch12: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
# Revert GNOME bug #573240
Patch13: evolution-data-server-2.25.92-unbreak-imap.patch
### Build Dependencies ###
BuildRequires: GConf2-devel
@ -136,6 +139,7 @@ This package contains developer documentation for %{name}.
%patch10 -p1 -b .fix-ldap-query
%patch11 -p1 -b .camel-folder-summary-crash
%patch12 -p1 -b .fix-64bit-acinclude
%patch13 -p1 -b .unbreak-imap
mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib
@ -381,6 +385,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gtk-doc/html/libedataserverui
%changelog
* Sat Mar 07 2009 Matthew Barnes <mbarnes@redhat.com> - 2.25.92-2.fc11
- Add patch to revert GNOME bug #573240 (IMAP message loading regressions).
* Mon Mar 02 2009 Matthew Barnes <mbarnes@redhat.com> - 2.25.92-1.fc11
- Update to 2.25.92