mw_channel.h   mw_channel.h 
skipping to change at line 80 skipping to change at line 80
4: data is sent and received over the channel 4: data is sent and received over the channel
5: The channel is closed either by receipt of a close message or by 5: The channel is closed either by receipt of a close message or by
local action. If by local action, then a close message is sent to local action. If by local action, then a close message is sent to
the server. The channel is cleaned up, its queues dumped, and it the server. The channel is cleaned up, its queues dumped, and it
is deallocated. */ is deallocated. */
#include <time.h> #include <time.h>
#include "mw_common.h" #include "mw_common.h"
#ifdef _cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/* place-holders */ /* place-holders */
struct mwCipherInstance; struct mwCipherInstance;
struct mwMsgChannelAccept; struct mwMsgChannelAccept;
struct mwMsgChannelCreate; struct mwMsgChannelCreate;
struct mwMsgChannelDestroy; struct mwMsgChannelDestroy;
struct mwMsgChannelSend; struct mwMsgChannelSend;
struct mwService; struct mwService;
skipping to change at line 321 skipping to change at line 321
void mwChannel_recvAccept(struct mwChannel *chan, void mwChannel_recvAccept(struct mwChannel *chan,
struct mwMsgChannelAccept *msg); struct mwMsgChannelAccept *msg);
/** pass a destroy message to a channel for handling */ /** pass a destroy message to a channel for handling */
void mwChannel_recvDestroy(struct mwChannel *chan, void mwChannel_recvDestroy(struct mwChannel *chan,
struct mwMsgChannelDestroy *msg); struct mwMsgChannelDestroy *msg);
/** Feed data into a channel. */ /** Feed data into a channel. */
void mwChannel_recv(struct mwChannel *chan, struct mwMsgChannelSend *msg); void mwChannel_recv(struct mwChannel *chan, struct mwMsgChannelSend *msg);
#ifdef _cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _MW_CHANNEL_H */ #endif /* _MW_CHANNEL_H */
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 mw_cipher.h   mw_cipher.h 
skipping to change at line 27 skipping to change at line 27
License along with this library; if not, write to the Free License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef _MW_CIPHER_H #ifndef _MW_CIPHER_H
#define _MW_CIPHER_H #define _MW_CIPHER_H
#include <glib.h> #include <glib.h>
#include "mw_common.h" #include "mw_common.h"
#ifdef _cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/* place-holders */ /* place-holders */
struct mwChannel; struct mwChannel;
struct mwSession; struct mwSession;
/** @enum mwCipherType /** @enum mwCipherType
Common cipher types */ Common cipher types */
enum mwCipherType { enum mwCipherType {
skipping to change at line 236 skipping to change at line 236
void mwMpi_export(struct mwMpi *i, struct mwOpaque *o); void mwMpi_export(struct mwMpi *i, struct mwOpaque *o);
/** set a big integer to the Sametime Prime value */ /** set a big integer to the Sametime Prime value */
void mwMpi_setDHPrime(struct mwMpi *i); void mwMpi_setDHPrime(struct mwMpi *i);
/** set a big integer to the Sametime Base value */ /** set a big integer to the Sametime Base value */
void mwMpi_setDHBase(struct mwMpi *i); void mwMpi_setDHBase(struct mwMpi *i);
/** sets private to a randomly generated value, and calculates public /** sets private to a randomly generated value, and calculates public
using the Sametime Prime and Base */ using the Sametime Prime and Base */
void mwMpi_randDHKeypair(struct mwMpi *private, struct mwMpi *public); void mwMpi_randDHKeypair(struct mwMpi *private_key, struct mwMpi *public_ke y);
/** sets the shared key value based on the remote and private keys, /** sets the shared key value based on the remote and private keys,
using the Sametime Prime and Base */ using the Sametime Prime and Base */
void mwMpi_calculateDHShared(struct mwMpi *shared, struct mwMpi *remote, void mwMpi_calculateDHShared(struct mwMpi *shared_key, struct mwMpi *remote
struct mwMpi *private); _key,
struct mwMpi *private_key);
/* @} */ /* @} */
#ifdef _cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _MW_CIPHER_H */ #endif /* _MW_CIPHER_H */
 End of changes. 4 change blocks. 
5 lines changed or deleted 6 lines changed or added


