--- a/mcabber/src/Makefile.am Mon Jun 15 10:59:31 2009 +0200
+++ b/mcabber/src/Makefile.am Sun Oct 11 15:59:53 2009 +0200
@@ -4,8 +4,10 @@
hbuf.c hbuf.h screen.c screen.h logprint.h \
settings.c settings.h hooks.c hooks.h utf8.c utf8.h \
histolog.c histolog.h utils.c utils.h pgp.c pgp.h \
- fifo.c fifo.h help.c help.h \
- xmpp.c xmpp.h xmpp_helper.h caps.c caps.h
+ xmpp.c xmpp.h xmpp_helper.c xmpp_helper.h xmpp_defines.h \
+ xmpp_iq.c xmpp_iq.h xmpp_iqrequest.c xmpp_iqrequest.h \
+ xmpp_muc.c xmpp_muc.h xmpp_s10n.c xmpp_s10n.h \
+ caps.c caps.h fifo.c fifo.h help.c help.h
if OTR
mcabber_SOURCES += otr.c otr.h nohtml.c nohtml.h
--- a/mcabber/src/events.h Mon Jun 15 10:59:31 2009 +0200
+++ b/mcabber/src/events.h Sun Oct 11 15:59:53 2009 +0200
@@ -1,8 +1,6 @@
#ifndef __EVENTS_H__
#define __EVENTS_H__ 1
-#include "xmpp.h"
-
#define EVS_DEFAULT_TIMEOUT 90
#define EVS_MAX_TIMEOUT 432000
--- a/mcabber/src/hooks.c Mon Jun 15 10:59:31 2009 +0200
+++ b/mcabber/src/hooks.c Sun Oct 11 15:59:53 2009 +0200
@@ -483,7 +483,7 @@
size_t data_locale_len = strlen(data_locale);
ssize_t a = write(fd, data_locale, data_locale_len);
ssize_t b = write(fd, "\n", 1);
- if (a != data_locale_len || b != 1) {
+ if ((size_t)a != data_locale_len || b != 1) {
g_free(datafname);
datafname = NULL;
scr_LogPrint(LPRINT_LOGNORM,
--- a/mcabber/src/xmpp.c Mon Jun 15 10:59:31 2009 +0200
+++ b/mcabber/src/xmpp.c Sun Oct 11 15:59:53 2009 +0200
@@ -23,22 +23,22 @@
*/
#include <stdlib.h>
#include <string.h>
-#include <sys/utsname.h>
+#include "xmpp.h"
+#include "xmpp_helper.h"
+#include "xmpp_iq.h"
+#include "xmpp_iqrequest.h"
+#include "xmpp_muc.h"
+#include "xmpp_s10n.h"
#include "caps.h"
-#include "commands.h"
#include "events.h"
#include "histolog.h"
#include "hooks.h"
-#include "logprint.h"
#include "otr.h"
#include "roster.h"
#include "screen.h"
#include "settings.h"
#include "utils.h"
-#include "xmpp.h"
-#include "xmpp_helper.h"
-#include "xmpp_defines.h"
#define RECONNECTION_TIMEOUT 60L
@@ -48,15 +48,15 @@
inline void update_last_use(void);
inline gboolean xmpp_reconnect();
-static enum imstatus mystatus = offline;
+enum imstatus mystatus = offline;
static enum imstatus mywantedstatus = available;
-static gchar *mystatusmsg;
+gchar *mystatusmsg;
char imstatus2char[imstatus_size+1] = {
'_', 'o', 'f', 'd', 'n', 'a', 'i', '\0'
};
-static char *imstatus_showmap[] = {
+char *imstatus_showmap[] = {
"",
"",
"chat",
@@ -66,58 +66,8 @@
""
};
-static LmMessageNode *bookmarks = NULL;
-static LmMessageNode *rosternotes = NULL;
-
-struct xmpp_error {
- guint code;
- const char *code_str;
- const char *meaning;
- const char *condition;
- const char *type;
-} xmpp_errors[] = {
- {XMPP_ERROR_REDIRECT, "302",
- "Redirect", "redirect", "modify"},
- {XMPP_ERROR_BAD_REQUEST, "400",
- "Bad Request", "bad-request", "modify"},
- {XMPP_ERROR_NOT_AUTHORIZED, "401",
- "Not Authorized", "not-authorized", "auth"},
- {XMPP_ERROR_PAYMENT_REQUIRED, "402",
- "Payment Required", "payment-required", "auth"},
- {XMPP_ERROR_FORBIDDEN, "403",
- "Forbidden", "forbidden", "auth"},
- {XMPP_ERROR_NOT_FOUND, "404",
- "Not Found", "item-not-found", "cancel"},
- {XMPP_ERROR_NOT_ALLOWED, "405",
- "Not Allowed", "not-allowed", "cancel"},
- {XMPP_ERROR_NOT_ACCEPTABLE, "406",
- "Not Acceptable", "not-acceptable", "modify"},
- {XMPP_ERROR_REGISTRATION_REQUIRED, "407",
- "Registration required", "registration-required", "auth"},
- {XMPP_ERROR_REQUEST_TIMEOUT, "408",
- "Request Timeout", "remote-server-timeout", "wait"},
- {XMPP_ERROR_CONFLICT, "409",
- "Conflict", "conflict", "cancel"},
- {XMPP_ERROR_INTERNAL_SERVER_ERROR, "500",
- "Internal Server Error", "internal-server-error", "wait"},
- {XMPP_ERROR_NOT_IMPLEMENTED, "501",
- "Not Implemented", "feature-not-implemented", "cancel"},
- {XMPP_ERROR_REMOTE_SERVER_ERROR, "502",
- "Remote Server Error", "service-unavailable", "wait"},
- {XMPP_ERROR_SERVICE_UNAVAILABLE, "503",
- "Service Unavailable", "service-unavailable", "cancel"},
- {XMPP_ERROR_REMOTE_SERVER_TIMEOUT, "504",
- "Remote Server Timeout", "remote-server-timeout", "wait"},
- {XMPP_ERROR_DISCONNECTED, "510",
- "Disconnected", "service-unavailable", "cancel"},
- {0, NULL, NULL, NULL, NULL}
-};
-
-#include "xmpp_helper.c"
-#include "xmpp_iq.c"
-#include "xmpp_iqrequest.c"
-#include "xmpp_muc.c"
-#include "xmpp_s10n.c"
+LmMessageNode *bookmarks = NULL;
+LmMessageNode *rosternotes = NULL;
static struct IqHandlers
{
--- a/mcabber/src/xmpp_helper.c Mon Jun 15 10:59:31 2009 +0200
+++ b/mcabber/src/xmpp_helper.c Sun Oct 11 15:59:53 2009 +0200
@@ -22,10 +22,58 @@
* USA
*/
+#include <string.h>
+#include <stdlib.h>
+
#include "xmpp_helper.h"
+#include "settings.h"
+#include "utils.h"
+#include "caps.h"
+#include "logprint.h"
time_t iqlast; // last message/status change time
+extern char *imstatus_showmap[];
+
+struct xmpp_error xmpp_errors[] = {
+ {XMPP_ERROR_REDIRECT, "302",
+ "Redirect", "redirect", "modify"},
+ {XMPP_ERROR_BAD_REQUEST, "400",
+ "Bad Request", "bad-request", "modify"},
+ {XMPP_ERROR_NOT_AUTHORIZED, "401",
+ "Not Authorized", "not-authorized", "auth"},
+ {XMPP_ERROR_PAYMENT_REQUIRED, "402",
+ "Payment Required", "payment-required", "auth"},
+ {XMPP_ERROR_FORBIDDEN, "403",
+ "Forbidden", "forbidden", "auth"},
+ {XMPP_ERROR_NOT_FOUND, "404",
+ "Not Found", "item-not-found", "cancel"},
+ {XMPP_ERROR_NOT_ALLOWED, "405",
+ "Not Allowed", "not-allowed", "cancel"},
+ {XMPP_ERROR_NOT_ACCEPTABLE, "406",
+ "Not Acceptable", "not-acceptable", "modify"},
+ {XMPP_ERROR_REGISTRATION_REQUIRED, "407",
+ "Registration required", "registration-required", "auth"},
+ {XMPP_ERROR_REQUEST_TIMEOUT, "408",
+ "Request Timeout", "remote-server-timeout", "wait"},
+ {XMPP_ERROR_CONFLICT, "409",
+ "Conflict", "conflict", "cancel"},
+ {XMPP_ERROR_INTERNAL_SERVER_ERROR, "500",
+ "Internal Server Error", "internal-server-error", "wait"},
+ {XMPP_ERROR_NOT_IMPLEMENTED, "501",
+ "Not Implemented", "feature-not-implemented", "cancel"},
+ {XMPP_ERROR_REMOTE_SERVER_ERROR, "502",
+ "Remote Server Error", "service-unavailable", "wait"},
+ {XMPP_ERROR_SERVICE_UNAVAILABLE, "503",
+ "Service Unavailable", "service-unavailable", "cancel"},
+ {XMPP_ERROR_REMOTE_SERVER_TIMEOUT, "504",
+ "Remote Server Timeout", "remote-server-timeout", "wait"},
+ {XMPP_ERROR_DISCONNECTED, "510",
+ "Disconnected", "service-unavailable", "cancel"},
+ {0, NULL, NULL, NULL, NULL}
+};
+
+
const gchar* lm_message_node_get_child_value(LmMessageNode *node,
const gchar *child)
{
@@ -110,8 +158,8 @@
return lm_message_node_get_attribute(m->node, "id");
}
-static LmMessage *lm_message_new_iq_from_query(LmMessage *m,
- LmMessageSubType type)
+LmMessage *lm_message_new_iq_from_query(LmMessage *m,
+ LmMessageSubType type)
{
LmMessage *new;
const char *from = lm_message_node_get_attribute(m->node, "from");
@@ -166,8 +214,8 @@
return ver;
}
-inline static LmMessageNode *lm_message_node_find_xmlns(LmMessageNode *node,
- const char *xmlns)
+LmMessageNode *lm_message_node_find_xmlns(LmMessageNode *node,
+ const char *xmlns)
{
LmMessageNode *x;
const char *p;
@@ -179,7 +227,7 @@
return x;
}
-static time_t lm_message_node_get_timestamp(LmMessageNode *node)
+time_t lm_message_node_get_timestamp(LmMessageNode *node)
{
LmMessageNode *x;
const char *p;
@@ -197,9 +245,9 @@
// lm_message_new_presence(status, recipient, message)
// Create an xmlnode with default presence attributes
// Note: the caller must free the node after use
-static LmMessage *lm_message_new_presence(enum imstatus st,
- const char *recipient,
- const char *msg)
+LmMessage *lm_message_new_presence(enum imstatus st,
+ const char *recipient,
+ const char *msg)
{
unsigned int prio;
LmMessage *x = lm_message_new(recipient, LM_MESSAGE_TYPE_PRESENCE);
@@ -243,7 +291,7 @@
static const char *defaulterrormsg(guint code)
{
- int i = 0;
+ int i;
for (i = 0; xmpp_errors[i].code; ++i) {
if (xmpp_errors[i].code == code)
--- a/mcabber/src/xmpp_helper.h Mon Jun 15 10:59:31 2009 +0200
+++ b/mcabber/src/xmpp_helper.h Sun Oct 11 15:59:53 2009 +0200
@@ -1,6 +1,12 @@
#ifndef __XMPPHELPER_H__
#define __XMPPHELPER_H__ 1
+#include <time.h>
+#include <loudmouth/loudmouth.h>
+
+#include "xmpp.h"
+#include "xmpp_defines.h"
+
extern time_t iqlast; /* last message/status change time */
struct T_presence {
@@ -8,13 +14,35 @@
const char *msg;
};
-LmMessageNode * lm_message_node_new(const gchar *name, const gchar *xmlns);
-const gchar* lm_message_node_get_child_value(LmMessageNode * node,
+struct xmpp_error {
+ guint code;
+ const char *code_str;
+ const char *meaning;
+ const char *condition;
+ const char *type;
+};
+
+
+LmMessageNode *lm_message_node_new(const gchar *name, const gchar *xmlns);
+LmMessageNode *lm_message_node_find_xmlns(LmMessageNode *node,
+ const char *xmlns);
+const gchar* lm_message_node_get_child_value(LmMessageNode *node,
const gchar *child);
-void lm_message_node_hide(LmMessageNode * node);
-void lm_message_node_insert_childnode(LmMessageNode * node,
+void lm_message_node_hide(LmMessageNode *node);
+void lm_message_node_insert_childnode(LmMessageNode *node,
LmMessageNode *child);
-void lm_message_node_deep_ref(LmMessageNode * node);
+void lm_message_node_deep_ref(LmMessageNode *node);
+time_t lm_message_node_get_timestamp(LmMessageNode *node);
+
+LmMessage *lm_message_new_iq_from_query(LmMessage *m, LmMessageSubType type);
+
+LmMessage *lm_message_new_presence(enum imstatus st,
+ const char *recipient, const char *msg);
+
+const gchar* lm_message_get_from(LmMessage *m);
+const gchar* lm_message_get_id(LmMessage *m);
+
+void display_server_error(LmMessageNode *x);
/* XEP-0115 (Entity Capabilities) node */
const char *entity_version(enum imstatus status);
--- a/mcabber/src/xmpp_iq.c Mon Jun 15 10:59:31 2009 +0200
+++ b/mcabber/src/xmpp_iq.c Sun Oct 11 15:59:53 2009 +0200
@@ -23,6 +23,19 @@
* USA
*/
+#include <string.h>
+#include <sys/utsname.h>
+
+#include "xmpp_helper.h"
+#include "commands.h"
+#include "screen.h"
+#include "utils.h"
+#include "logprint.h"
+#include "settings.h"
+#include "caps.h"
+
+extern struct xmpp_error xmpp_errors[];
+
static LmHandlerResult handle_iq_command_set_status(LmMessageHandler *h,
LmConnection *c,
LmMessage *m,
@@ -104,7 +117,7 @@
return r;
}
-static void send_iq_error(LmConnection *c, LmMessage *m, guint error)
+void send_iq_error(LmConnection *c, LmMessage *m, guint error)
{
LmMessage *r;
r = lm_message_new_iq_error(m, error);
@@ -392,9 +405,9 @@
return LM_HANDLER_RESULT_REMOVE_MESSAGE;
}
-static LmHandlerResult handle_iq_commands(LmMessageHandler *h,
- LmConnection *c,
- LmMessage *m, gpointer ud)
+LmHandlerResult handle_iq_commands(LmMessageHandler *h,
+ LmConnection *c,
+ LmMessage *m, gpointer ud)
{
const char *requester_jid = NULL;
LmMessageNode *cmd;
@@ -439,9 +452,9 @@
}
-static LmHandlerResult handle_iq_disco_items(LmMessageHandler *h,
- LmConnection *c,
- LmMessage *m, gpointer ud)
+LmHandlerResult handle_iq_disco_items(LmMessageHandler *h,
+ LmConnection *c,
+ LmMessage *m, gpointer ud)
{
LmMessageNode *query;
const char *node;
@@ -504,9 +517,9 @@
}
}
-static LmHandlerResult handle_iq_disco_info(LmMessageHandler *h,
- LmConnection *c,
- LmMessage *m, gpointer ud)
+LmHandlerResult handle_iq_disco_info(LmMessageHandler *h,
+ LmConnection *c,
+ LmMessage *m, gpointer ud)
{
LmMessage *r;
LmMessageNode *query, *tmp;
@@ -532,8 +545,8 @@
return LM_HANDLER_RESULT_REMOVE_MESSAGE;
}
-static LmHandlerResult handle_iq_roster(LmMessageHandler *h, LmConnection *c,
- LmMessage *m, gpointer ud)
+LmHandlerResult handle_iq_roster(LmMessageHandler *h, LmConnection *c,
+ LmMessage *m, gpointer ud)
{
LmMessageNode *y;
const char *fjid, *name, *group, *sub, *ask;
@@ -615,8 +628,8 @@
return LM_HANDLER_RESULT_REMOVE_MESSAGE;
}
-static LmHandlerResult handle_iq_ping(LmMessageHandler *h, LmConnection *c,
- LmMessage *m, gpointer ud)
+LmHandlerResult handle_iq_ping(LmMessageHandler *h, LmConnection *c,
+ LmMessage *m, gpointer ud)
{
LmMessage *r;
@@ -631,8 +644,8 @@
return difftime(time(NULL), iqlast);
}
-static LmHandlerResult handle_iq_last(LmMessageHandler *h, LmConnection *c,
- LmMessage *m, gpointer ud)
+LmHandlerResult handle_iq_last(LmMessageHandler *h, LmConnection *c,
+ LmMessage *m, gpointer ud)
{
LmMessage *r;
LmMessageNode *query;
@@ -662,8 +675,8 @@
return LM_HANDLER_RESULT_REMOVE_MESSAGE;
}
-static LmHandlerResult handle_iq_version(LmMessageHandler *h, LmConnection *c,
- LmMessage *m, gpointer ud)
+LmHandlerResult handle_iq_version(LmMessageHandler *h, LmConnection *c,
+ LmMessage *m, gpointer ud)
{
LmMessage *r;
LmMessageNode *query;
@@ -699,8 +712,8 @@
}
// This function borrows some code from the Pidgin project
-static LmHandlerResult handle_iq_time(LmMessageHandler *h, LmConnection *c,
- LmMessage *m, gpointer ud)
+LmHandlerResult handle_iq_time(LmMessageHandler *h, LmConnection *c,
+ LmMessage *m, gpointer ud)
{
LmMessage *r;
LmMessageNode *query;
@@ -746,8 +759,8 @@
}
// This function borrows some code from the Pidgin project
-static LmHandlerResult handle_iq_time202(LmMessageHandler *h, LmConnection *c,
- LmMessage *m, gpointer ud)
+LmHandlerResult handle_iq_time202(LmMessageHandler *h, LmConnection *c,
+ LmMessage *m, gpointer ud)
{
LmMessage *r;
LmMessageNode *query;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mcabber/src/xmpp_iq.h Sun Oct 11 15:59:53 2009 +0200
@@ -0,0 +1,30 @@
+#ifndef __XMPP_IQ_H__
+#define __XMPP_IQ_H__ 1
+
+LmHandlerResult handle_iq_commands(LmMessageHandler *h,
+ LmConnection *c,
+ LmMessage *m, gpointer ud);
+LmHandlerResult handle_iq_disco_items(LmMessageHandler *h,
+ LmConnection *c,
+ LmMessage *m, gpointer ud);
+LmHandlerResult handle_iq_disco_info(LmMessageHandler *h,
+ LmConnection *c,
+ LmMessage *m, gpointer ud);
+LmHandlerResult handle_iq_roster(LmMessageHandler *h, LmConnection *c,
+ LmMessage *m, gpointer ud);
+LmHandlerResult handle_iq_ping(LmMessageHandler *h, LmConnection *c,
+ LmMessage *m, gpointer ud);
+LmHandlerResult handle_iq_last(LmMessageHandler *h, LmConnection *c,
+ LmMessage *m, gpointer ud);
+LmHandlerResult handle_iq_version(LmMessageHandler *h, LmConnection *c,
+ LmMessage *m, gpointer ud);
+LmHandlerResult handle_iq_time(LmMessageHandler *h, LmConnection *c,
+ LmMessage *m, gpointer ud);
+LmHandlerResult handle_iq_time202(LmMessageHandler *h, LmConnection *c,
+ LmMessage *m, gpointer ud);
+
+void send_iq_error(LmConnection *c, LmMessage *m, guint error);
+
+#endif /* __XMPP_IQ_H__ */
+
+/* vim: set expandtab cindent cinoptions=>2\:2(0: For Vim users... */
--- a/mcabber/src/xmpp_iqrequest.c Mon Jun 15 10:59:31 2009 +0200
+++ b/mcabber/src/xmpp_iqrequest.c Sun Oct 11 15:59:53 2009 +0200
@@ -20,6 +20,20 @@
* USA
*/
+#include <string.h>
+#include <stdlib.h>
+
+#include "xmpp_helper.h"
+#include "xmpp_iq.h"
+#include "screen.h"
+#include "utils.h"
+#include "settings.h"
+#include "hooks.h"
+#include "hbuf.h"
+
+extern LmMessageNode *bookmarks;
+extern LmMessageNode *rosternotes;
+
static LmHandlerResult cb_roster(LmMessageHandler *h, LmConnection *c,
LmMessage *m, gpointer user_data);
static LmHandlerResult cb_version(LmMessageHandler *h, LmConnection *c,
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mcabber/src/xmpp_iqrequest.h Sun Oct 11 15:59:53 2009 +0200
@@ -0,0 +1,8 @@
+#ifndef __XMPP_IQREQUEST_H__
+#define __XMPP_IQREQUEST_H__ 1
+
+void xmpp_iq_request(const char *fulljid, const char *xmlns);
+
+#endif /* __XMPP_IQREQUEST_H__ */
+
+/* vim: set expandtab cindent cinoptions=>2\:2(0: For Vim users... */
--- a/mcabber/src/xmpp_muc.c Mon Jun 15 10:59:31 2009 +0200
+++ b/mcabber/src/xmpp_muc.c Sun Oct 11 15:59:53 2009 +0200
@@ -20,6 +20,23 @@
* USA
*/
+#include <string.h>
+#include <stdlib.h>
+
+#include "xmpp_helper.h"
+#include "events.h"
+#include "hooks.h"
+#include "screen.h"
+#include "hbuf.h"
+#include "roster.h"
+#include "commands.h"
+#include "settings.h"
+#include "utils.h"
+#include "histolog.h"
+
+extern enum imstatus mystatus;
+extern gchar *mystatusmsg;
+
static void decline_invitation(event_muc_invitation *invitation, char *reason)
{
// cut and paste from xmpp_room_invite
@@ -368,10 +385,10 @@
return new_member;
}
-static void handle_muc_presence(const char *from, LmMessageNode *xmldata,
- const char *roomjid, const char *rname,
- enum imstatus ust, const char *ustmsg,
- time_t usttime, char bpprio)
+void handle_muc_presence(const char *from, LmMessageNode *xmldata,
+ const char *roomjid, const char *rname,
+ enum imstatus ust, const char *ustmsg,
+ time_t usttime, char bpprio)
{
LmMessageNode *y;
const char *p;
@@ -597,7 +614,7 @@
scr_DrawRoster();
}
-static void roompresence(gpointer room, void *presencedata)
+void roompresence(gpointer room, void *presencedata)
{
const char *bjid;
const char *nickname;
@@ -674,7 +691,7 @@
// Specific MUC message handling (for example invitation processing)
-static void got_muc_message(const char *from, LmMessageNode *x)
+void got_muc_message(const char *from, LmMessageNode *x)
{
LmMessageNode *invite = lm_message_node_get_child(x, "invite");
if (invite)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mcabber/src/xmpp_muc.h Sun Oct 11 15:59:53 2009 +0200
@@ -0,0 +1,13 @@
+#ifndef __XMPP_MUC_H__
+#define __XMPP_MUC_H__ 1
+
+void roompresence(gpointer room, void *presencedata);
+void got_muc_message(const char *from, LmMessageNode *x);
+void handle_muc_presence(const char *from, LmMessageNode * xmldata,
+ const char *roomjid, const char *rname,
+ enum imstatus ust, const char *ustmsg,
+ time_t usttime, char bpprio);
+
+#endif /* __XMPP_MUC_H__ */
+
+/* vim: set expandtab cindent cinoptions=>2\:2(0: For Vim users... */
--- a/mcabber/src/xmpp_s10n.c Mon Jun 15 10:59:31 2009 +0200
+++ b/mcabber/src/xmpp_s10n.c Sun Oct 11 15:59:53 2009 +0200
@@ -20,6 +20,12 @@
* USA
*/
+#include "xmpp_helper.h"
+#include "events.h"
+#include "screen.h"
+#include "hbuf.h"
+#include "settings.h"
+
// xmpp_send_s10n(jid, subtype)
// Send a s10n message with the passed subtype
void xmpp_send_s10n(const char *bjid, LmMessageSubType type)
@@ -31,7 +37,7 @@
lm_message_unref(x);
}
-static int evscallback_subscription(eviqs *evp, guint evcontext)
+int evscallback_subscription(eviqs *evp, guint evcontext)
{
char *barejid;
char *buf;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mcabber/src/xmpp_s10n.h Sun Oct 11 15:59:53 2009 +0200
@@ -0,0 +1,10 @@
+#ifndef __XMPP_S10N_H__
+#define __XMPP_S10N_H__ 1
+
+#include "events.h"
+
+int evscallback_subscription(eviqs *evp, guint evcontext);
+
+#endif /* __XMPP_S10N_H__ */
+
+/* vim: set expandtab cindent cinoptions=>2\:2(0: For Vim users... */