mw_common.h   mw_common.h 
skipping to change at line 133 skipping to change at line 133
char *community; /**< community name (usually domain name) */ char *community; /**< community name (usually domain name) */
gboolean full; /**< if FALSE, following fields non-existant */ gboolean full; /**< if FALSE, following fields non-existant */
char *desc; /**< implementation defined description */ char *desc; /**< implementation defined description */
guint32 ip_addr; /**< ip addr of the login */ guint32 ip_addr; /**< ip addr of the login */
char *server_id; /**< unique ID of login's server */ char *server_id; /**< unique ID of login's server */
}; };
/* 8.2.2 Private Info Block */ /* 8.2.2 Private Info Block */
struct mwUserItem { struct mwUserItem {
gboolean full; /**< if FALSE, don't include name */ gboolean full; /**< if FALSE, don't include name */
char *id; /**< user id */ char *id; /**< user id */
char *name; /**< user name */ char *community; /**< community */
char *name; /**< user name */
}; };
struct mwPrivacyInfo { struct mwPrivacyInfo {
guint16 reserved; /**< reserved for internal use */
gboolean deny; /**< deny (true) or allow (false) users */ gboolean deny; /**< deny (true) or allow (false) users */
guint32 count; /**< count of users */ guint32 count; /**< count of users */
struct mwUserItem *users; /**< the users list */ struct mwUserItem *users; /**< the users list */
}; };
/* 8.3.5 User Status Types */ /* 8.3.5 User Status Types */
enum mwStatusType { enum mwStatusType {
mwStatus_ACTIVE = 0x0020, mwStatus_ACTIVE = 0x0020,
mwStatus_IDLE = 0x0040, mwStatus_IDLE = 0x0040,
skipping to change at line 320 skipping to change at line 320
void mwLoginInfo_clear(struct mwLoginInfo *info); void mwLoginInfo_clear(struct mwLoginInfo *info);
void mwLoginInfo_clone(struct mwLoginInfo *to, const struct mwLoginInfo *fr om); void mwLoginInfo_clone(struct mwLoginInfo *to, const struct mwLoginInfo *fr om);
void mwUserItem_put(struct mwPutBuffer *b, const struct mwUserItem *user); void mwUserItem_put(struct mwPutBuffer *b, const struct mwUserItem *user);
void mwUserItem_get(struct mwGetBuffer *b, struct mwUserItem *user); void mwUserItem_get(struct mwGetBuffer *b, struct mwUserItem *user);
void mwUserItem_clear(struct mwUserItem *user); void mwUserItem_clear(struct mwUserItem *user);
void mwUserItem_clone(struct mwUserItem *to, const struct mwUserItem *from)
;
void mwPrivacyInfo_put(struct mwPutBuffer *b, void mwPrivacyInfo_put(struct mwPutBuffer *b,
const struct mwPrivacyInfo *info); const struct mwPrivacyInfo *info);
void mwPrivacyInfo_get(struct mwGetBuffer *b, struct mwPrivacyInfo *info); void mwPrivacyInfo_get(struct mwGetBuffer *b, struct mwPrivacyInfo *info);
void mwPrivacyInfo_clear(struct mwPrivacyInfo *info); void mwPrivacyInfo_clear(struct mwPrivacyInfo *info);
void mwUserStatus_put(struct mwPutBuffer *b, void mwUserStatus_put(struct mwPutBuffer *b,
const struct mwUserStatus *stat); const struct mwUserStatus *stat);
 End of changes. 3 change blocks. 
4 lines changed or deleted 7 lines changed or added


