summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorWill Thompson <will.thompson@collabora.co.uk>2012-01-27 18:08:32 +0000
committerWill Thompson <will.thompson@collabora.co.uk>2012-01-27 22:15:59 +0000
commit89f7b1a1daafe6b9159c5cb42fb0c7fb7acf6871 (patch)
treea87f5d5d40ff8c4ca820a32ad5ad733c4d642c5a /lib
parent6e3d12a641453d1a00b5271b3094edb7a6845a6c (diff)
Delete LmMessage{,Type,SubType} typedefs
Diffstat (limited to 'lib')
-rw-r--r--lib/loudmouth/lm-connection.c6
-rw-r--r--lib/loudmouth/lm-connection.h4
-rw-r--r--lib/loudmouth/lm-message-handler.h2
-rw-r--r--lib/loudmouth/lm-message.h44
4 files changed, 6 insertions, 50 deletions
diff --git a/lib/loudmouth/lm-connection.c b/lib/loudmouth/lm-connection.c
index 72191b911..6fbffdf7b 100644
--- a/lib/loudmouth/lm-connection.c
+++ b/lib/loudmouth/lm-connection.c
@@ -41,14 +41,14 @@ stanza_cb (WockyPorter *self,
typedef struct
{
LmMessageHandler *handler;
- LmMessageType type;
+ WockyStanzaType type;
LmHandlerPriority priority;
} delayed_handler;
void
lm_connection_register_message_handler (LmConnection *connection,
LmMessageHandler *handler,
- LmMessageType type,
+ WockyStanzaType type,
LmHandlerPriority priority)
{
if (connection->porter == NULL)
@@ -84,7 +84,7 @@ lm_connection_register_message_handler (LmConnection *connection,
void
lm_connection_unregister_message_handler (LmConnection *connection,
LmMessageHandler *handler,
- LmMessageType type)
+ WockyStanzaType type)
{
if (handler->handler_id == 0)
return;
diff --git a/lib/loudmouth/lm-connection.h b/lib/loudmouth/lm-connection.h
index b2c0ba05c..a849c4bfa 100644
--- a/lib/loudmouth/lm-connection.h
+++ b/lib/loudmouth/lm-connection.h
@@ -43,12 +43,12 @@ LmConnection * lm_connection_new (void);
void lm_connection_register_message_handler (LmConnection *connection,
LmMessageHandler *handler,
- LmMessageType type,
+ WockyStanzaType type,
LmHandlerPriority priority);
void lm_connection_unregister_message_handler (LmConnection *connection,
LmMessageHandler *handler,
- LmMessageType type);
+ WockyStanzaType type);
void lm_connection_unref (LmConnection *connection);
diff --git a/lib/loudmouth/lm-message-handler.h b/lib/loudmouth/lm-message-handler.h
index 63feecc00..74dcd3407 100644
--- a/lib/loudmouth/lm-message-handler.h
+++ b/lib/loudmouth/lm-message-handler.h
@@ -34,7 +34,7 @@ typedef enum {
typedef LmHandlerResult (*LmHandleMessageFunction) (LmMessageHandler *handler,
LmConnection *connection,
- LmMessage *message,
+ WockyStanza *message,
gpointer user_data);
struct _LmMessageHandler
diff --git a/lib/loudmouth/lm-message.h b/lib/loudmouth/lm-message.h
index 8564e6d9f..e6b990e73 100644
--- a/lib/loudmouth/lm-message.h
+++ b/lib/loudmouth/lm-message.h
@@ -23,48 +23,4 @@
#include <wocky/wocky-stanza.h>
-G_BEGIN_DECLS
-
-typedef WockyStanza LmMessage;
-
-typedef WockyStanzaType LmMessageType;
-
-#define LM_MESSAGE_TYPE_MESSAGE WOCKY_STANZA_TYPE_MESSAGE
-#define LM_MESSAGE_TYPE_PRESENCE WOCKY_STANZA_TYPE_PRESENCE
-#define LM_MESSAGE_TYPE_IQ WOCKY_STANZA_TYPE_IQ
-#define LM_MESSAGE_TYPE_STREAM WOCKY_STANZA_TYPE_STREAM
-#define LM_MESSAGE_TYPE_STREAM_ERROR WOCKY_STANZA_TYPE_STREAM_ERROR
-#define LM_MESSAGE_TYPE_STREAM_FEATURES WOCKY_STANZA_TYPE_STREAM_FEATURES
-#define LM_MESSAGE_TYPE_AUTH WOCKY_STANZA_TYPE_AUTH,
-#define LM_MESSAGE_TYPE_CHALLENGE WOCKY_STANZA_TYPE_CHALLENGE
-#define LM_MESSAGE_TYPE_RESPONSE WOCKY_STANZA_TYPE_RESPONSE
-#define LM_MESSAGE_TYPE_SUCCESS WOCKY_STANZA_TYPE_SUCCESS
-#define LM_MESSAGE_TYPE_FAILURE WOCKY_STANZA_TYPE_FAILURE
-/*
-#define LM_MESSAGE_TYPE_PROCEED
-#define LM_MESSAGE_TYPE_STARTTLS
-*/
-#define LM_MESSAGE_TYPE_UNKNOWN WOCKY_STANZA_TYPE_UNKNOWN
-
-typedef WockyStanzaSubType LmMessageSubType;
-
-#define LM_MESSAGE_SUB_TYPE_NOT_SET WOCKY_STANZA_SUB_TYPE_NONE
-#define LM_MESSAGE_SUB_TYPE_AVAILABLE WOCKY_STANZA_SUB_TYPE_AVAILABLE
-#define LM_MESSAGE_SUB_TYPE_NORMAL WOCKY_STANZA_SUB_TYPE_NORMAL
-#define LM_MESSAGE_SUB_TYPE_CHAT WOCKY_STANZA_SUB_TYPE_CHAT
-#define LM_MESSAGE_SUB_TYPE_GROUPCHAT WOCKY_STANZA_SUB_TYPE_GROUPCHAT
-#define LM_MESSAGE_SUB_TYPE_HEADLINE WOCKY_STANZA_SUB_TYPE_HEADLINE
-#define LM_MESSAGE_SUB_TYPE_UNAVAILABLE WOCKY_STANZA_SUB_TYPE_UNAVAILABLE
-#define LM_MESSAGE_SUB_TYPE_PROBE WOCKY_STANZA_SUB_TYPE_PROBE
-#define LM_MESSAGE_SUB_TYPE_SUBSCRIBE WOCKY_STANZA_SUB_TYPE_SUBSCRIBE
-#define LM_MESSAGE_SUB_TYPE_UNSUBSCRIBE WOCKY_STANZA_SUB_TYPE_UNSUBSCRIBE
-#define LM_MESSAGE_SUB_TYPE_SUBSCRIBED WOCKY_STANZA_SUB_TYPE_SUBSCRIBED
-#define LM_MESSAGE_SUB_TYPE_UNSUBSCRIBED WOCKY_STANZA_SUB_TYPE_UNSUBSCRIBED
-#define LM_MESSAGE_SUB_TYPE_GET WOCKY_STANZA_SUB_TYPE_GET
-#define LM_MESSAGE_SUB_TYPE_SET WOCKY_STANZA_SUB_TYPE_SET
-#define LM_MESSAGE_SUB_TYPE_RESULT WOCKY_STANZA_SUB_TYPE_RESULT
-#define LM_MESSAGE_SUB_TYPE_ERROR WOCKY_STANZA_SUB_TYPE_ERROR
-
-G_END_DECLS
-
#endif /* #ifndef __LM_MESSAGE_H__ */