r1729 - /unstable/evolution-data-server/debian/patches/
corsac at users.alioth.debian.org
corsac at users.alioth.debian.org
Mon Sep 20 22:10:03 UTC 2010
Author: corsac
Date: Mon Sep 20 22:10:00 2010
New Revision: 1729
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1729
Log:
refresh patches from 2.30 branch to get the correct hashes
Modified:
unstable/evolution-data-server/debian/patches/102-Bug-630135-No-UI-feedback-when-imapx-connection-fail.patch
unstable/evolution-data-server/debian/patches/103-Bug-630150-imapx-attempts-to-connect-to-server-when-.patch
unstable/evolution-data-server/debian/patches/104-Bug-630152-imapx_parser_thread-registers-wrong-opera.patch
unstable/evolution-data-server/debian/patches/105-Bug-629916-imapx-fails-to-handle-errors-in-imapx_com.patch
unstable/evolution-data-server/debian/patches/106-Bug-630149-imapx_sync-never-returns-error.patch
Modified: unstable/evolution-data-server/debian/patches/102-Bug-630135-No-UI-feedback-when-imapx-connection-fail.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/102-Bug-630135-No-UI-feedback-when-imapx-connection-fail.patch?rev=1729&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/patches/102-Bug-630135-No-UI-feedback-when-imapx-connection-fail.patch (original)
+++ unstable/evolution-data-server/debian/patches/102-Bug-630135-No-UI-feedback-when-imapx-connection-fail.patch Mon Sep 20 22:10:00 2010
@@ -1,4 +1,4 @@
-From 8e49861c224a141685d79a8723387a4af5acdd19 Mon Sep 17 00:00:00 2001
+From 7dfbd0660bd8311ea7e06bf76e578afdc15840cd Mon Sep 17 00:00:00 2001
From: David Woodhouse <David.Woodhouse at intel.com>
Date: Mon, 20 Sep 2010 11:25:10 +0100
Subject: [PATCH 2/6] Bug 630135 - No UI feedback when imapx connection fails
@@ -12,10 +12,10 @@
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
-index a9e9eb8..1df8126 100644
+index a11a979..61121da 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
-@@ -4629,7 +4629,8 @@ imapx_server_finalise(CamelIMAPXServer *is, CamelIMAPXServerClass *isclass)
+@@ -4647,7 +4647,8 @@ imapx_server_finalise(CamelIMAPXServer *is, CamelIMAPXServerClass *isclass)
QUEUE_UNLOCK(is);
is->parser_quit = TRUE;
Modified: unstable/evolution-data-server/debian/patches/103-Bug-630150-imapx-attempts-to-connect-to-server-when-.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/103-Bug-630150-imapx-attempts-to-connect-to-server-when-.patch?rev=1729&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/patches/103-Bug-630150-imapx-attempts-to-connect-to-server-when-.patch (original)
+++ unstable/evolution-data-server/debian/patches/103-Bug-630150-imapx-attempts-to-connect-to-server-when-.patch Mon Sep 20 22:10:00 2010
@@ -1,4 +1,4 @@
-From 00b3267433a27002b794617fabbedd26db7e7b07 Mon Sep 17 00:00:00 2001
+From ebb8a861406825a27ef3f8f09039455bdbe7ca9e Mon Sep 17 00:00:00 2001
From: David Woodhouse <David.Woodhouse at intel.com>
Date: Mon, 20 Sep 2010 13:30:13 +0100
Subject: [PATCH 3/6] Bug 630150 - imapx attempts to connect to server when already cancelled
@@ -8,10 +8,10 @@
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/camel/providers/imapx/camel-imapx-store.c b/camel/providers/imapx/camel-imapx-store.c
-index be30538..6e05e89 100644
+index 79567ea..1fd4148 100644
--- a/camel/providers/imapx/camel-imapx-store.c
+++ b/camel/providers/imapx/camel-imapx-store.c
-@@ -212,6 +212,11 @@ camel_imapx_store_get_server(CamelIMAPXStore *store, CamelException *ex)
+@@ -211,6 +211,11 @@ camel_imapx_store_get_server(CamelIMAPXStore *store, CamelException *ex)
{
CamelIMAPXServer *server = NULL;
Modified: unstable/evolution-data-server/debian/patches/104-Bug-630152-imapx_parser_thread-registers-wrong-opera.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/104-Bug-630152-imapx_parser_thread-registers-wrong-opera.patch?rev=1729&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/patches/104-Bug-630152-imapx_parser_thread-registers-wrong-opera.patch (original)
+++ unstable/evolution-data-server/debian/patches/104-Bug-630152-imapx_parser_thread-registers-wrong-opera.patch Mon Sep 20 22:10:00 2010
@@ -1,4 +1,4 @@
-From 086758fd47f33f7725f0642cb3affc499fd47640 Mon Sep 17 00:00:00 2001
+From 1cccc30897f4bb8003841636cbddc639170a62fb Mon Sep 17 00:00:00 2001
From: David Woodhouse <David.Woodhouse at intel.com>
Date: Mon, 20 Sep 2010 13:47:48 +0100
Subject: [PATCH 4/6] Bug 630152 - imapx_parser_thread registers wrong operation
@@ -8,10 +8,10 @@
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
-index 1df8126..89a9f74 100644
+index 61121da..b0397a7 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
-@@ -4476,7 +4476,7 @@ imapx_parser_thread (gpointer d)
+@@ -4494,7 +4494,7 @@ imapx_parser_thread (gpointer d)
CamelOperation *op;
op = camel_operation_new (NULL, NULL);
Modified: unstable/evolution-data-server/debian/patches/105-Bug-629916-imapx-fails-to-handle-errors-in-imapx_com.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/105-Bug-629916-imapx-fails-to-handle-errors-in-imapx_com.patch?rev=1729&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/patches/105-Bug-629916-imapx-fails-to-handle-errors-in-imapx_com.patch (original)
+++ unstable/evolution-data-server/debian/patches/105-Bug-629916-imapx-fails-to-handle-errors-in-imapx_com.patch Mon Sep 20 22:10:00 2010
@@ -1,4 +1,4 @@
-From a7657a1bb6950ec78311d45eec42d4c57fef9a82 Mon Sep 17 00:00:00 2001
+From 6bab108176cdbeb1ee259ab01160db4c5fbbba5d Mon Sep 17 00:00:00 2001
From: David Woodhouse <David.Woodhouse at intel.com>
Date: Mon, 20 Sep 2010 15:18:03 +0100
Subject: [PATCH 5/6] Bug 629916 - imapx fails to handle errors in imapx_command_idle_stop()
@@ -8,10 +8,10 @@
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
-index 89a9f74..31a571f 100644
+index b0397a7..5d6b1e2 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
-@@ -924,7 +924,9 @@ imapx_command_start_next(CamelIMAPXServer *is, CamelException *ex)
+@@ -942,7 +942,9 @@ imapx_command_start_next(CamelIMAPXServer *is, CamelException *ex)
if (imapx_in_idle (is) && !camel_dlist_empty (&is->queue)) {
/* if imapx_stop_idle() returns FALSE, it was only
pending and we can go ahead and send a new command
@@ -22,7 +22,7 @@
if (imapx_stop_idle (is, ex)) {
c(printf ("waiting for idle to stop \n"));
return;
-@@ -1707,7 +1709,10 @@ imapx_continuation(CamelIMAPXServer *imap, CamelException *ex, gboolean litplus)
+@@ -1725,7 +1727,10 @@ imapx_continuation(CamelIMAPXServer *imap, CamelException *ex, gboolean litplus)
/* IDLE got cancelled after we sent the command, while
we were waiting for this continuation. Send DONE
immediately. */
@@ -34,7 +34,7 @@
imap->idle->state = IMAPX_IDLE_OFF;
} else {
c(printf("idle starts in wrong state %d\n",
-@@ -2034,6 +2039,11 @@ imapx_command_idle_stop (CamelIMAPXServer *is, CamelException *ex)
+@@ -2052,6 +2057,11 @@ imapx_command_idle_stop (CamelIMAPXServer *is, CamelException *ex)
{
if (!is->stream || camel_stream_printf((CamelStream *)is->stream, "%s", "DONE\r\n") == -1) {
camel_exception_set (ex, 1, "Unable to issue DONE");
@@ -46,7 +46,7 @@
return FALSE;
}
-@@ -2200,9 +2210,13 @@ imapx_stop_idle (CamelIMAPXServer *is, CamelException *ex)
+@@ -2218,9 +2228,13 @@ imapx_stop_idle (CamelIMAPXServer *is, CamelException *ex)
break;
case IMAPX_IDLE_STARTED:
Modified: unstable/evolution-data-server/debian/patches/106-Bug-630149-imapx_sync-never-returns-error.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-data-server/debian/patches/106-Bug-630149-imapx_sync-never-returns-error.patch?rev=1729&op=diff
==============================================================================
--- unstable/evolution-data-server/debian/patches/106-Bug-630149-imapx_sync-never-returns-error.patch (original)
+++ unstable/evolution-data-server/debian/patches/106-Bug-630149-imapx_sync-never-returns-error.patch Mon Sep 20 22:10:00 2010
@@ -1,4 +1,4 @@
-From b32377db3459e257b9b9ea83399619c42feebe9b Mon Sep 17 00:00:00 2001
+From 237352d97330812bbbb0f061c3a01e35374da19c Mon Sep 17 00:00:00 2001
From: David Woodhouse <David.Woodhouse at intel.com>
Date: Mon, 20 Sep 2010 13:29:20 +0100
Subject: [PATCH 6/6] Bug 630149 - imapx_sync() never returns error
@@ -8,10 +8,10 @@
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/camel/providers/imapx/camel-imapx-folder.c b/camel/providers/imapx/camel-imapx-folder.c
-index bdd398d..e558949 100644
+index 44f8410..87b49d0 100644
--- a/camel/providers/imapx/camel-imapx-folder.c
+++ b/camel/providers/imapx/camel-imapx-folder.c
-@@ -173,19 +173,20 @@ imapx_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
+@@ -172,19 +172,20 @@ imapx_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
ex = &eex;
server = camel_imapx_store_get_server(is, ex);
More information about the pkg-evolution-commits
mailing list