[evolution-kolab/ek-wip-porting] camel-imapx-utils: use the extended version of the untagged response codes

[Christian Hilberg <chilberg src gnome org>]

commit 4cafd76c26bdb13c8f27c00d1b3b90f9206487b6
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Fri Jan 20 17:24:54 2012 +0100

    camel-imapx-utils: use the extended version of the untagged response codes
    
    * in our extended gperf text-input-file, changed struct and
      unction names back to the originals
    * in the utils implementation, include our own gperf-generated
      IMAP token header

 .../providers/imapx/camel-imapx-extd-tokens.txt    |    4 ++--
 src/camel/providers/imapx/camel-imapx-utils.c      |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/camel/providers/imapx/camel-imapx-extd-tokens.txt b/src/camel/providers/imapx/camel-imapx-extd-tokens.txt
index c2f4d3a..b194829 100644
--- a/src/camel/providers/imapx/camel-imapx-extd-tokens.txt
+++ b/src/camel/providers/imapx/camel-imapx-extd-tokens.txt
@@ -1,7 +1,7 @@
 /* This contains all of the keywords we care about.  These
    can be converted to an id very efficiently */
-struct _imapx_extd_keyword {const gchar *name; camel_imapx_id_t id; };
-struct _imapx_extd_keyword *imapx_extd_tokenise_struct (register const char *str, register unsigned int len);
+struct _imapx_keyword {const gchar *name; camel_imapx_id_t id; };
+struct _imapx_keyword *imapx_tokenise_struct (register const char *str, register unsigned int len);
 %%
 ALERT,          IMAPX_ALERT
 ANNOTATEMORE,   IMAPX_ANNOTATEMORE
diff --git a/src/camel/providers/imapx/camel-imapx-utils.c b/src/camel/providers/imapx/camel-imapx-utils.c
index a9cf44c..922befb 100644
--- a/src/camel/providers/imapx/camel-imapx-utils.c
+++ b/src/camel/providers/imapx/camel-imapx-utils.c
@@ -58,7 +58,7 @@ static void camel_imapx_set_debug_flags (void)
 	debug_set_flag (conman);
 }
 
-#include "camel-imapx-tokenise.h"
+#include "camel-imapx-extd-tokenise.h"
 #define SUBFOLDER_DIR_NAME     "subfolders"
 
 #ifdef __GNUC__