[evolution-kolab: 1/13] updated IMAPX files as of EDS commit 23a77e1d521c34e04121395ffe5df9a567c22e77
- From: Christian Hilberg <chilberg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-kolab: 1/13] updated IMAPX files as of EDS commit 23a77e1d521c34e04121395ffe5df9a567c22e77
- Date: Fri, 25 May 2012 16:37:58 +0000 (UTC)
commit 6ee13a7204b803449bf66498bfe203d9218383e0
Author: Christian Hilberg <hilberg kernelconcepts de>
Date: Tue May 22 09:19:43 2012 +0200
updated IMAPX files as of EDS commit 23a77e1d521c34e04121395ffe5df9a567c22e77
* updated the local IMAPX code from upstream
* now at EDS commit
23a77e1d521c34e04121395ffe5df9a567c22e77
* camel/providers/imapx/* is almost completely gone,
only the provider is left. The rest has been moved
to libcamel and exposed as API for us to use
src/camel/providers/imapx/Makefile.am | 42 +-
src/camel/providers/imapx/camel-imapx-command.c | 724 ---
src/camel/providers/imapx/camel-imapx-command.h | 161 -
.../providers/imapx/camel-imapx-conn-manager.c | 729 ---
.../providers/imapx/camel-imapx-conn-manager.h | 78 -
src/camel/providers/imapx/camel-imapx-folder.c | 787 ---
src/camel/providers/imapx/camel-imapx-folder.h | 90 -
src/camel/providers/imapx/camel-imapx-job.c | 262 -
src/camel/providers/imapx/camel-imapx-job.h | 82 -
src/camel/providers/imapx/camel-imapx-provider.c | 12 +-
src/camel/providers/imapx/camel-imapx-server.c | 6474 --------------------
src/camel/providers/imapx/camel-imapx-server.h | 232 -
src/camel/providers/imapx/camel-imapx-settings.c | 1396 -----
src/camel/providers/imapx/camel-imapx-settings.h | 146 -
.../providers/imapx/camel-imapx-store-summary.c | 670 --
.../providers/imapx/camel-imapx-store-summary.h | 150 -
src/camel/providers/imapx/camel-imapx-store.c | 1779 ------
src/camel/providers/imapx/camel-imapx-store.h | 101 -
src/camel/providers/imapx/camel-imapx-stream.c | 839 ---
src/camel/providers/imapx/camel-imapx-stream.h | 159 -
src/camel/providers/imapx/camel-imapx-summary.c | 369 --
src/camel/providers/imapx/camel-imapx-summary.h | 99 -
src/camel/providers/imapx/camel-imapx-tokens.txt | 46 -
src/camel/providers/imapx/camel-imapx-utils.c | 2132 -------
src/camel/providers/imapx/camel-imapx-utils.h | 290 -
src/camel/providers/imapx/test-imapx.c | 4 +-
26 files changed, 10 insertions(+), 17843 deletions(-)
---
diff --git a/src/camel/providers/imapx/Makefile.am b/src/camel/providers/imapx/Makefile.am
index 8d76c5a..8ba0185 100644
--- a/src/camel/providers/imapx/Makefile.am
+++ b/src/camel/providers/imapx/Makefile.am
@@ -8,43 +8,20 @@ libcamelimapx_la_CPPFLAGS = \
-I$(top_srcdir)/camel \
-I$(top_srcdir) \
$(CAMEL_CFLAGS) \
- -DG_LOG_DOMAIN=\"camel-imapx\"
+ -DG_LOG_DOMAIN=\"camel-imapx\" \
+ $(CODE_COVERAGE_CFLAGS) \
+ $(NULL)
libcamelimapx_la_SOURCES = \
- camel-imapx-command.c \
- camel-imapx-conn-manager.c \
- camel-imapx-folder.c \
- camel-imapx-job.c \
- camel-imapx-provider.c \
- camel-imapx-server.c \
- camel-imapx-settings.c \
- camel-imapx-store-summary.c \
- camel-imapx-store.c \
- camel-imapx-stream.c \
- camel-imapx-summary.c \
- camel-imapx-utils.c
-
-noinst_HEADERS = \
- camel-imapx-command.h \
- camel-imapx-conn-manager.h \
- camel-imapx-folder.h \
- camel-imapx-job.h \
- camel-imapx-server.h \
- camel-imapx-settings.h \
- camel-imapx-store-summary.h \
- camel-imapx-store.h \
- camel-imapx-stream.h \
- camel-imapx-summary.h \
- camel-imapx-utils.h
-
-camel-imapx-tokenise.h: camel-imapx-tokens.txt
- @GPERF@ -H imapx_hash -N imapx_tokenise_struct -L ANSI-C -o -t -k1,$$ $< --output-file=$@
+ camel-imapx-provider.c
libcamelimapx_la_LIBADD = \
$(top_builddir)/camel/libcamel-1.2.la \
$(CAMEL_LIBS)
-libcamelimapx_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
+libcamelimapx_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED) \
+ $(CODE_COVERAGE_LDFLAGS) \
+ $(NULL)
noinst_PROGRAMS = test-imapx
@@ -61,9 +38,6 @@ test_imapx_LDADD = \
$(CAMEL_LIBS) \
$(top_builddir)/camel/libcamel-1.2.la
-BUILT_SOURCES = camel-imapx-tokenise.h
-CLEANFILES = $(BUILT_SOURCES)
-
-EXTRA_DIST = libcamelimapx.urls camel-imapx-tokens.txt
+EXTRA_DIST = libcamelimapx.urls
-include $(top_srcdir)/git.mk
diff --git a/src/camel/providers/imapx/camel-imapx-provider.c b/src/camel/providers/imapx/camel-imapx-provider.c
index aa99fd9..9c87264 100644
--- a/src/camel/providers/imapx/camel-imapx-provider.c
+++ b/src/camel/providers/imapx/camel-imapx-provider.c
@@ -30,8 +30,6 @@
#include <camel/camel.h>
#include <glib/gi18n-lib.h>
-#include "camel-imapx-store.h"
-
static guint imapx_url_hash (gconstpointer key);
static gint imapx_url_equal (gconstpointer a, gconstpointer b);
@@ -114,15 +112,7 @@ static CamelProvider imapx_provider = {
/* ... */
};
-CamelServiceAuthType camel_imapx_password_authtype = {
- N_("Password"),
-
- N_("This option will connect to the IMAP server using a "
- "plaintext password."),
-
- "",
- TRUE
-};
+extern CamelServiceAuthType camel_imapx_password_authtype;
void camel_imapx_module_init (void);
diff --git a/src/camel/providers/imapx/test-imapx.c b/src/camel/providers/imapx/test-imapx.c
index 79e3392..f8b9c97 100644
--- a/src/camel/providers/imapx/test-imapx.c
+++ b/src/camel/providers/imapx/test-imapx.c
@@ -17,8 +17,6 @@
* Boston, MA 02110-1301, USA.
*/
-#include "camel-imapx-store.h"
-#include "camel-imapx-folder.h"
#include <camel/camel.h>
gint
@@ -46,7 +44,7 @@ main (gint argc,
service = camel_session_add_service (
session, "text-imapx", uri, CAMEL_PROVIDER_STORE, NULL);
- camel_service_connect_sync (service, NULL);
+ camel_service_connect_sync (service, NULL, NULL);
camel_store_get_folder_info_sync (
CAMEL_STORE (service), "", 3, NULL, NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]