--- a/ChangeLog	Fri Oct 08 11:12:03 2004 +0000
+++ b/ChangeLog	Thu Oct 21 23:18:51 2004 +0000
@@ -1,3 +1,19 @@
+2004-10-22  Mikael Hallendal  <micke@imendio.com>
+
+	reviewed by: <delete if not using a buddy>
+
+	* loudmouth/lm-connection.h:
+	* loudmouth/lm-error.h:
+	* loudmouth/lm-message-handler.h:
+	* loudmouth/lm-message-node.h:
+	* loudmouth/lm-message.h:
+	* loudmouth/lm-proxy.h:
+	* loudmouth/lm-utils.h:
+        * loudmouth/lm-ssl.h:
+        - G_BEGIN_DECLS and G_END_DECLS
+        * loudmouth/loudmouth.h:
+        - Include lm-ssl.h
+
 2004-10-08  Mikael Hallendal  <micke@imendio.com>
 
 	* loudmouth/lm-connection.c: (connection_new_message_cb):

--- a/loudmouth/lm-connection.h	Fri Oct 08 11:12:03 2004 +0000
+++ b/loudmouth/lm-connection.h	Thu Oct 21 23:18:51 2004 +0000
@@ -29,6 +29,8 @@
 #include <loudmouth/lm-proxy.h>
 #include <loudmouth/lm-ssl.h>
 
+G_BEGIN_DECLS
+
 #define LM_CONNECTION(o) (LmConnection *) o;
 
 #define LM_CONNECTION_DEFAULT_PORT     5222
@@ -158,4 +160,6 @@
 LmConnection* lm_connection_ref               (LmConnection       *connection);
 void          lm_connection_unref             (LmConnection       *connection);
 
+G_END_DECLS
+
 #endif /* __LM_CONNECTION_H__ */

--- a/loudmouth/lm-error.h	Fri Oct 08 11:12:03 2004 +0000
+++ b/loudmouth/lm-error.h	Thu Oct 21 23:18:51 2004 +0000
@@ -27,6 +27,8 @@
 
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 #define LM_ERROR lm_error_quark ()
 
 typedef enum {
@@ -38,4 +40,6 @@
 
 GQuark lm_error_quark (void) G_GNUC_CONST;
 
+G_END_DECLS
+
 #endif /* __LM_ERROR_H__ */

--- a/loudmouth/lm-message-handler.h	Fri Oct 08 11:12:03 2004 +0000
+++ b/loudmouth/lm-message-handler.h	Thu Oct 21 23:18:51 2004 +0000
@@ -27,6 +27,8 @@
 
 #include <loudmouth/lm-connection.h>
 
+G_BEGIN_DECLS
+
 typedef LmHandlerResult (* LmHandleMessageFunction) (LmMessageHandler *handler,
 						     LmConnection     *connection,
 						     LmMessage        *message,
@@ -40,6 +42,7 @@
 LmMessageHandler *lm_message_handler_ref   (LmMessageHandler        *handler);
 void              lm_message_handler_unref (LmMessageHandler        *handler);
 
+G_END_DECLS
 
 #endif /* __LM_MESSAGE_HANDLER_H__ */
 

--- a/loudmouth/lm-message-node.h	Fri Oct 08 11:12:03 2004 +0000
+++ b/loudmouth/lm-message-node.h	Thu Oct 21 23:18:51 2004 +0000
@@ -27,6 +27,8 @@
 
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 typedef struct _LmMessageNode LmMessageNode;
 
 struct _LmMessageNode {
@@ -69,5 +71,6 @@
 void           lm_message_node_unref          (LmMessageNode *node);
 gchar *        lm_message_node_to_string      (LmMessageNode *node);
 
+G_END_DECLS
 
 #endif /* __LM_MESSAGE_NODE_H__ */

--- a/loudmouth/lm-message.h	Fri Oct 08 11:12:03 2004 +0000
+++ b/loudmouth/lm-message.h	Thu Oct 21 23:18:51 2004 +0000
@@ -27,6 +27,8 @@
 
 #include <loudmouth/lm-message-node.h>
 
+G_BEGIN_DECLS
+
 typedef struct LmMessagePriv LmMessagePriv;
 
 typedef struct {
@@ -74,4 +76,6 @@
 LmMessage *      lm_message_ref               (LmMessage        *message);
 void             lm_message_unref             (LmMessage        *message);
 
+G_END_DECLS
+
 #endif /* __LM_MESSAGE_H__ */

--- a/loudmouth/lm-proxy.h	Fri Oct 08 11:12:03 2004 +0000
+++ b/loudmouth/lm-proxy.h	Thu Oct 21 23:18:51 2004 +0000
@@ -24,6 +24,8 @@
 #error "Only <loudmouth/loudmouth.h> can be included directly, this file may disappear or change contents."
 #endif
 
+G_BEGIN_DECLS
+
 typedef struct _LmProxy LmProxy;
 
 typedef enum {
@@ -59,5 +61,6 @@
 LmProxy *     lm_proxy_ref              (LmProxy            *proxy);
 void          lm_proxy_unref            (LmProxy            *proxy);
 
+G_END_DECLS
 #endif /* __LM_PROXY_H__ */
 

--- a/loudmouth/lm-ssl.h	Fri Oct 08 11:12:03 2004 +0000
+++ b/loudmouth/lm-ssl.h	Thu Oct 21 23:18:51 2004 +0000
@@ -25,6 +25,8 @@
 #error "Only <loudmouth/loudmouth.h> can be included directly, this file may disappear or change contents."
 #endif
 
+G_BEGIN_DECLS
+
 typedef struct _LmSSL LmSSL;
 typedef enum {
 	LM_CERT_INVALID,
@@ -64,4 +66,6 @@
 LmSSL *               lm_ssl_ref             (LmSSL          *ssl);
 void                  lm_ssl_unref           (LmSSL          *ssl);
 
+G_END_DECLS
+
 #endif /* __LM_SSL_H__ */

--- a/loudmouth/lm-utils.h	Fri Oct 08 11:12:03 2004 +0000
+++ b/loudmouth/lm-utils.h	Thu Oct 21 23:18:51 2004 +0000
@@ -27,6 +27,10 @@
 
 #include <glib.h>
 
+G_BEGIN_DECLS
+
 struct tm *lm_utils_get_localtime (const gchar *stamp);
 
+G_END_DECLS
+
 #endif /* __LM_UTIL__ */

--- a/loudmouth/loudmouth.h	Fri Oct 08 11:12:03 2004 +0000
+++ b/loudmouth/loudmouth.h	Thu Oct 21 23:18:51 2004 +0000
@@ -30,6 +30,7 @@
 #include <loudmouth/lm-message-node.h>
 #include <loudmouth/lm-proxy.h>
 #include <loudmouth/lm-utils.h>
+#include <loudmouth/lm-ssl.h>
 
 #undef LM_INSIDE_LOUDMOUTH_H