Rename xmpp.h to strophe.h and apply the name changes to the internal

header multiple include protection.

SConstruct

@@ -48,7 +48,7 @@ Sources = Split("""
 """)
 
 Headers = Split("""
-  xmpp.h
+  strophe.h
   common.h
   sock.h
   hash.h

examples/active.c

@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <xmpp.h>
+#include <strophe.h>
 
 int handle_reply(xmpp_conn_t * const conn,
 		 xmpp_stanza_t * const stanza,

examples/basic.c

@@ -14,7 +14,7 @@
 
 #include <stdio.h>
 
-#include <xmpp.h>
+#include <strophe.h>
 
 void conn_handler(xmpp_conn_t * const conn, const xmpp_conn_event_t status, 
 		  const int error, xmpp_stream_error_t * const stream_error,

examples/roster.c

@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <xmpp.h>
+#include <strophe.h>
 
 int handle_reply(xmpp_conn_t * const conn,
 		 xmpp_stanza_t * const stanza,

src/auth.c

@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "xmpp.h"
+#include "strophe.h"
 #include "common.h"
 #include "sasl.h"
 

src/common.h

@@ -12,8 +12,8 @@
 **  distribution.
 */
 
-#ifndef __LIBXMPP_XMPP_COMMON_H__
+#ifndef __LIBSTROPHE_COMMON_H__
-#define __LIBXMPP_XMPP_COMMON_H__
+#define __LIBSTROPHE_COMMON_H__
 
 #include <stdio.h>
 #include <stdarg.h>
@@ -22,7 +22,7 @@
 #endif
 
 
-#include "xmpp.h"
+#include "strophe.h"
 #include "sock.h"
 #include "hash.h"
 #include "util.h"
@@ -269,4 +269,4 @@ void disconnect_mem_error(xmpp_conn_t * const conn);
 /* auth functions */
 void auth_handle_open(xmpp_conn_t * const conn);
 
-#endif /* __LIBXMPP_XMPP_COMMON_H__ */
+#endif /* __LIBSTROPHE_COMMON_H__ */

src/conn.c

@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "xmpp.h"
+#include "strophe.h"
 #include "common.h"
 
 #define DEFAULT_SEND_QUEUE_MAX 64

src/ctx.c

@@ -17,7 +17,7 @@
 #include <stdarg.h>
 #include <string.h>
 
-#include "xmpp.h"
+#include "strophe.h"
 #include "common.h"
 #include "util.h"
 

src/event.c

@@ -18,7 +18,7 @@
 
 #include <sys/select.h>
 
-#include "xmpp.h"
+#include "strophe.h"
 #include "common.h"
 
 #define DEFAULT_TIMEOUT 1

src/handler.c

@@ -17,7 +17,7 @@
 #include <string.h>
 #include <stdint.h>
 
-#include "xmpp.h"
+#include "strophe.h"
 #include "common.h"
 
 void handler_fire_stanza(xmpp_conn_t * const conn,

src/hash.c

@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "xmpp.h"
+#include "strophe.h"
 #include "common.h"
 #include "hash.h"
 

src/hash.h

@@ -12,8 +12,8 @@
 **  distribution.
 */
 
-#ifndef __LIBXMPP_HASH_H__
+#ifndef __LIBSTROPHE_HASH_H__
-#define __LIBXMPP_HASH_H__
+#define __LIBSTROPHE_HASH_H__
 
 typedef struct _hash_t hash_t;
 

src/jid.c

@@ -15,7 +15,7 @@
 
 #include <string.h>
 
-#include "xmpp.h"
+#include "strophe.h"
 #include "common.h"
 
 /** join jid component parts to form a new jid string */

src/parser.c

@@ -18,7 +18,7 @@
 
 #include "expat.h"
 
-#include "xmpp.h"
+#include "strophe.h"
 #include "common.h"
 
 static void _log_open_tag(xmpp_conn_t * const conn,

src/sasl.c

@@ -14,7 +14,7 @@
 
 #include <string.h>
 
-#include "xmpp.h"
+#include "strophe.h"
 #include "common.h"
 #include "sasl.h"
 #include "md5.h"

src/sasl.h

@@ -12,10 +12,10 @@
 **  distribution.
 */
 
-#ifndef __LIBXMPP_SASL_H__
+#ifndef __LIBSTROPHE_SASL_H__
-#define __LIBXMPP_SASL_H__
+#define __LIBSTROPHE_SASL_H__
 
-#include "xmpp.h"
+#include "strophe.h"
 
 /** low-level sasl routines */
 

src/sock.h

@@ -12,8 +12,8 @@
 **  distribution.
 */
 
-#ifndef __LIBXMPP_SOCK_H__
+#ifndef __LIBSTROPHE_SOCK_H__
-#define __LIBXMPP_SOCK_H__
+#define __LIBSTROPHE_SOCK_H__
 
 #include <stdio.h>
 
@@ -39,4 +39,4 @@ int sock_is_recoverable(const int error);
 /* checks for an error after connect, return 0 if connect successful */
 int sock_connect_error(const sock_t sock);
 
-#endif /* __LIBXMPP_SOCK_H__ */
+#endif /* __LIBSTROPHE_SOCK_H__ */

src/stanza.c

@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "xmpp.h"
+#include "strophe.h"
 #include "common.h"
 #include "hash.h"
 

src/util.c

@@ -23,7 +23,7 @@
 #include <stdint.h>
 #endif
 
-#include "xmpp.h"
+#include "strophe.h"
 #include "common.h"
 #include "util.h"
 

src/util.h

@@ -12,8 +12,8 @@
 **  distribution.
 */
 
-#ifndef __LIBXMPP_UTIL_H__
+#ifndef __LIBSTROPHE_UTIL_H__
-#define __LIBXMPP_UTIL_H__
+#define __LIBSTROPHE_UTIL_H__
 
 #ifndef _WIN32
 #include <stdint.h>
@@ -23,4 +23,4 @@
 uint64_t time_stamp(void);
 uint64_t time_elapsed(uint64_t t1, uint64_t t2);
 
-#endif /* __LIBXMPP_UTIL_H__ */
+#endif /* __LIBSTROPHE_UTIL_H__ */

strophe.h

@@ -1,11 +1,11 @@
-/* xmpp.h
+/* strophe.h
-** XMPP client library API
+** libstrophe XMPP client library API
 **
 ** Copyright (C) 2005 OGG, LLC. All rights reserved.
 */
 
-#ifndef __LIBXMPP_XMPP_H__
+#ifndef __LIBSTROPHE_STROPHE_H__
-#define __LIBXMPP_XMPP_H__
+#define __LIBSTROPHE_STROPHE_H__
 
 #include <stdio.h>
 
@@ -258,4 +258,4 @@ void xmpp_run_once(xmpp_ctx_t *ctx, const unsigned long  timeout);
 void xmpp_run(xmpp_ctx_t *ctx);
 void xmpp_stop(xmpp_ctx_t *ctx);
 
-#endif /* __LIBXMPP_XMPP_H__ */
+#endif /* __LIBSTROPHE_STROPHE_H__ */

tests/test_base64.c

@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "xmpp.h"
+#include "strophe.h"
 #include "common.h"
 #include "sasl.h"
 

tests/test_ctx.c

@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "xmpp.h"
+#include "strophe.h"
 #include "common.h"
 
 static int log_called = 0;

tests/test_hash.c

@@ -16,7 +16,7 @@
 #include <string.h>
 #include <time.h>
 
-#include "xmpp.h"
+#include "strophe.h"
 #include "common.h"
 #include "hash.h"
 

tests/test_jid.c

@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "xmpp.h"
+#include "strophe.h"
 #include "common.h"
 
 static const char jid1[] = "foo@bar.com";

tests/test_sasl.c

@@ -15,7 +15,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "xmpp.h"
+#include "strophe.h"
 #include "common.h"
 #include "sasl.h"