summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2007-05-03 12:06:33 +0000
committerPeter Volkov <pva@gentoo.org>2007-05-03 12:06:33 +0000
commit59554d645149243fd6ba713d4624f21c28ed886b (patch)
treed17dbe6cb362844e1dba545550576d2cc78dfa58 /gnome-extra/evolution-data-server/files
parentx86 stable wrt #176306 (diff)
downloadgentoo-2-59554d645149243fd6ba713d4624f21c28ed886b.tar.gz
gentoo-2-59554d645149243fd6ba713d4624f21c28ed886b.tar.bz2
gentoo-2-59554d645149243fd6ba713d4624f21c28ed886b.zip
Respect String Freeze in the stable branch in ${PN}-APOP-auth-fix.patch.
(Portage version: 2.1.2.2)
Diffstat (limited to 'gnome-extra/evolution-data-server/files')
-rw-r--r--gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.10.1-r2 (renamed from gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.10.1-r1)0
-rw-r--r--gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3-r4 (renamed from gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3-r3)0
-rw-r--r--gnome-extra/evolution-data-server/files/evolution-data-server-APOP-auth-fix.patch7
3 files changed, 4 insertions, 3 deletions
diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.10.1-r1 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.10.1-r2
index 031700144864..031700144864 100644
--- a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.10.1-r1
+++ b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.10.1-r2
diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3-r3 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3-r4
index 0defb70b07af..0defb70b07af 100644
--- a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3-r3
+++ b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3-r4
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-APOP-auth-fix.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-APOP-auth-fix.patch
index e1a814e008d9..301bfe3b4399 100644
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-APOP-auth-fix.patch
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-APOP-auth-fix.patch
@@ -1,5 +1,6 @@
---- branches/gnome-2-18/camel/providers/pop3/camel-pop3-store.c 2007/03/16 05:39:41 7656
-+++ branches/gnome-2-18/camel/providers/pop3/camel-pop3-store.c 2007/04/30 11:04:28 7723
+diff -Naur evolution-data-server-1.8.3.orig/camel/providers/pop3/camel-pop3-store.c evolution-data-server-1.8.3/camel/providers/pop3/camel-pop3-store.c
+--- evolution-data-server-1.8.3.orig/camel/providers/pop3/camel-pop3-store.c 2007-05-03 15:43:23.000000000 +0400
++++ evolution-data-server-1.8.3/camel/providers/pop3/camel-pop3-store.c 2007-05-03 15:49:15.000000000 +0400
@@ -34,6 +34,7 @@
#include <string.h>
#include <unistd.h>
@@ -20,7 +21,7 @@
+ if (!isascii((int)*d)) {
+
+ camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-+ _("Unable to connect to POP server %s: "),
++ _("Could not connect to POP server %s"),
+ CAMEL_SERVICE (store)->url->host);
+
+ return FALSE;