 mw_message.h   mw_message.h 
skipping to change at line 46 skipping to change at line 46
mwMessage_LOGIN_ACK = 0x8001, /**< mwMsgLoginAck */ mwMessage_LOGIN_ACK = 0x8001, /**< mwMsgLoginAck */
mwMessage_LOGIN_REDIRECT = 0x0018, /**< mwMsgLoginRedirect */ mwMessage_LOGIN_REDIRECT = 0x0018, /**< mwMsgLoginRedirect */
mwMessage_LOGIN_CONTINUE = 0x0016, /**< mwMsgLoginContinue */ mwMessage_LOGIN_CONTINUE = 0x0016, /**< mwMsgLoginContinue */
mwMessage_CHANNEL_CREATE = 0x0002, /**< mwMsgChannelCreate */ mwMessage_CHANNEL_CREATE = 0x0002, /**< mwMsgChannelCreate */
mwMessage_CHANNEL_DESTROY = 0x0003, /**< mwMsgChannelDestroy */ mwMessage_CHANNEL_DESTROY = 0x0003, /**< mwMsgChannelDestroy */
mwMessage_CHANNEL_SEND = 0x0004, /**< mwMsgChannelSend */ mwMessage_CHANNEL_SEND = 0x0004, /**< mwMsgChannelSend */
mwMessage_CHANNEL_ACCEPT = 0x0006, /**< mwMsgChannelAccept */ mwMessage_CHANNEL_ACCEPT = 0x0006, /**< mwMsgChannelAccept */
mwMessage_SET_USER_STATUS = 0x0009, /**< mwMsgSetUserStatus */ mwMessage_SET_USER_STATUS = 0x0009, /**< mwMsgSetUserStatus */
mwMessage_SET_PRIVACY_LIST = 0x0010, /**< mwMsgSetPrivacyList */ mwMessage_SET_PRIVACY_LIST = 0x000b, /**< mwMsgSetPrivacyList */
mwMessage_SENSE_SERVICE = 0x0011, /**< mwMsgSenseService */ mwMessage_SENSE_SERVICE = 0x0011, /**< mwMsgSenseService */
mwMessage_ADMIN = 0x0019, /**< mwMsgAdmin */ mwMessage_ADMIN = 0x0019, /**< mwMsgAdmin */
}; };
enum mwMessageOption { enum mwMessageOption {
mwMessageOption_ENCRYPT = 0x4000, /**< message data is encrypted */ mwMessageOption_ENCRYPT = 0x4000, /**< message data is encrypted */
mwMessageOption_HAS_ATTRIBS = 0x8000, /**< message has attributes */ mwMessageOption_HAS_ATTRIBS = 0x8000, /**< message has attributes */
}; };
/** @see mwMessageOption */ /** @see mwMessageOption */
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 mw_session.h   mw_session.h 
skipping to change at line 214 skipping to change at line 214
int mwSession_send(struct mwSession *s, struct mwMessage *msg); int mwSession_send(struct mwSession *s, struct mwMessage *msg);
/** sends the keepalive byte */ /** sends the keepalive byte */
int mwSession_sendKeepalive(struct mwSession *s); int mwSession_sendKeepalive(struct mwSession *s);
/** respond to a login redirect message by forcing the login sequence /** respond to a login redirect message by forcing the login sequence
to continue through the immediate server. */ to continue through the immediate server. */
int mwSession_forceLogin(struct mwSession *s); int mwSession_forceLogin(struct mwSession *s);
/** set the internal privacy information, and inform the server as /** set the internal privacy information, and inform the server as
necessary. Triggers the on_setPrivacyInfo call-back. Not yet necessary. Triggers the on_setPrivacyInfo call-back. */
implemented */
int mwSession_setPrivacyInfo(struct mwSession *, struct mwPrivacyInfo *); int mwSession_setPrivacyInfo(struct mwSession *, struct mwPrivacyInfo *);
struct mwPrivacyInfo *mwSession_getPrivacyInfo(struct mwSession *); struct mwPrivacyInfo *mwSession_getPrivacyInfo(struct mwSession *);
/** reference the login information for the session */ /** reference the login information for the session */
struct mwLoginInfo *mwSession_getLoginInfo(struct mwSession *); struct mwLoginInfo *mwSession_getLoginInfo(struct mwSession *);
/** set the internal user status state, and inform the server as /** set the internal user status state, and inform the server as
necessary. Triggers the on_setUserStatus call-back */ necessary. Triggers the on_setUserStatus call-back */
int mwSession_setUserStatus(struct mwSession *, struct mwUserStatus *); int mwSession_setUserStatus(struct mwSession *, struct mwUserStatus *);
 End of changes. 1 change blocks. 
2 lines changed or deleted 1 lines changed or added


 mw_srvc_im.h   mw_srvc_im.h 
skipping to change at line 54 skipping to change at line 54
struct mwServiceIm; struct mwServiceIm;
/** @struct mwConversation /** @struct mwConversation
A conversation between the local service and a single other user */ A conversation between the local service and a single other user */
struct mwConversation; struct mwConversation;
enum mwImClientType { enum mwImClientType {
mwImClient_PLAIN = 0x00000001, /**< text, typing */ mwImClient_PLAIN = 0x00000001, /**< text, typing */
mwImClient_NOTESBUDDY = 0x00033453, /**< adds html, subject, mime */ mwImClient_NOTESBUDDY = 0x00033453, /**< adds html, subject, mime */
mwImClient_PRECONF = 0x00000019, /**< pre-conference, legacy */
mwImClient_UNKNOWN = 0xffffffff, /**< trouble determining type */ mwImClient_UNKNOWN = 0xffffffff, /**< trouble determining type */
}; };
/** /**
Types of supported messages. When a conversation is created, the Types of supported messages. When a conversation is created, the
least common denominator of features between either side of the least common denominator of features between either side of the
conversation (based on what features are available in the IM conversation (based on what features are available in the IM
service itself) becomes the set of supported features for that service itself) becomes the set of supported features for that
conversation. At any point, the feature set for the service may conversation. At any point, the feature set for the service may
change, without affecting any existing conversations. change, without affecting any existing conversations.
skipping to change at line 113 skipping to change at line 114
/** A conversation has been successfully opened */ /** A conversation has been successfully opened */
void (*conversation_opened)(struct mwConversation *conv); void (*conversation_opened)(struct mwConversation *conv);
/** A conversation has been closed */ /** A conversation has been closed */
void (*conversation_closed)(struct mwConversation *conv, guint32 err); void (*conversation_closed)(struct mwConversation *conv, guint32 err);
/** A message has been received on a conversation */ /** A message has been received on a conversation */
void (*conversation_recv)(struct mwConversation *conv, void (*conversation_recv)(struct mwConversation *conv,
enum mwImSendType type, gconstpointer msg); enum mwImSendType type, gconstpointer msg);
/** Handle a Place invitation. Set this to NULL and we should end up
receiving a conference invitation instead. */
void (*place_invite)(struct mwConversation *conv,
const char *message,
const char *title, const char *name);
/** optional. called from mwService_free */ /** optional. called from mwService_free */
void (*clear)(struct mwServiceIm *srvc); void (*clear)(struct mwServiceIm *srvc);
}; };
struct mwServiceIm *mwServiceIm_new(struct mwSession *session, struct mwServiceIm *mwServiceIm_new(struct mwSession *session,
struct mwImHandler *handler); struct mwImHandler *handler);
struct mwImHandler *mwServiceIm_getHandler(struct mwServiceIm *srvc); struct mwImHandler *mwServiceIm_getHandler(struct mwServiceIm *srvc);
/** reference an existing conversation to target, or create a new /** reference an existing conversation to target, or create a new
 End of changes. 2 change blocks. 
0 lines changed or deleted 7 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/