changeset
Renamed PurpleConversationMessageFlags back to PurpleMessageFlags.
Sun, 23 Jun 2013 14:24:19 +0530
- author
- Ankit Vani <a@nevitus.org>
- date
- Sun, 23 Jun 2013 14:24:19 +0530
- branch
- soc.2013.gobjectification
- changeset 34620
- e49aa67344e1
- parent 34619
- b8d8c1516d74
- child 34621
- 66308be62d23
Renamed PurpleConversationMessageFlags back to PurpleMessageFlags.
The name was too long and it can be used more generically than for PurpleConversationMessage.
--- a/libpurple/conversation.c Sun Jun 23 13:35:53 2013 +0530 +++ b/libpurple/conversation.c Sun Jun 23 14:24:19 2013 +0530 @@ -71,7 +71,7 @@ { char *who; char *what; - PurpleConversationMessageFlags flags; + PurpleMessageFlags flags; time_t when; PurpleConversation *conv; char *alias; @@ -165,7 +165,7 @@ } static void -common_send(PurpleConversation *conv, const char *message, PurpleConversationMessageFlags msgflags) +common_send(PurpleConversation *conv, const char *message, PurpleMessageFlags msgflags) { PurpleConversationType type; PurpleAccount *account; @@ -186,20 +186,20 @@ /* Always linkfy the text for display, unless we're * explicitly asked to do otheriwse*/ - if (!(msgflags & PURPLE_CONVERSATION_MESSAGE_INVISIBLE)) { - if(msgflags & PURPLE_CONVERSATION_MESSAGE_NO_LINKIFY) + if (!(msgflags & PURPLE_MESSAGE_INVISIBLE)) { + if(msgflags & PURPLE_MESSAGE_NO_LINKIFY) displayed = g_strdup(message); else displayed = purple_markup_linkify(message); } if (displayed && (conv->features & PURPLE_CONNECTION_HTML) && - !(msgflags & PURPLE_CONVERSATION_MESSAGE_RAW)) { + !(msgflags & PURPLE_MESSAGE_RAW)) { sent = g_strdup(displayed); } else sent = g_strdup(message); - msgflags |= PURPLE_CONVERSATION_MESSAGE_SEND; + msgflags |= PURPLE_MESSAGE_SEND; if (type == PURPLE_CONVERSATION_TYPE_IM) { PurpleIMConversationPrivate *priv = PURPLE_IM_CONVERSATION_GET_PRIVATE(conv); @@ -281,14 +281,14 @@ static void add_message_to_history(PurpleConversation *conv, const char *who, const char *alias, - const char *message, PurpleConversationMessageFlags flags, time_t when) + const char *message, PurpleMessageFlags flags, time_t when) { PurpleConversationMessage *msg; PurpleConnection *gc; gc = purple_account_get_connection(conv->account); - if (flags & PURPLE_CONVERSATION_MESSAGE_SEND) { + if (flags & PURPLE_MESSAGE_SEND) { const char *me = NULL; if (gc) me = purple_connection_get_display_name(gc); @@ -867,7 +867,7 @@ void purple_conversation_write(PurpleConversation *conv, const char *who, - const char *message, PurpleConversationMessageFlags flags, + const char *message, PurpleMessageFlags flags, time_t mtime) { PurplePluginProtocolInfo *prpl_info = NULL; @@ -926,7 +926,7 @@ if (purple_conversation_get_type(conv) == PURPLE_CONVERSATION_TYPE_IM || !(prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME)) { - if (flags & PURPLE_CONVERSATION_MESSAGE_SEND) { + if (flags & PURPLE_MESSAGE_SEND) { b = purple_find_buddy(account, purple_account_get_username(account)); @@ -949,7 +949,7 @@ } } - if (!(flags & PURPLE_CONVERSATION_MESSAGE_NO_LOG) && purple_conversation_is_logging(conv)) { + if (!(flags & PURPLE_MESSAGE_NO_LOG) && purple_conversation_is_logging(conv)) { GList *log; if (conv->logs == NULL) @@ -1015,7 +1015,7 @@ conv = purple_conversations_find_with_account(PURPLE_CONVERSATION_TYPE_ANY, who, account); if (conv != NULL) - purple_conversation_write(conv, NULL, what, PURPLE_CONVERSATION_MESSAGE_ERROR, time(NULL)); + purple_conversation_write(conv, NULL, what, PURPLE_MESSAGE_ERROR, time(NULL)); else return FALSE; @@ -1244,7 +1244,7 @@ return msg->what; } -PurpleConversationMessageFlags purple_conversation_message_get_flags(const PurpleConversationMessage *msg) +PurpleMessageFlags purple_conversation_message_get_flags(const PurpleConversationMessage *msg) { g_return_val_if_fail(msg, 0); return msg->flags;
--- a/libpurple/conversation.h Sun Jun 23 13:35:53 2013 +0530 +++ b/libpurple/conversation.h Sun Jun 23 14:24:19 2013 +0530 @@ -82,34 +82,33 @@ */ typedef enum /*< flags >*/ { - PURPLE_CONVERSATION_MESSAGE_SEND = 0x0001, /**< Outgoing message. */ - PURPLE_CONVERSATION_MESSAGE_RECV = 0x0002, /**< Incoming message. */ - PURPLE_CONVERSATION_MESSAGE_SYSTEM = 0x0004, /**< System message. */ - PURPLE_CONVERSATION_MESSAGE_AUTO_RESP = 0x0008, /**< Auto response. */ - PURPLE_CONVERSATION_MESSAGE_ACTIVE_ONLY = 0x0010, /**< Hint to the UI that this + PURPLE_MESSAGE_SEND = 0x0001, /**< Outgoing message. */ + PURPLE_MESSAGE_RECV = 0x0002, /**< Incoming message. */ + PURPLE_MESSAGE_SYSTEM = 0x0004, /**< System message. */ + PURPLE_MESSAGE_AUTO_RESP = 0x0008, /**< Auto response. */ + PURPLE_MESSAGE_ACTIVE_ONLY = 0x0010, /**< Hint to the UI that this message should not be shown in conversations which are only open for internal UI purposes (e.g. for contact-aware conversations). */ - PURPLE_CONVERSATION_MESSAGE_NICK = 0x0020, /**< Contains your nick. */ - PURPLE_CONVERSATION_MESSAGE_NO_LOG = 0x0040, /**< Do not log. */ - PURPLE_CONVERSATION_MESSAGE_WHISPER = 0x0080, /**< Whispered message. */ - PURPLE_CONVERSATION_MESSAGE_ERROR = 0x0200, /**< Error message. */ - PURPLE_CONVERSATION_MESSAGE_DELAYED = 0x0400, /**< Delayed message. */ - PURPLE_CONVERSATION_MESSAGE_RAW = 0x0800, /**< "Raw" message - don't + PURPLE_MESSAGE_NICK = 0x0020, /**< Contains your nick. */ + PURPLE_MESSAGE_NO_LOG = 0x0040, /**< Do not log. */ + PURPLE_MESSAGE_WHISPER = 0x0080, /**< Whispered message. */ + PURPLE_MESSAGE_ERROR = 0x0200, /**< Error message. */ + PURPLE_MESSAGE_DELAYED = 0x0400, /**< Delayed message. */ + PURPLE_MESSAGE_RAW = 0x0800, /**< "Raw" message - don't apply formatting */ - PURPLE_CONVERSATION_MESSAGE_IMAGES = 0x1000, /**< Message contains images */ - PURPLE_CONVERSATION_MESSAGE_NOTIFY = 0x2000, /**< Message is a notification */ - PURPLE_CONVERSATION_MESSAGE_NO_LINKIFY = 0x4000, /**< Message should not be auto- + PURPLE_MESSAGE_IMAGES = 0x1000, /**< Message contains images */ + PURPLE_MESSAGE_NOTIFY = 0x2000, /**< Message is a notification */ + PURPLE_MESSAGE_NO_LINKIFY = 0x4000, /**< Message should not be auto- linkified */ - PURPLE_CONVERSATION_MESSAGE_INVISIBLE = 0x8000 /**< Message should not be displayed */ -} PurpleConversationMessageFlags; + PURPLE_MESSAGE_INVISIBLE = 0x8000 /**< Message should not be displayed */ +} PurpleMessageFlags; -#include "account.h" -#include "buddyicon.h" -#include "log.h" +#include <glib.h> +#include <glib-object.h> /**************************************************************************/ /** PurpleConversation */ @@ -135,14 +134,14 @@ * @see purple_conversation_write_message() */ void (*write_message)(PurpleConversation *conv, const char *who, - const char *message, PurpleConversationMessageFlags flags, + const char *message, PurpleMessageFlags flags, time_t mtime); /** Sends a message to a chat or IM conversation. TODO * @see purple_conversation_send_message() */ void (*send_message)(PurpleConversation *conv, - const char *message, PurpleConversationMessageFlags flags); + const char *message, PurpleMessageFlags flags); void (*_purple_reserved1)(void); void (*_purple_reserved2)(void); @@ -150,6 +149,10 @@ void (*_purple_reserved4)(void); }; +#include "account.h" +#include "buddyicon.h" +#include "log.h" + /**************************************************************************/ /** PurpleConversationUiOps */ /**************************************************************************/ @@ -173,14 +176,14 @@ * @see purple_chat_conversation_write() */ void (*write_chat)(PurpleConversation *conv, const char *who, - const char *message, PurpleConversationMessageFlags flags, + const char *message, PurpleMessageFlags flags, time_t mtime); /** Write a message to an IM conversation. If this field is @c NULL, * libpurple will fall back to using #write_conv. * @see purple_im_conversation_write() */ void (*write_im)(PurpleConversation *conv, const char *who, - const char *message, PurpleConversationMessageFlags flags, + const char *message, PurpleMessageFlags flags, time_t mtime); /** Write a message to a conversation. This is used rather than the * chat- or im-specific ops for errors, system messages (such as "x is @@ -194,7 +197,7 @@ const char *name, const char *alias, const char *message, - PurpleConversationMessageFlags flags, + PurpleMessageFlags flags, time_t mtime); /** Add @a cbuddies to a chat. @@ -450,7 +453,7 @@ * @see purple_conversation_write_message() */ void purple_conversation_write(PurpleConversation *conv, const char *who, - const char *message, PurpleConversationMessageFlags flags, + const char *message, PurpleMessageFlags flags, time_t mtime); /** TODO pure virtual @@ -464,7 +467,7 @@ */ void purple_conversation_write_message(PurpleConversation *conv, const char *who, const char *message, - PurpleConversationMessageFlags flags, time_t mtime); + PurpleMessageFlags flags, time_t mtime); /** TODO forward to send_message * Sends a message to this conversation. This function calls @@ -480,11 +483,11 @@ * * @param conv The conversation. * @param message The message to send. - * @param flags The PurpleConversationMessageFlags flags to use in addition to - * PURPLE_CONVERSATION_MESSAGE_SEND. + * @param flags The PurpleMessageFlags flags to use in addition to + * PURPLE_MESSAGE_SEND. */ void purple_conversation_send_message(PurpleConversation *conv, const char *message, - PurpleConversationMessageFlags flags); + PurpleMessageFlags flags); /** Set the features as supported for the given conversation. @@ -697,7 +700,7 @@ * * @return The message flags */ -PurpleConversationMessageFlags purple_conversation_message_get_flags(const PurpleConversationMessage *msg); +PurpleMessageFlags purple_conversation_message_get_flags(const PurpleConversationMessage *msg); /** * Get the timestamp of a PurpleConversationMessage
--- a/libpurple/conversationtypes.c Sun Jun 23 13:35:53 2013 +0530 +++ b/libpurple/conversationtypes.c Sun Jun 23 14:24:19 2013 +0530 @@ -260,7 +260,7 @@ void purple_im_conversation_write(PurpleIMConversation *im, const char *who, const char *message, - PurpleConversationMessageFlags flags, time_t mtime) + PurpleMessageFlags flags, time_t mtime) { PurpleConversation *c; @@ -269,7 +269,7 @@ c = purple_im_conversation_get_conversation(im); - if ((flags & PURPLE_CONVERSATION_MESSAGE_RECV) == PURPLE_CONVERSATION_MESSAGE_RECV) { + if ((flags & PURPLE_MESSAGE_RECV) == PURPLE_MESSAGE_RECV) { purple_im_conversation_set_typing_state(im, PURPLE_IM_CONVERSATION_NOT_TYPING); } @@ -287,7 +287,7 @@ } void -purple_im_conversation_send_with_flags(PurpleIMConversation *im, const char *message, PurpleConversationMessageFlags flags) +purple_im_conversation_send_with_flags(PurpleIMConversation *im, const char *message, PurpleMessageFlags flags) { g_return_if_fail(im != NULL); g_return_if_fail(message != NULL); @@ -451,7 +451,7 @@ void purple_chat_conversation_write(PurpleChatConversation *chat, const char *who, const char *message, - PurpleConversationMessageFlags flags, time_t mtime) + PurpleMessageFlags flags, time_t mtime) { PurpleAccount *account; PurpleConversation *conv; @@ -469,18 +469,18 @@ if (purple_chat_conversation_is_ignored_user(chat, who)) return; - if (!(flags & PURPLE_CONVERSATION_MESSAGE_WHISPER)) { + if (!(flags & PURPLE_MESSAGE_WHISPER)) { const char *str; str = purple_normalize(account, who); if (purple_strequal(str, chat->nick)) { - flags |= PURPLE_CONVERSATION_MESSAGE_SEND; + flags |= PURPLE_MESSAGE_SEND; } else { - flags |= PURPLE_CONVERSATION_MESSAGE_RECV; + flags |= PURPLE_MESSAGE_RECV; if (purple_utf8_has_word(message, chat->nick)) - flags |= PURPLE_CONVERSATION_MESSAGE_NICK; + flags |= PURPLE_MESSAGE_NICK; } } @@ -498,7 +498,7 @@ } void -purple_chat_conversation_send_with_flags(PurpleChatConversation *chat, const char *message, PurpleConversationMessageFlags flags) +purple_chat_conversation_send_with_flags(PurpleChatConversation *chat, const char *message, PurpleMessageFlags flags) { g_return_if_fail(chat != NULL); g_return_if_fail(message != NULL); @@ -599,7 +599,7 @@ g_free(alias_esc); purple_conversation_write(conv, NULL, tmp, - PURPLE_CONVERSATION_MESSAGE_SYSTEM | PURPLE_CONVERSATION_MESSAGE_NO_LINKIFY, + PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_NO_LINKIFY, time(NULL)); g_free(tmp); } @@ -729,7 +729,7 @@ } purple_conversation_write(conv, NULL, tmp, - PURPLE_CONVERSATION_MESSAGE_SYSTEM | PURPLE_CONVERSATION_MESSAGE_NO_LINKIFY, + PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_NO_LINKIFY, time(NULL)); } } @@ -808,7 +808,7 @@ g_free(alias_esc); purple_conversation_write(conv, NULL, tmp, - PURPLE_CONVERSATION_MESSAGE_SYSTEM | PURPLE_CONVERSATION_MESSAGE_NO_LINKIFY, + PURPLE_MESSAGE_SYSTEM | PURPLE_MESSAGE_NO_LINKIFY, time(NULL)); g_free(tmp); }
--- a/libpurple/conversationtypes.h Sun Jun 23 13:35:53 2013 +0530 +++ b/libpurple/conversationtypes.h Sun Jun 23 14:24:19 2013 +0530 @@ -346,7 +346,7 @@ * @param mtime The time the message was sent. */ /*void purple_im_conversation_write(PurpleIMConversation *im, const char *who, - const char *message, PurpleConversationMessageFlags flags, + const char *message, PurpleMessageFlags flags, time_t mtime);*/ /** TODO write forward @@ -362,11 +362,11 @@ * * @param im The IM. * @param message The message to send. - * @param flags The PurpleConversationMessageFlags flags to use in addition to - * PURPLE_CONVERSATION_MESSAGE_SEND. + * @param flags The PurpleMessageFlags flags to use in addition to + * PURPLE_MESSAGE_SEND. */ /*void purple_im_conversation_send_with_flags(PurpleIMConversation *im, - const char *message, PurpleConversationMessageFlags flags);*/ + const char *message, PurpleMessageFlags flags);*/ /*@}*/ @@ -511,7 +511,7 @@ * @param mtime The time the message was sent. */ /*void purple_chat_conversation_write(PurpleChatConversation *chat, const char *who, - const char *message, PurpleConversationMessageFlags flags, + const char *message, PurpleMessageFlags flags, time_t mtime);*/ /** TODO write forward @@ -527,10 +527,10 @@ * * @param chat The chat. * @param message The message to send. - * @param flags The PurpleConversationMessageFlags flags to use. + * @param flags The PurpleMessageFlags flags to use. */ /*void purple_chat_conversation_send_with_flags(PurpleChatConversation *chat, - const char *message, PurpleConversationMessageFlags flags);*/ + const char *message, PurpleMessageFlags flags);*/ /** * Adds a user to a chat.
--- a/libpurple/log.h Sun Jun 23 13:35:53 2013 +0530 +++ b/libpurple/log.h Sun Jun 23 14:24:19 2013 +0530 @@ -70,7 +70,7 @@ /** This is used to write to the log file */ gsize (*write)(PurpleLog *log, - PurpleConversationMessageFlags type, + PurpleMessageFlags type, const char *from, time_t time, const char *message); @@ -222,7 +222,7 @@ * @param message The message to log */ void purple_log_write(PurpleLog *log, - PurpleConversationMessageFlags type, + PurpleMessageFlags type, const char *from, time_t time, const char *message);
--- a/libpurple/plugins/perl/common/Conversation.xs Sun Jun 23 13:35:53 2013 +0530 +++ b/libpurple/plugins/perl/common/Conversation.xs Sun Jun 23 14:24:19 2013 +0530 @@ -7,7 +7,7 @@ { HV *update_stash = gv_stashpv("Purple::Conversation::UpdateType", 1); HV *typing_stash = gv_stashpv("Purple::IMConversation::TypingState", 1); - HV *flags_stash = gv_stashpv("Purple::Conversation::MessageFlags", 1); + HV *flags_stash = gv_stashpv("Purple::MessageFlags", 1); HV *cbflags_stash = gv_stashpv("Purple::ChatConversation::Buddy::Flags", 1); static const constiv *civ, update_const_iv[] = { @@ -39,7 +39,7 @@ }; static const constiv flags_const_iv[] = { #undef const_iv -#define const_iv(name) {#name, (IV)PURPLE_CONVERSATION_MESSAGE_##name} +#define const_iv(name) {#name, (IV)PURPLE_MESSAGE_##name} const_iv(SEND), const_iv(RECV), const_iv(SYSTEM), @@ -85,7 +85,7 @@ Purple::Handle purple_conversations_get_handle() -Purple::ChatConversation +Purple::Conversation purple_conversations_find_chat(gc, id) Purple::Connection gc int id @@ -122,12 +122,12 @@ const char *name Purple::Account account -Purple::ChatConversation +Purple::Conversation purple_conversations_find_chat_with_account(name, account) const char *name Purple::Account account -Purple::IMConversation +Purple::Conversation purple_conversations_find_im_with_account(name, account) const char *name Purple::Account account @@ -202,7 +202,7 @@ Purple::Conversation conv const char *who const char *message - Purple::Conversation::MessageFlags flags + Purple::MessageFlags flags time_t mtime void @@ -210,7 +210,7 @@ Purple::Conversation conv const char *who const char *message - Purple::Conversation::MessageFlags flags + Purple::MessageFlags flags time_t mtime void @@ -222,7 +222,7 @@ purple_conversation_send_message(conv, message, flags) Purple::Conversation conv const char *message - Purple::Conversation::MessageFlags flags + Purple::MessageFlags flags gboolean purple_conversation_do_command(conv, cmdline, markup, error)
--- a/libpurple/plugins/perl/common/Server.xs Sun Jun 23 13:35:53 2013 +0530 +++ b/libpurple/plugins/perl/common/Server.xs Sun Jun 23 14:24:19 2013 +0530 @@ -35,7 +35,7 @@ Purple::Connection con int a const char * b - Purple::Conversation::MessageFlags flags + Purple::MessageFlags flags void serv_chat_whisper(con, a, b, c) @@ -60,7 +60,7 @@ Purple::Connection g int id const char *who - Purple::Conversation::MessageFlags chatflags + Purple::MessageFlags chatflags const char *message time_t mtime @@ -101,7 +101,7 @@ Purple::Connection gc const char *who const char *msg - Purple::Conversation::MessageFlags imflags + Purple::MessageFlags imflags time_t mtime Purple::Conversation @@ -197,7 +197,7 @@ Purple::Connection con const char * a const char * b - Purple::Conversation::MessageFlags flags + Purple::MessageFlags flags int serv_send_typing(con, a, state)
--- a/libpurple/plugins/perl/common/module.h Sun Jun 23 13:35:53 2013 +0530 +++ b/libpurple/plugins/perl/common/module.h Sun Jun 23 14:24:19 2013 +0530 @@ -120,14 +120,14 @@ typedef PurpleConnectionState Purple__ConnectionState; /* conversations.h */ +typedef PurpleMessageFlags Purple__MessageFlags; +typedef PurpleConversation * Purple__Conversation; typedef PurpleConversationUpdateType Purple__Conversation__UpdateType; +typedef PurpleIMConversation * Purple__IMConversation; typedef PurpleIMConversationTypingState Purple__IMConversation__TypingState; -typedef PurpleConversationMessageFlags Purple__Conversation__MessageFlags; -typedef PurpleChatConversationBuddyFlags Purple__ChatConversation__Buddy__Flags; -typedef PurpleConversation * Purple__Conversation; -typedef PurpleIMConversation * Purple__IMConversation; typedef PurpleChatConversation * Purple__ChatConversation; typedef PurpleChatConversationBuddy * Purple__ChatConversation__Buddy; +typedef PurpleChatConversationBuddyFlags Purple__ChatConversation__Buddy__Flags; /* core.h */
--- a/libpurple/plugins/perl/common/typemap Sun Jun 23 13:35:53 2013 +0530 +++ b/libpurple/plugins/perl/common/typemap Sun Jun 23 14:24:19 2013 +0530 @@ -182,7 +182,7 @@ Purple::IMConversation T_PurpleObj Purple::ChatConversation::Buddy::Flags T_IV Purple::Conversation::UpdateType T_IV -Purple::Conversation::MessageFlags T_IV +Purple::MessageFlags T_IV Purple::IMConversation::TypingState T_IV Purple::UnseenState T_IV
--- a/libpurple/plugins/tcl/tcl_cmds.c Sun Jun 23 13:35:53 2013 +0530 +++ b/libpurple/plugins/tcl/tcl_cmds.c Sun Jun 23 14:24:19 2013 +0530 @@ -870,13 +870,13 @@ switch (style) { case CMD_CONV_WRITE_SEND: - flags = PURPLE_CONVERSATION_MESSAGE_SEND; + flags = PURPLE_MESSAGE_SEND; break; case CMD_CONV_WRITE_RECV: - flags = PURPLE_CONVERSATION_MESSAGE_RECV; + flags = PURPLE_MESSAGE_RECV; break; case CMD_CONV_WRITE_SYSTEM: - flags = PURPLE_CONVERSATION_MESSAGE_SYSTEM; + flags = PURPLE_MESSAGE_SYSTEM; break; } purple_conversation_write_message(convo, from, what, flags, time(NULL));
--- a/libpurple/prpl.h Sun Jun 23 13:35:53 2013 +0530 +++ b/libpurple/prpl.h Sun Jun 23 14:24:19 2013 +0530 @@ -327,7 +327,7 @@ */ int (*send_im)(PurpleConnection *, const char *who, const char *message, - PurpleConversationMessageFlags flags); + PurpleMessageFlags flags); void (*set_info)(PurpleConnection *, const char *info); @@ -438,12 +438,12 @@ * * @param id The id of the chat to send the message to. * @param message The message to send to the chat. - * @param flags A bitwise OR of #PurpleConversationMessageFlags representing + * @param flags A bitwise OR of #PurpleMessageFlags representing * message flags. * @return A positive number or 0 in case of success, * a negative error number in case of failure. */ - int (*chat_send)(PurpleConnection *, int id, const char *message, PurpleConversationMessageFlags flags); + int (*chat_send)(PurpleConnection *, int id, const char *message, PurpleMessageFlags flags); /** If implemented, this will be called regularly for this prpl's * active connections. You'd want to do this if you need to repeatedly
--- a/libpurple/server.h Sun Jun 23 13:35:53 2013 +0530 +++ b/libpurple/server.h Sun Jun 23 14:24:19 2013 +0530 @@ -51,7 +51,7 @@ unsigned int serv_send_typing(PurpleConnection *gc, const char *name, PurpleIMConversationTypingState state); void serv_move_buddy(PurpleBuddy *, PurpleGroup *, PurpleGroup *); -int serv_send_im(PurpleConnection *, const char *, const char *, PurpleConversationMessageFlags flags); +int serv_send_im(PurpleConnection *, const char *, const char *, PurpleMessageFlags flags); /** Get information about an account's attention commands, from the prpl. * @@ -70,7 +70,7 @@ void serv_chat_invite(PurpleConnection *, int, const char *, const char *); void serv_chat_leave(PurpleConnection *, int); void serv_chat_whisper(PurpleConnection *, int, const char *, const char *); -int serv_chat_send(PurpleConnection *, int, const char *, PurpleConversationMessageFlags flags); +int serv_chat_send(PurpleConnection *, int, const char *, PurpleMessageFlags flags); void serv_alias_buddy(PurpleBuddy *); void serv_got_alias(PurpleConnection *gc, const char *who, const char *alias); @@ -111,7 +111,7 @@ void serv_got_typing_stopped(PurpleConnection *gc, const char *name); void serv_got_im(PurpleConnection *gc, const char *who, const char *msg, - PurpleConversationMessageFlags flags, time_t mtime); + PurpleMessageFlags flags, time_t mtime); /** * @param data The hash function should be g_str_hash() and the equal @@ -180,7 +180,7 @@ * @param mtime The time when the message was received. */ void serv_got_chat_in(PurpleConnection *g, int id, const char *who, - PurpleConversationMessageFlags flags, const char *message, time_t mtime); + PurpleMessageFlags flags, const char *message, time_t mtime); void serv_send_file(PurpleConnection *gc, const char *who, const char *file); G_END_DECLS