 mw_common.h   mw_common.h 
skipping to change at line 61 skipping to change at line 61
- copies/clones members of from into to. May result in memory - copies/clones members of from into to. May result in memory
allocation for some types. Note that to is not cleared allocation for some types. Note that to is not cleared
before-hand, it must already be in a pristine condition. before-hand, it must already be in a pristine condition.
<code>gboolean TYPE_equal(TYPE *y, TYPE *z)</code> <code>gboolean TYPE_equal(TYPE *y, TYPE *z)</code>
- simple equality test. - simple equality test.
*/ */
#include <glib.h> #include <glib.h>
#ifdef _cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** @struct mwPutBuffer /** @struct mwPutBuffer
buffer to be written to */ buffer to be written to */
struct mwPutBuffer; struct mwPutBuffer;
/** @struct mwGetBuffer /** @struct mwGetBuffer
buffer to be read from */ buffer to be read from */
struct mwGetBuffer; struct mwGetBuffer;
skipping to change at line 384 skipping to change at line 384
const struct mwEncryptItem *item); const struct mwEncryptItem *item);
void mwEncryptItem_get(struct mwGetBuffer *b, struct mwEncryptItem *item); void mwEncryptItem_get(struct mwGetBuffer *b, struct mwEncryptItem *item);
void mwEncryptItem_clear(struct mwEncryptItem *item); void mwEncryptItem_clear(struct mwEncryptItem *item);
void mwEncryptItem_free(struct mwEncryptItem *item); void mwEncryptItem_free(struct mwEncryptItem *item);
/*@}*/ /*@}*/
#ifdef _cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _MW_COMMON_H */ #endif /* _MW_COMMON_H */
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 mw_error.h   mw_error.h 
skipping to change at line 35 skipping to change at line 35
Common error code constants used by Meanwhile. Common error code constants used by Meanwhile.
Not all of these error codes (or even many, really) will ever Not all of these error codes (or even many, really) will ever
actually appear from Meanwhile. These are taken directly from the actually appear from Meanwhile. These are taken directly from the
houri draft, along with the minimal explanation for each. houri draft, along with the minimal explanation for each.
*/ */
#include <glib.h> #include <glib.h>
#ifdef _cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** reference to a new string appropriate for the given error code.*/ /** reference to a new string appropriate for the given error code.*/
char* mwError(guint32 code); char* mwError(guint32 code);
/* 8.3 Constants */ /* 8.3 Constants */
/* 8.3.1 Error Codes */ /* 8.3.1 Error Codes */
/* 8.3.1.1 General error/success codes */ /* 8.3.1.1 General error/success codes */
skipping to change at line 160 skipping to change at line 160
enum ERR_IM { enum ERR_IM {
ERR_IM_COULDNT_REGISTER = 0x80002003, ERR_IM_COULDNT_REGISTER = 0x80002003,
ERR_IM_ALREADY_REGISTERED = 0x80002004, ERR_IM_ALREADY_REGISTERED = 0x80002004,
/** apparently, this is used to mean that the requested feature (per /** apparently, this is used to mean that the requested feature (per
the channel create addtl data) is not supported by the client on the channel create addtl data) is not supported by the client on
the other end of the IM channel */ the other end of the IM channel */
ERR_IM_NOT_REGISTERED = 0x80002005, ERR_IM_NOT_REGISTERED = 0x80002005,
}; };
#ifdef _cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _MW_ERROR_H */ #endif /* _MW_ERROR_H */
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 mw_message.h   mw_message.h 
skipping to change at line 27 skipping to change at line 27
License along with this library; if not, write to the Free License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef _MW_MESSAGE_H #ifndef _MW_MESSAGE_H
#define _MW_MESSAGE_H #define _MW_MESSAGE_H
#include <glib/glist.h> #include <glib/glist.h>
#include "mw_common.h" #include "mw_common.h"
#ifdef _cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** Cast a pointer to a message subtype (eg, mwMsgHandshake, /** Cast a pointer to a message subtype (eg, mwMsgHandshake,
mwMsgAdmin) into a pointer to a mwMessage */ mwMsgAdmin) into a pointer to a mwMessage */
#define MW_MESSAGE(msg) (&msg->head) #define MW_MESSAGE(msg) (&msg->head)
/** Indicates the type of a message. */ /** Indicates the type of a message. */
enum mwMessageType { enum mwMessageType {
mwMessage_HANDSHAKE = 0x0000, /**< mwMsgHandshake */ mwMessage_HANDSHAKE = 0x0000, /**< mwMsgHandshake */
skipping to change at line 268 skipping to change at line 268
guint16 unknown_a; /**< unknown A. Usually 0x00 */ guint16 unknown_a; /**< unknown A. Usually 0x00 */
gboolean may_reply; /**< replies allowed */ gboolean may_reply; /**< replies allowed */
char *text; /**< text of message */ char *text; /**< text of message */
/** list of (char *) indicating recipients. Recipient users are in /** list of (char *) indicating recipients. Recipient users are in
the format "@U username" and recipient NAB groups are in the the format "@U username" and recipient NAB groups are in the
format "@G groupname" */ format "@G groupname" */
GList *recipients; GList *recipients;
}; };
#ifdef _cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _MW_MESSAGE_H */ #endif /* _MW_MESSAGE_H */
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 mw_service.h   mw_service.h 
skipping to change at line 26 skipping to change at line 26
You should have received a copy of the GNU Library General Public You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef _MW_SERVICE_H #ifndef _MW_SERVICE_H
#define _MW_SERVICE_H #define _MW_SERVICE_H
#include "mw_common.h" #include "mw_common.h"
#ifdef _cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/* place-holders */ /* place-holders */
struct mwChannel; struct mwChannel;
struct mwService; struct mwService;
struct mwSession; struct mwSession;
struct mwMsgChannelCreate; struct mwMsgChannelCreate;
struct mwMsgChannelAccept; struct mwMsgChannelAccept;
struct mwMsgChannelDestroy; struct mwMsgChannelDestroy;
skipping to change at line 332 skipping to change at line 332
/** Reference associated client data */ /** Reference associated client data */
gpointer mwService_getClientData(struct mwService *service); gpointer mwService_getClientData(struct mwService *service);
/** Removes client data from service. If there is a cleanup function, /** Removes client data from service. If there is a cleanup function,
it will be called. */ it will be called. */
void mwService_removeClientData(struct mwService *service); void mwService_removeClientData(struct mwService *service);
/*@}*/ /*@}*/
#ifdef _cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _MW_SERVICE_H */ #endif /* _MW_SERVICE_H */
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 mw_srvc_aware.h   mw_srvc_aware.h 
skipping to change at line 37 skipping to change at line 37
@todo remove the whole idea of an instantiated mwAwareList and @todo remove the whole idea of an instantiated mwAwareList and
instead use arbitrary pointers (including NULL) as keys to instead use arbitrary pointers (including NULL) as keys to
internally stored lists. This removes the problem of the service internally stored lists. This removes the problem of the service
free'ing its lists and invalidating mwAwareList references from free'ing its lists and invalidating mwAwareList references from
client code. client code.
*/ */
#include "mw_common.h" #include "mw_common.h"
#ifdef _cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** Type identifier for the aware service */ /** Type identifier for the aware service */
#define mwService_AWARE 0x00000011 #define mwService_AWARE 0x00000011
/** @struct mwServiceAware /** @struct mwServiceAware
Instance of an Aware Service. The members of this structure are Instance of an Aware Service. The members of this structure are
not made available. Accessing the parts of an aware service should not made available. Accessing the parts of an aware service should
skipping to change at line 230 skipping to change at line 230
const char *mwServiceAware_getText(struct mwServiceAware *srvc, const char *mwServiceAware_getText(struct mwServiceAware *srvc,
struct mwAwareIdBlock *user); struct mwAwareIdBlock *user);
/** look up the last known copy of an attribute for a user by the /** look up the last known copy of an attribute for a user by the
attribute's key */ attribute's key */
const struct mwAwareAttribute * const struct mwAwareAttribute *
mwServiceAware_getAttribute(struct mwServiceAware *srvc, mwServiceAware_getAttribute(struct mwServiceAware *srvc,
struct mwAwareIdBlock *user, struct mwAwareIdBlock *user,
guint32 key); guint32 key);
#ifdef _cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _MW_SRVC_AWARE_H */ #endif /* _MW_SRVC_AWARE_H */
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 mw_srvc_conf.h   mw_srvc_conf.h 
skipping to change at line 27 skipping to change at line 27
License along with this library; if not, write to the Free License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef _MW_SRVC_CONF_H #ifndef _MW_SRVC_CONF_H
#define _MW_SRVC_CONF_H #define _MW_SRVC_CONF_H
#include <glib/glist.h> #include <glib/glist.h>
#include "mw_common.h" #include "mw_common.h"
#ifdef _cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** Type identifier for the conference service */ /** Type identifier for the conference service */
#define mwService_CONFERENCE 0x80000010 #define mwService_CONFERENCE 0x80000010
enum mwConferenceState { enum mwConferenceState {
mwConference_NEW, /**< new outgoing conference */ mwConference_NEW, /**< new outgoing conference */
mwConference_PENDING, /**< outgoing conference pending creation */ mwConference_PENDING, /**< outgoing conference pending creation */
mwConference_INVITED, /**< invited to incoming conference */ mwConference_INVITED, /**< invited to incoming conference */
skipping to change at line 177 skipping to change at line 177
void mwConference_setClientData(struct mwConference *conf, void mwConference_setClientData(struct mwConference *conf,
gpointer data, GDestroyNotify clear); gpointer data, GDestroyNotify clear);
/** reference associated client data */ /** reference associated client data */
gpointer mwConference_getClientData(struct mwConference *conf); gpointer mwConference_getClientData(struct mwConference *conf);
/** remove associated client data if any, and call the cleanup /** remove associated client data if any, and call the cleanup
function on the data as necessary */ function on the data as necessary */
void mwConference_removeClientData(struct mwConference *conf); void mwConference_removeClientData(struct mwConference *conf);
#ifdef _cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _MW_SRVC_CONF_H */ #endif /* _MW_SRVC_CONF_H */
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 mw_srvc_dir.h   mw_srvc_dir.h 
skipping to change at line 26 skipping to change at line 26
License along with this library; if not, write to the Free License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef _MW_SRVC_DIR_H #ifndef _MW_SRVC_DIR_H
#define _MW_SERV_DIR_H #define _MW_SERV_DIR_H
#include <glib.h> #include <glib.h>
#include <glib/glist.h> #include <glib/glist.h>
#ifdef _cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
struct mwSession; struct mwSession;
#define SERVICE_DIRECTORY 0x0000001a #define SERVICE_DIRECTORY 0x0000001a
/** @struct mwServiceDirectory /** @struct mwServiceDirectory
the directory service. */ the directory service. */
skipping to change at line 173 skipping to change at line 173
/** continue a search into its previous results */ /** continue a search into its previous results */
int mwDirectory_previous(struct mwDirectory *dir); int mwDirectory_previous(struct mwDirectory *dir);
/** initiate a search on an open directory */ /** initiate a search on an open directory */
int mwDirectory_search(struct mwDirectory *dir, const char *query); int mwDirectory_search(struct mwDirectory *dir, const char *query);
/** close and free the directory, and unassociate it with its owning /** close and free the directory, and unassociate it with its owning
address book and service */ address book and service */
int mwDirectory_destroy(struct mwDirectory *dir); int mwDirectory_destroy(struct mwDirectory *dir);
#ifdef _cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _MW_SRVC_DIR_H */ #endif /* _MW_SRVC_DIR_H */
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 mw_srvc_ft.h   mw_srvc_ft.h 
skipping to change at line 32 skipping to change at line 32
#define _MW_SRVC_FT_H #define _MW_SRVC_FT_H
/** @file mw_srvc_ft.h /** @file mw_srvc_ft.h
A file transfer is a simple way to get large chunks of binary data A file transfer is a simple way to get large chunks of binary data
from one client to another. from one client to another.
*/ */
#include "mw_common.h" #include "mw_common.h"
#ifdef _cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** @struct mwServiceFileTransfer /** @struct mwServiceFileTransfer
File transfer service File transfer service
*/ */
struct mwServiceFileTransfer; struct mwServiceFileTransfer;
/** @struct mwFileTransfer /** @struct mwFileTransfer
A single file trasfer session A single file trasfer session
skipping to change at line 209 skipping to change at line 209
*/ */
int mwFileTransfer_ack(struct mwFileTransfer *ft); int mwFileTransfer_ack(struct mwFileTransfer *ft);
void mwFileTransfer_setClientData(struct mwFileTransfer *ft, void mwFileTransfer_setClientData(struct mwFileTransfer *ft,
gpointer data, GDestroyNotify clean); gpointer data, GDestroyNotify clean);
gpointer mwFileTransfer_getClientData(struct mwFileTransfer *ft); gpointer mwFileTransfer_getClientData(struct mwFileTransfer *ft);
void mwFileTransfer_removeClientData(struct mwFileTransfer *ft); void mwFileTransfer_removeClientData(struct mwFileTransfer *ft);
#ifdef _cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _MW_SRVC_FT_H */ #endif /* _MW_SRVC_FT_H */
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 mw_srvc_im.h   mw_srvc_im.h 
skipping to change at line 37 skipping to change at line 37
users. Messages sent over conversations may relay different types users. Messages sent over conversations may relay different types
of information, in a variety of formats. The basic feature-set of information, in a variety of formats. The basic feature-set
provides plain-text chat with typing notification. More complex provides plain-text chat with typing notification. More complex
features may be negotiated transparently by setting the IM Client features may be negotiated transparently by setting the IM Client
Type for a conversation, or for the service as a whole. Type for a conversation, or for the service as a whole.
*/ */
#include <glib.h> #include <glib.h>
#include "mw_common.h" #include "mw_common.h"
#ifdef _cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/* identifier for the IM service */ /* identifier for the IM service */
#define mwService_IM 0x00001000 #define mwService_IM 0x00001000
/** @struct mwServiceIm /** @struct mwServiceIm
An instance of the IM service. This service provides simple An instance of the IM service. This service provides simple
instant messaging functionality */ instant messaging functionality */
skipping to change at line 235 skipping to change at line 235
@see mwConversation_setClientData @see mwConversation_setClientData
@see mwConversation_getClientData @see mwConversation_getClientData
*/ */
void mwConversation_removeClientData(struct mwConversation *conv); void mwConversation_removeClientData(struct mwConversation *conv);
/** close and destroy the conversation and its backing channel, and /** close and destroy the conversation and its backing channel, and
call the optional client data cleanup function */ call the optional client data cleanup function */
void mwConversation_free(struct mwConversation *conv); void mwConversation_free(struct mwConversation *conv);
#ifdef _cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _MW_SRVC_IM_H */ #endif /* _MW_SRVC_IM_H */
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 mw_srvc_place.h   mw_srvc_place.h 
skipping to change at line 27 skipping to change at line 27
License along with this library; if not, write to the Free License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef _MW_SRVC_PLACE_H #ifndef _MW_SRVC_PLACE_H
#define _MW_SRVC_PLACE_H #define _MW_SRVC_PLACE_H
#include <glib/glist.h> #include <glib/glist.h>
#include "mw_common.h" #include "mw_common.h"
#ifdef _cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** Type identifier for the place service */ /** Type identifier for the place service */
#define mwService_PLACE 0x80000022 #define mwService_PLACE 0x80000022
/** @struct mwServicePlace */ /** @struct mwServicePlace */
struct mwServicePlace; struct mwServicePlace;
/** @struct mwPlace */ /** @struct mwPlace */
skipping to change at line 117 skipping to change at line 117
int mwPlace_unsetAttribute(struct mwPlace *place, guint32 attrib); int mwPlace_unsetAttribute(struct mwPlace *place, guint32 attrib);
void mwPlace_setClientData(struct mwPlace *place, void mwPlace_setClientData(struct mwPlace *place,
gpointer data, GDestroyNotify clean); gpointer data, GDestroyNotify clean);
gpointer mwPlace_getClientData(struct mwPlace *place); gpointer mwPlace_getClientData(struct mwPlace *place);
void mwPlace_removeClientData(struct mwPlace *place); void mwPlace_removeClientData(struct mwPlace *place);
#ifdef _cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _MW_SRVC_PLACE_H */ #endif /* _MW_SRVC_PLACE_H */
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 mw_srvc_resolve.h   mw_srvc_resolve.h 
skipping to change at line 27 skipping to change at line 27
License along with this library; if not, write to the Free License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef _MW_SRVC_RESOLVE_H #ifndef _MW_SRVC_RESOLVE_H
#define _MW_SRVC_RESOLVE_H #define _MW_SRVC_RESOLVE_H
#include <glib.h> #include <glib.h>
#include <glib/glist.h> #include <glib/glist.h>
#ifdef _cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** Type identifier for the conference service */ /** Type identifier for the conference service */
#define mwService_RESOLVE 0x00000015 #define mwService_RESOLVE 0x00000015
/** Return value of mwServiceResolve_search indicating an error */ /** Return value of mwServiceResolve_search indicating an error */
#define SEARCH_ERROR 0x00 #define SEARCH_ERROR 0x00
/** @struct mwServiceResolve /** @struct mwServiceResolve
skipping to change at line 130 skipping to change at line 130
guint32 mwServiceResolve_resolve(struct mwServiceResolve *srvc, guint32 mwServiceResolve_resolve(struct mwServiceResolve *srvc,
GList *queries, enum mwResolveFlag flags, GList *queries, enum mwResolveFlag flags,
mwResolveHandler handler, mwResolveHandler handler,
gpointer data, GDestroyNotify cleanup); gpointer data, GDestroyNotify cleanup);
/** Cancel a resolve request by its generated ID. The handler function /** Cancel a resolve request by its generated ID. The handler function
will not be called, and the optional cleanup function will be will not be called, and the optional cleanup function will be
called upon the optional user data for the request */ called upon the optional user data for the request */
void mwServiceResolve_cancelResolve(struct mwServiceResolve *, guint32); void mwServiceResolve_cancelResolve(struct mwServiceResolve *, guint32);
#ifdef _cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _MW_SRVC_RESOLVE_H */ #endif /* _MW_SRVC_RESOLVE_H */
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 mw_srvc_store.h   mw_srvc_store.h 
skipping to change at line 27 skipping to change at line 27
License along with this library; if not, write to the Free License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef _MW_SRVC_STORE_H #ifndef _MW_SRVC_STORE_H
#define _MW_SRVC_STORE_H #define _MW_SRVC_STORE_H
#include <glib.h> #include <glib.h>
#include "mw_common.h" #include "mw_common.h"
#ifdef _cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** Type identifier for the storage service */ /** Type identifier for the storage service */
#define mwService_STORAGE 0x00000018 #define mwService_STORAGE 0x00000018
/** @struct mwServiceStorage /** @struct mwServiceStorage
@see mwServiceStorage_new @see mwServiceStorage_new
Instance of the storage service */ Instance of the storage service */
skipping to change at line 167 skipping to change at line 167
@param item storage unit to save @param item storage unit to save
@param cb callback function when the load call completes @param cb callback function when the load call completes
@param data optional user data for callback @param data optional user data for callback
@param data_free optional cleanup function for user data @param data_free optional cleanup function for user data
*/ */
void mwServiceStorage_save(struct mwServiceStorage *srvc, void mwServiceStorage_save(struct mwServiceStorage *srvc,
struct mwStorageUnit *item, struct mwStorageUnit *item,
mwStorageCallback cb, mwStorageCallback cb,
gpointer data, GDestroyNotify data_free); gpointer data, GDestroyNotify data_free);
#ifdef _cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _MW_SRVC_STORE_H */ #endif /* _MW_SRVC_STORE_H */
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 mw_st_list.h   mw_st_list.h 
skipping to change at line 34 skipping to change at line 34
/** @file mw_st_list.h /** @file mw_st_list.h
Parse and compose buddy lists in the format commonly used by Sametime Parse and compose buddy lists in the format commonly used by Sametime
Connect clients. Connect clients.
*/ */
#include <glib.h> #include <glib.h>
#include <glib/glist.h> #include <glib/glist.h>
#include "mw_common.h" #include "mw_common.h"
#ifdef _cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#define ST_LIST_MAJOR 3 #define ST_LIST_MAJOR 3
#define ST_LIST_MINOR 1 #define ST_LIST_MINOR 1
#define ST_LIST_MICRO 3 #define ST_LIST_MICRO 3
enum mwSametimeGroupType { enum mwSametimeGroupType {
mwSametimeGroup_NORMAL = 1, /**< a normal group of users */ mwSametimeGroup_NORMAL = 1, /**< a normal group of users */
mwSametimeGroup_DYNAMIC = 2, /**< a server-side group */ mwSametimeGroup_DYNAMIC = 2, /**< a server-side group */
skipping to change at line 167 skipping to change at line 167
const char *mwSametimeUser_getCommunity(struct mwSametimeUser *u); const char *mwSametimeUser_getCommunity(struct mwSametimeUser *u);
void mwSametimeUser_setShortName(struct mwSametimeUser *u, const char *name ); void mwSametimeUser_setShortName(struct mwSametimeUser *u, const char *name );
const char *mwSametimeUser_getShortName(struct mwSametimeUser *u); const char *mwSametimeUser_getShortName(struct mwSametimeUser *u);
void mwSametimeUser_setAlias(struct mwSametimeUser *u, const char *alias); void mwSametimeUser_setAlias(struct mwSametimeUser *u, const char *alias);
const char *mwSametimeUser_getAlias(struct mwSametimeUser *u); const char *mwSametimeUser_getAlias(struct mwSametimeUser *u);
#ifdef _cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _MW_ST_LIST_H */ #endif /* _MW_ST_LIST_H */
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 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/