Completed the removal of $Id$ tags in the Citadel server. Also, since the strings...

[citadel.git] / citadel / modules / xmpp / serv_xmpp.h

diff --git a/citadel/modules/xmpp/serv_xmpp.h b/citadel/modules/xmpp/serv_xmpp.h
index d8e29e9e1400839c7ff9f88b0f3abda97b929582..e2dafe736cfdf810ef1c281b7d4f8f9a4534dff7 100644 (file)
--- a/citadel/modules/xmpp/serv_xmpp.h
+++ b/citadel/modules/xmpp/serv_xmpp.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (c) 2007-2009 by Art Cancro
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -18,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-struct citxmpp {                       /* Information about the current session */
+typedef struct _citxmpp {                      /* Information about the current session */
        XML_Parser xp;                  /* XML parser instance for incoming client stream */
        char server_name[256];          /* who they think we are */
        char *chardata;
@@ -45,9 +43,9 @@ struct citxmpp {                      /* Information about the current session */
 
        int bind_requested;             /* In this stanza, client is asking server to bind a resource. */
        int ping_requested;             /* In this stanza, client is pinging the server. */
-};
+} citxmpp;
 
-#define XMPP ((struct citxmpp *)CC->session_specific_data)
+#define XMPP ((citxmpp *)CC->session_specific_data)
 
 struct xmpp_event {
        struct xmpp_event *next;
@@ -83,3 +81,5 @@ void xmpp_send_message(char *, char *);
 void xmpp_non_sasl_authenticate(char *, char *, char *, char *);
 void xmpp_massacre_roster(void);
 void xmpp_delete_old_buddies_who_no_longer_exist_from_the_client_roster(void);
+int xmpp_is_visible(struct CitContext *from, struct CitContext *to_whom);
+char *xmlesc(char *buf, char *str, int bufsiz);