Mercurial > pidgin.yaz
diff libpurple/conversation.c @ 15823:32c366eeeb99
sed -ie 's/gaim/purple/g'
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Mon, 19 Mar 2007 07:01:17 +0000 |
| parents | 5fe8042783c1 |
| children | c9b4ff420140 4999bbc52881 be098f796b32 |
line wrap: on
line diff
--- a/libpurple/conversation.c Mon Mar 19 06:11:46 2007 +0000 +++ b/libpurple/conversation.c Mon Mar 19 07:01:17 2007 +0000 @@ -1,7 +1,7 @@ /* - * gaim + * purple * - * Gaim is the legal property of its developers, whose names are too numerous + * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this * source distribution. * @@ -37,10 +37,10 @@ static GList *conversations = NULL; static GList *ims = NULL; static GList *chats = NULL; -static GaimConversationUiOps *default_ops = NULL; +static PurpleConversationUiOps *default_ops = NULL; void -gaim_conversations_set_ui_ops(GaimConversationUiOps *ops) +purple_conversations_set_ui_ops(PurpleConversationUiOps *ops) { default_ops = ops; } @@ -48,14 +48,14 @@ static gboolean reset_typing_cb(gpointer data) { - GaimConversation *c = (GaimConversation *)data; - GaimConvIm *im; - - im = GAIM_CONV_IM(c); - - gaim_conv_im_set_typing_state(im, GAIM_NOT_TYPING); - gaim_conv_im_update_typing(im); - gaim_conv_im_stop_typing_timeout(im); + PurpleConversation *c = (PurpleConversation *)data; + PurpleConvIm *im; + + im = PURPLE_CONV_IM(c); + + purple_conv_im_set_typing_state(im, PURPLE_NOT_TYPING); + purple_conv_im_update_typing(im); + purple_conv_im_stop_typing_timeout(im); return FALSE; } @@ -63,95 +63,95 @@ static gboolean send_typed_cb(gpointer data) { - GaimConversation *conv = (GaimConversation *)data; - GaimConnection *gc; + PurpleConversation *conv = (PurpleConversation *)data; + PurpleConnection *gc; const char *name; g_return_val_if_fail(conv != NULL, FALSE); - gc = gaim_conversation_get_gc(conv); - name = gaim_conversation_get_name(conv); + gc = purple_conversation_get_gc(conv); + name = purple_conversation_get_name(conv); if (gc != NULL && name != NULL) { - /* We set this to 1 so that GAIM_TYPING will be sent - * if the Gaim user types anything else. + /* We set this to 1 so that PURPLE_TYPING will be sent + * if the Purple user types anything else. */ - gaim_conv_im_set_type_again(GAIM_CONV_IM(conv), 1); - - serv_send_typing(gc, name, GAIM_TYPED); - gaim_signal_emit(gaim_conversations_get_handle(), + purple_conv_im_set_type_again(PURPLE_CONV_IM(conv), 1); + + serv_send_typing(gc, name, PURPLE_TYPED); + purple_signal_emit(purple_conversations_get_handle(), "buddy-typed", conv->account, conv->name); - gaim_debug(GAIM_DEBUG_MISC, "conversation", "typed...\n"); + purple_debug(PURPLE_DEBUG_MISC, "conversation", "typed...\n"); } return FALSE; } static void -common_send(GaimConversation *conv, const char *message, GaimMessageFlags msgflags) +common_send(PurpleConversation *conv, const char *message, PurpleMessageFlags msgflags) { - GaimConversationType type; - GaimAccount *account; - GaimConnection *gc; + PurpleConversationType type; + PurpleAccount *account; + PurpleConnection *gc; char *displayed = NULL, *sent = NULL; int err = 0; if (strlen(message) == 0) return; - account = gaim_conversation_get_account(conv); - gc = gaim_conversation_get_gc(conv); + account = purple_conversation_get_account(conv); + gc = purple_conversation_get_gc(conv); g_return_if_fail(account != NULL); g_return_if_fail(gc != NULL); - type = gaim_conversation_get_type(conv); + type = purple_conversation_get_type(conv); /* Always linkfy the text for display */ - displayed = gaim_markup_linkify(message); - - if ((conv->features & GAIM_CONNECTION_HTML) && - !(msgflags & GAIM_MESSAGE_RAW)) + displayed = purple_markup_linkify(message); + + if ((conv->features & PURPLE_CONNECTION_HTML) && + !(msgflags & PURPLE_MESSAGE_RAW)) { sent = g_strdup(displayed); } else sent = g_strdup(message); - msgflags |= GAIM_MESSAGE_SEND; - - if (type == GAIM_CONV_TYPE_IM) { - GaimConvIm *im = GAIM_CONV_IM(conv); - - gaim_signal_emit(gaim_conversations_get_handle(), "sending-im-msg", + msgflags |= PURPLE_MESSAGE_SEND; + + if (type == PURPLE_CONV_TYPE_IM) { + PurpleConvIm *im = PURPLE_CONV_IM(conv); + + purple_signal_emit(purple_conversations_get_handle(), "sending-im-msg", account, - gaim_conversation_get_name(conv), &sent); + purple_conversation_get_name(conv), &sent); if (sent != NULL && sent[0] != '\0') { - err = serv_send_im(gc, gaim_conversation_get_name(conv), + err = serv_send_im(gc, purple_conversation_get_name(conv), sent, msgflags); if ((err > 0) && (displayed != NULL)) - gaim_conv_im_write(im, NULL, displayed, msgflags, time(NULL)); - - gaim_signal_emit(gaim_conversations_get_handle(), "sent-im-msg", + purple_conv_im_write(im, NULL, displayed, msgflags, time(NULL)); + + purple_signal_emit(purple_conversations_get_handle(), "sent-im-msg", account, - gaim_conversation_get_name(conv), sent); + purple_conversation_get_name(conv), sent); } } else { - gaim_signal_emit(gaim_conversations_get_handle(), "sending-chat-msg", + purple_signal_emit(purple_conversations_get_handle(), "sending-chat-msg", account, &sent, - gaim_conv_chat_get_id(GAIM_CONV_CHAT(conv))); + purple_conv_chat_get_id(PURPLE_CONV_CHAT(conv))); if (sent != NULL && sent[0] != '\0') { - err = serv_chat_send(gc, gaim_conv_chat_get_id(GAIM_CONV_CHAT(conv)), sent, msgflags); - - gaim_signal_emit(gaim_conversations_get_handle(), "sent-chat-msg", + err = serv_chat_send(gc, purple_conv_chat_get_id(PURPLE_CONV_CHAT(conv)), sent, msgflags); + + purple_signal_emit(purple_conversations_get_handle(), "sent-chat-msg", account, sent, - gaim_conv_chat_get_id(GAIM_CONV_CHAT(conv))); + purple_conv_chat_get_id(PURPLE_CONV_CHAT(conv))); } } @@ -159,27 +159,27 @@ const char *who; const char *msg; - who = gaim_conversation_get_name(conv); + who = purple_conversation_get_name(conv); if (err == -E2BIG) { msg = _("Unable to send message: The message is too large."); - if (!gaim_conv_present_error(who, account, msg)) { + if (!purple_conv_present_error(who, account, msg)) { char *msg2 = g_strdup_printf(_("Unable to send message to %s."), who); - gaim_notify_error(gc, NULL, msg2, _("The message is too large.")); + purple_notify_error(gc, NULL, msg2, _("The message is too large.")); g_free(msg2); } } else if (err == -ENOTCONN) { - gaim_debug(GAIM_DEBUG_ERROR, "conversation", + purple_debug(PURPLE_DEBUG_ERROR, "conversation", "Not yet connected.\n"); } else { msg = _("Unable to send message."); - if (!gaim_conv_present_error(who, account, msg)) { + if (!purple_conv_present_error(who, account, msg)) { char *msg2 = g_strdup_printf(_("Unable to send message to %s."), who); - gaim_notify_error(gc, NULL, msg2, NULL); + purple_notify_error(gc, NULL, msg2, NULL); g_free(msg2); } } @@ -190,10 +190,10 @@ } static void -open_log(GaimConversation *conv) +open_log(PurpleConversation *conv) { - conv->logs = g_list_append(NULL, gaim_log_new(conv->type == GAIM_CONV_TYPE_CHAT ? GAIM_LOG_CHAT : - GAIM_LOG_IM, conv->name, conv->account, + conv->logs = g_list_append(NULL, purple_log_new(conv->type == PURPLE_CONV_TYPE_CHAT ? PURPLE_LOG_CHAT : + PURPLE_LOG_IM, conv->name, conv->account, conv, time(NULL), NULL)); } @@ -202,64 +202,64 @@ * Conversation API **************************************************************************/ static void -gaim_conversation_chat_cleanup_for_rejoin(GaimConversation *conv) +purple_conversation_chat_cleanup_for_rejoin(PurpleConversation *conv) { const char *disp; - GaimAccount *account; - GaimConnection *gc; - - account = gaim_conversation_get_account(conv); - - gaim_conversation_close_logs(conv); + PurpleAccount *account; + PurpleConnection *gc; + + account = purple_conversation_get_account(conv); + + purple_conversation_close_logs(conv); open_log(conv); - gc = gaim_account_get_connection(account); - - if ((disp = gaim_connection_get_display_name(gc)) != NULL) - gaim_conv_chat_set_nick(GAIM_CONV_CHAT(conv), disp); + gc = purple_account_get_connection(account); + + if ((disp = purple_connection_get_display_name(gc)) != NULL) + purple_conv_chat_set_nick(PURPLE_CONV_CHAT(conv), disp); else { - gaim_conv_chat_set_nick(GAIM_CONV_CHAT(conv), - gaim_account_get_username(account)); + purple_conv_chat_set_nick(PURPLE_CONV_CHAT(conv), + purple_account_get_username(account)); } - gaim_conv_chat_clear_users(GAIM_CONV_CHAT(conv)); - gaim_conv_chat_set_topic(GAIM_CONV_CHAT(conv), NULL, NULL); - GAIM_CONV_CHAT(conv)->left = FALSE; - - gaim_conversation_update(conv, GAIM_CONV_UPDATE_CHATLEFT); + purple_conv_chat_clear_users(PURPLE_CONV_CHAT(conv)); + purple_conv_chat_set_topic(PURPLE_CONV_CHAT(conv), NULL, NULL); + PURPLE_CONV_CHAT(conv)->left = FALSE; + + purple_conversation_update(conv, PURPLE_CONV_UPDATE_CHATLEFT); } -GaimConversation * -gaim_conversation_new(GaimConversationType type, GaimAccount *account, +PurpleConversation * +purple_conversation_new(PurpleConversationType type, PurpleAccount *account, const char *name) { - GaimConversation *conv; - GaimConnection *gc; - GaimConversationUiOps *ops; - - g_return_val_if_fail(type != GAIM_CONV_TYPE_UNKNOWN, NULL); + PurpleConversation *conv; + PurpleConnection *gc; + PurpleConversationUiOps *ops; + + g_return_val_if_fail(type != PURPLE_CONV_TYPE_UNKNOWN, NULL); g_return_val_if_fail(account != NULL, NULL); g_return_val_if_fail(name != NULL, NULL); /* Check if this conversation already exists. */ - if ((conv = gaim_find_conversation_with_account(type, name, account)) != NULL) + if ((conv = purple_find_conversation_with_account(type, name, account)) != NULL) { - if (gaim_conversation_get_type(conv) != GAIM_CONV_TYPE_CHAT || - gaim_conv_chat_has_left(GAIM_CONV_CHAT(conv))) + if (purple_conversation_get_type(conv) != PURPLE_CONV_TYPE_CHAT || + purple_conv_chat_has_left(PURPLE_CONV_CHAT(conv))) { - if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT) - gaim_conversation_chat_cleanup_for_rejoin(conv); + if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) + purple_conversation_chat_cleanup_for_rejoin(conv); return conv; } } - gc = gaim_account_get_connection(account); + gc = purple_account_get_connection(account); g_return_val_if_fail(gc != NULL, NULL); - conv = g_new0(GaimConversation, 1); - GAIM_DBUS_REGISTER_POINTER(conv, GaimConversation); + conv = g_new0(PurpleConversation, 1); + PURPLE_DBUS_REGISTER_POINTER(conv, PurpleConversation); conv->type = type; conv->account = account; @@ -270,42 +270,42 @@ /* copy features from the connection. */ conv->features = gc->flags; - if (type == GAIM_CONV_TYPE_IM) + if (type == PURPLE_CONV_TYPE_IM) { - GaimBuddyIcon *icon; - conv->u.im = g_new0(GaimConvIm, 1); + PurpleBuddyIcon *icon; + conv->u.im = g_new0(PurpleConvIm, 1); conv->u.im->conv = conv; - GAIM_DBUS_REGISTER_POINTER(conv->u.im, GaimConvIm); + PURPLE_DBUS_REGISTER_POINTER(conv->u.im, PurpleConvIm); ims = g_list_append(ims, conv); - if ((icon = gaim_buddy_icons_find(account, name))) - gaim_conv_im_set_icon(conv->u.im, icon); - - if (gaim_prefs_get_bool("/core/logging/log_ims")) + if ((icon = purple_buddy_icons_find(account, name))) + purple_conv_im_set_icon(conv->u.im, icon); + + if (purple_prefs_get_bool("/core/logging/log_ims")) { - gaim_conversation_set_logging(conv, TRUE); + purple_conversation_set_logging(conv, TRUE); open_log(conv); } } - else if (type == GAIM_CONV_TYPE_CHAT) + else if (type == PURPLE_CONV_TYPE_CHAT) { const char *disp; - conv->u.chat = g_new0(GaimConvChat, 1); + conv->u.chat = g_new0(PurpleConvChat, 1); conv->u.chat->conv = conv; - GAIM_DBUS_REGISTER_POINTER(conv->u.chat, GaimConvChat); + PURPLE_DBUS_REGISTER_POINTER(conv->u.chat, PurpleConvChat); chats = g_list_append(chats, conv); - if ((disp = gaim_connection_get_display_name(account->gc))) - gaim_conv_chat_set_nick(conv->u.chat, disp); + if ((disp = purple_connection_get_display_name(account->gc))) + purple_conv_chat_set_nick(conv->u.chat, disp); else - gaim_conv_chat_set_nick(conv->u.chat, - gaim_account_get_username(account)); - - if (gaim_prefs_get_bool("/core/logging/log_chats")) + purple_conv_chat_set_nick(conv->u.chat, + purple_account_get_username(account)); + + if (purple_prefs_get_bool("/core/logging/log_chats")) { - gaim_conversation_set_logging(conv, TRUE); + purple_conversation_set_logging(conv, TRUE); open_log(conv); } } @@ -313,7 +313,7 @@ conversations = g_list_append(conversations, conv); /* Auto-set the title. */ - gaim_conversation_autoset_title(conv); + purple_conversation_autoset_title(conv); /* Don't move this.. it needs to be one of the last things done otherwise * it causes mysterious crashes on my system. @@ -323,48 +323,48 @@ if (ops != NULL && ops->create_conversation != NULL) ops->create_conversation(conv); - gaim_signal_emit(gaim_conversations_get_handle(), + purple_signal_emit(purple_conversations_get_handle(), "conversation-created", conv); return conv; } void -gaim_conversation_destroy(GaimConversation *conv) +purple_conversation_destroy(PurpleConversation *conv) { - GaimPluginProtocolInfo *prpl_info = NULL; - GaimConversationUiOps *ops; - GaimConnection *gc; + PurplePluginProtocolInfo *prpl_info = NULL; + PurpleConversationUiOps *ops; + PurpleConnection *gc; const char *name; g_return_if_fail(conv != NULL); - gaim_request_close_with_handle(conv); - - ops = gaim_conversation_get_ui_ops(conv); - gc = gaim_conversation_get_gc(conv); - name = gaim_conversation_get_name(conv); + purple_request_close_with_handle(conv); + + ops = purple_conversation_get_ui_ops(conv); + gc = purple_conversation_get_gc(conv); + name = purple_conversation_get_name(conv); if (gc != NULL) { /* Still connected */ - prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl); - - if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM) + prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl); + + if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) { - if (gaim_prefs_get_bool("/core/conversations/im/send_typing")) - serv_send_typing(gc, name, GAIM_NOT_TYPING); + if (purple_prefs_get_bool("/core/conversations/im/send_typing")) + serv_send_typing(gc, name, PURPLE_NOT_TYPING); if (gc && prpl_info->convo_closed != NULL) prpl_info->convo_closed(gc, name); } - else if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT) + else if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) { - int chat_id = gaim_conv_chat_get_id(GAIM_CONV_CHAT(conv)); + int chat_id = purple_conv_chat_get_id(PURPLE_CONV_CHAT(conv)); #if 0 /* * This is unfortunately necessary, because calling - * serv_chat_leave() calls this gaim_conversation_destroy(), + * serv_chat_leave() calls this purple_conversation_destroy(), * which leads to two calls here.. We can't just return after * this, because then it'll return on the next pass. So, since * serv_got_chat_left(), which is eventually called from the @@ -392,14 +392,14 @@ * internals on it's own time. Don't do this if the prpl already * knows it left the chat. */ - if (!gaim_conv_chat_has_left(GAIM_CONV_CHAT(conv))) + if (!purple_conv_chat_has_left(PURPLE_CONV_CHAT(conv))) serv_chat_leave(gc, chat_id); /* * If they didn't call serv_got_chat_left by now, it's too late. * So we better do it for them before we destroy the thing. */ - if (!gaim_conv_chat_has_left(GAIM_CONV_CHAT(conv))) + if (!purple_conv_chat_has_left(PURPLE_CONV_CHAT(conv))) serv_got_chat_left(gc, chat_id); } } @@ -407,12 +407,12 @@ /* remove from conversations and im/chats lists prior to emit */ conversations = g_list_remove(conversations, conv); - if(conv->type==GAIM_CONV_TYPE_IM) + if(conv->type==PURPLE_CONV_TYPE_IM) ims = g_list_remove(ims, conv); - else if(conv->type==GAIM_CONV_TYPE_CHAT) + else if(conv->type==PURPLE_CONV_TYPE_CHAT) chats = g_list_remove(chats, conv); - gaim_signal_emit(gaim_conversations_get_handle(), + purple_signal_emit(purple_conversations_get_handle(), "deleting-conversation", conv); g_free(conv->name); @@ -421,21 +421,21 @@ conv->name = NULL; conv->title = NULL; - if (conv->type == GAIM_CONV_TYPE_IM) { - gaim_conv_im_stop_typing_timeout(conv->u.im); - gaim_conv_im_stop_send_typed_timeout(conv->u.im); + if (conv->type == PURPLE_CONV_TYPE_IM) { + purple_conv_im_stop_typing_timeout(conv->u.im); + purple_conv_im_stop_send_typed_timeout(conv->u.im); if (conv->u.im->icon != NULL) - gaim_buddy_icon_unref(conv->u.im->icon); + purple_buddy_icon_unref(conv->u.im->icon); conv->u.im->icon = NULL; - GAIM_DBUS_UNREGISTER_POINTER(conv->u.im); + PURPLE_DBUS_UNREGISTER_POINTER(conv->u.im); g_free(conv->u.im); conv->u.im = NULL; } - else if (conv->type == GAIM_CONV_TYPE_CHAT) { - - g_list_foreach(conv->u.chat->in_room, (GFunc)gaim_conv_chat_cb_destroy, NULL); + else if (conv->type == PURPLE_CONV_TYPE_CHAT) { + + g_list_foreach(conv->u.chat->in_room, (GFunc)purple_conv_chat_cb_destroy, NULL); g_list_free(conv->u.chat->in_room); g_list_foreach(conv->u.chat->ignored, (GFunc)g_free, NULL); @@ -452,7 +452,7 @@ g_free(conv->u.chat->nick); - GAIM_DBUS_UNREGISTER_POINTER(conv->u.chat); + PURPLE_DBUS_UNREGISTER_POINTER(conv->u.chat); g_free(conv->u.chat); conv->u.chat = NULL; } @@ -463,56 +463,56 @@ if (ops != NULL && ops->destroy_conversation != NULL) ops->destroy_conversation(conv); - gaim_conversation_close_logs(conv); - - GAIM_DBUS_UNREGISTER_POINTER(conv); + purple_conversation_close_logs(conv); + + PURPLE_DBUS_UNREGISTER_POINTER(conv); g_free(conv); conv = NULL; } void -gaim_conversation_present(GaimConversation *conv) { - GaimConversationUiOps *ops; +purple_conversation_present(PurpleConversation *conv) { + PurpleConversationUiOps *ops; g_return_if_fail(conv != NULL); - ops = gaim_conversation_get_ui_ops(conv); + ops = purple_conversation_get_ui_ops(conv); if(ops && ops->present) ops->present(conv); } void -gaim_conversation_set_features(GaimConversation *conv, GaimConnectionFlags features) +purple_conversation_set_features(PurpleConversation *conv, PurpleConnectionFlags features) { g_return_if_fail(conv != NULL); conv->features = features; - gaim_conversation_update(conv, GAIM_CONV_UPDATE_FEATURES); + purple_conversation_update(conv, PURPLE_CONV_UPDATE_FEATURES); } -GaimConnectionFlags -gaim_conversation_get_features(GaimConversation *conv) +PurpleConnectionFlags +purple_conversation_get_features(PurpleConversation *conv) { g_return_val_if_fail(conv != NULL, 0); return conv->features; } -GaimConversationType -gaim_conversation_get_type(const GaimConversation *conv) +PurpleConversationType +purple_conversation_get_type(const PurpleConversation *conv) { - g_return_val_if_fail(conv != NULL, GAIM_CONV_TYPE_UNKNOWN); + g_return_val_if_fail(conv != NULL, PURPLE_CONV_TYPE_UNKNOWN); return conv->type; } void -gaim_conversation_set_ui_ops(GaimConversation *conv, - GaimConversationUiOps *ops) +purple_conversation_set_ui_ops(PurpleConversation *conv, + PurpleConversationUiOps *ops) { g_return_if_fail(conv != NULL); @@ -527,8 +527,8 @@ conv->ui_ops = ops; } -GaimConversationUiOps * -gaim_conversation_get_ui_ops(const GaimConversation *conv) +PurpleConversationUiOps * +purple_conversation_get_ui_ops(const PurpleConversation *conv) { g_return_val_if_fail(conv != NULL, NULL); @@ -536,34 +536,34 @@ } void -gaim_conversation_set_account(GaimConversation *conv, GaimAccount *account) +purple_conversation_set_account(PurpleConversation *conv, PurpleAccount *account) { g_return_if_fail(conv != NULL); - if (account == gaim_conversation_get_account(conv)) + if (account == purple_conversation_get_account(conv)) return; conv->account = account; - gaim_conversation_update(conv, GAIM_CONV_UPDATE_ACCOUNT); + purple_conversation_update(conv, PURPLE_CONV_UPDATE_ACCOUNT); } -GaimAccount * -gaim_conversation_get_account(const GaimConversation *conv) +PurpleAccount * +purple_conversation_get_account(const PurpleConversation *conv) { g_return_val_if_fail(conv != NULL, NULL); return conv->account; } -GaimConnection * -gaim_conversation_get_gc(const GaimConversation *conv) +PurpleConnection * +purple_conversation_get_gc(const PurpleConversation *conv) { - GaimAccount *account; + PurpleAccount *account; g_return_val_if_fail(conv != NULL, NULL); - account = gaim_conversation_get_account(conv); + account = purple_conversation_get_account(conv); if (account == NULL) return NULL; @@ -572,7 +572,7 @@ } void -gaim_conversation_set_title(GaimConversation *conv, const char *title) +purple_conversation_set_title(PurpleConversation *conv, const char *title) { g_return_if_fail(conv != NULL); g_return_if_fail(title != NULL); @@ -580,11 +580,11 @@ g_free(conv->title); conv->title = g_strdup(title); - gaim_conversation_update(conv, GAIM_CONV_UPDATE_TITLE); + purple_conversation_update(conv, PURPLE_CONV_UPDATE_TITLE); } const char * -gaim_conversation_get_title(const GaimConversation *conv) +purple_conversation_get_title(const PurpleConversation *conv) { g_return_val_if_fail(conv != NULL, NULL); @@ -592,23 +592,23 @@ } void -gaim_conversation_autoset_title(GaimConversation *conv) +purple_conversation_autoset_title(PurpleConversation *conv) { - GaimAccount *account; - GaimBuddy *b; - GaimChat *chat; + PurpleAccount *account; + PurpleBuddy *b; + PurpleChat *chat; const char *text = NULL, *name; g_return_if_fail(conv != NULL); - account = gaim_conversation_get_account(conv); - name = gaim_conversation_get_name(conv); - - if(gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM) { - if(account && ((b = gaim_find_buddy(account, name)) != NULL)) - text = gaim_buddy_get_contact_alias(b); - } else if(gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT) { - if(account && ((chat = gaim_blist_find_chat(account, name)) != NULL)) + account = purple_conversation_get_account(conv); + name = purple_conversation_get_name(conv); + + if(purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) { + if(account && ((b = purple_find_buddy(account, name)) != NULL)) + text = purple_buddy_get_contact_alias(b); + } else if(purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) { + if(account && ((chat = purple_blist_find_chat(account, name)) != NULL)) text = chat->alias; } @@ -616,37 +616,37 @@ if(text == NULL) text = name; - gaim_conversation_set_title(conv, text); + purple_conversation_set_title(conv, text); } void -gaim_conversation_foreach(void (*func)(GaimConversation *conv)) +purple_conversation_foreach(void (*func)(PurpleConversation *conv)) { - GaimConversation *conv; + PurpleConversation *conv; GList *l; g_return_if_fail(func != NULL); - for (l = gaim_get_conversations(); l != NULL; l = l->next) { - conv = (GaimConversation *)l->data; + for (l = purple_get_conversations(); l != NULL; l = l->next) { + conv = (PurpleConversation *)l->data; func(conv); } } void -gaim_conversation_set_name(GaimConversation *conv, const char *name) +purple_conversation_set_name(PurpleConversation *conv, const char *name) { g_return_if_fail(conv != NULL); g_free(conv->name); conv->name = g_strdup(name); - gaim_conversation_autoset_title(conv); + purple_conversation_autoset_title(conv); } const char * -gaim_conversation_get_name(const GaimConversation *conv) +purple_conversation_get_name(const PurpleConversation *conv) { g_return_val_if_fail(conv != NULL, NULL); @@ -654,19 +654,19 @@ } void -gaim_conversation_set_logging(GaimConversation *conv, gboolean log) +purple_conversation_set_logging(PurpleConversation *conv, gboolean log) { g_return_if_fail(conv != NULL); if (conv->logging != log) { conv->logging = log; - gaim_conversation_update(conv, GAIM_CONV_UPDATE_LOGGING); + purple_conversation_update(conv, PURPLE_CONV_UPDATE_LOGGING); } } gboolean -gaim_conversation_is_logging(const GaimConversation *conv) +purple_conversation_is_logging(const PurpleConversation *conv) { g_return_val_if_fail(conv != NULL, FALSE); @@ -674,39 +674,39 @@ } void -gaim_conversation_close_logs(GaimConversation *conv) +purple_conversation_close_logs(PurpleConversation *conv) { g_return_if_fail(conv != NULL); - g_list_foreach(conv->logs, (GFunc)gaim_log_free, NULL); + g_list_foreach(conv->logs, (GFunc)purple_log_free, NULL); g_list_free(conv->logs); conv->logs = NULL; } -GaimConvIm * -gaim_conversation_get_im_data(const GaimConversation *conv) +PurpleConvIm * +purple_conversation_get_im_data(const PurpleConversation *conv) { g_return_val_if_fail(conv != NULL, NULL); - if (gaim_conversation_get_type(conv) != GAIM_CONV_TYPE_IM) + if (purple_conversation_get_type(conv) != PURPLE_CONV_TYPE_IM) return NULL; return conv->u.im; } -GaimConvChat * -gaim_conversation_get_chat_data(const GaimConversation *conv) +PurpleConvChat * +purple_conversation_get_chat_data(const PurpleConversation *conv) { g_return_val_if_fail(conv != NULL, NULL); - if (gaim_conversation_get_type(conv) != GAIM_CONV_TYPE_CHAT) + if (purple_conversation_get_type(conv) != PURPLE_CONV_TYPE_CHAT) return NULL; return conv->u.chat; } void -gaim_conversation_set_data(GaimConversation *conv, const char *key, +purple_conversation_set_data(PurpleConversation *conv, const char *key, gpointer data) { g_return_if_fail(conv != NULL); @@ -716,7 +716,7 @@ } gpointer -gaim_conversation_get_data(GaimConversation *conv, const char *key) +purple_conversation_get_data(PurpleConversation *conv, const char *key) { g_return_val_if_fail(conv != NULL, NULL); g_return_val_if_fail(key != NULL, NULL); @@ -725,45 +725,45 @@ } GList * -gaim_get_conversations(void) +purple_get_conversations(void) { return conversations; } GList * -gaim_get_ims(void) +purple_get_ims(void) { return ims; } GList * -gaim_get_chats(void) +purple_get_chats(void) { return chats; } -GaimConversation * -gaim_find_conversation_with_account(GaimConversationType type, +PurpleConversation * +purple_find_conversation_with_account(PurpleConversationType type, const char *name, - const GaimAccount *account) + const PurpleAccount *account) { - GaimConversation *c = NULL; + PurpleConversation *c = NULL; gchar *name1; const gchar *name2; GList *cnv; g_return_val_if_fail(name != NULL, NULL); - name1 = g_strdup(gaim_normalize(account, name)); - - for (cnv = gaim_get_conversations(); cnv != NULL; cnv = cnv->next) { - c = (GaimConversation *)cnv->data; - name2 = gaim_normalize(account, gaim_conversation_get_name(c)); - - if (((type == GAIM_CONV_TYPE_ANY) || (type == gaim_conversation_get_type(c))) && - (account == gaim_conversation_get_account(c)) && - !gaim_utf8_strcasecmp(name1, name2)) { + name1 = g_strdup(purple_normalize(account, name)); + + for (cnv = purple_get_conversations(); cnv != NULL; cnv = cnv->next) { + c = (PurpleConversation *)cnv->data; + name2 = purple_normalize(account, purple_conversation_get_name(c)); + + if (((type == PURPLE_CONV_TYPE_ANY) || (type == purple_conversation_get_type(c))) && + (account == purple_conversation_get_account(c)) && + !purple_utf8_strcasecmp(name1, name2)) { break; } @@ -777,49 +777,49 @@ } void -gaim_conversation_write(GaimConversation *conv, const char *who, - const char *message, GaimMessageFlags flags, +purple_conversation_write(PurpleConversation *conv, const char *who, + const char *message, PurpleMessageFlags flags, time_t mtime) { - GaimPluginProtocolInfo *prpl_info = NULL; - GaimConnection *gc = NULL; - GaimAccount *account; - GaimConversationUiOps *ops; + PurplePluginProtocolInfo *prpl_info = NULL; + PurpleConnection *gc = NULL; + PurpleAccount *account; + PurpleConversationUiOps *ops; const char *alias; char *displayed = NULL; - GaimBuddy *b; + PurpleBuddy *b; int plugin_return; - GaimConversationType type; + PurpleConversationType type; /* int logging_font_options = 0; */ g_return_if_fail(conv != NULL); g_return_if_fail(message != NULL); - ops = gaim_conversation_get_ui_ops(conv); + ops = purple_conversation_get_ui_ops(conv); if (ops == NULL || ops->write_conv == NULL) return; - account = gaim_conversation_get_account(conv); - type = gaim_conversation_get_type(conv); + account = purple_conversation_get_account(conv); + type = purple_conversation_get_type(conv); if (account != NULL) - gc = gaim_account_get_connection(account); - - if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT && + gc = purple_account_get_connection(account); + + if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT && (gc == NULL || !g_slist_find(gc->buddy_chats, conv))) return; - if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM && - !g_list_find(gaim_get_conversations(), conv)) + if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM && + !g_list_find(purple_get_conversations(), conv)) return; displayed = g_strdup(message); plugin_return = - GPOINTER_TO_INT(gaim_signal_emit_return_1( - gaim_conversations_get_handle(), - (type == GAIM_CONV_TYPE_IM ? "writing-im-msg" : "writing-chat-msg"), + GPOINTER_TO_INT(purple_signal_emit_return_1( + purple_conversations_get_handle(), + (type == PURPLE_CONV_TYPE_IM ? "writing-im-msg" : "writing-chat-msg"), account, who, &displayed, conv, flags)); if (displayed == NULL) @@ -831,40 +831,40 @@ } if (who == NULL || *who == '\0') - who = gaim_conversation_get_name(conv); + who = purple_conversation_get_name(conv); alias = who; if (account != NULL) { - prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gaim_find_prpl(gaim_account_get_protocol_id(account))); - - if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM || + prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_find_prpl(purple_account_get_protocol_id(account))); + + if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM || !(prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME)) { - if (flags & GAIM_MESSAGE_SEND) { - b = gaim_find_buddy(account, - gaim_account_get_username(account)); - - if (gaim_account_get_alias(account) != NULL) + if (flags & PURPLE_MESSAGE_SEND) { + b = purple_find_buddy(account, + purple_account_get_username(account)); + + if (purple_account_get_alias(account) != NULL) alias = account->alias; - else if (b != NULL && strcmp(b->name, gaim_buddy_get_contact_alias(b))) - alias = gaim_buddy_get_contact_alias(b); - else if (gaim_connection_get_display_name(gc) != NULL) - alias = gaim_connection_get_display_name(gc); + else if (b != NULL && strcmp(b->name, purple_buddy_get_contact_alias(b))) + alias = purple_buddy_get_contact_alias(b); + else if (purple_connection_get_display_name(gc) != NULL) + alias = purple_connection_get_display_name(gc); else - alias = gaim_account_get_username(account); + alias = purple_account_get_username(account); } else { - b = gaim_find_buddy(account, who); + b = purple_find_buddy(account, who); if (b != NULL) - alias = gaim_buddy_get_contact_alias(b); + alias = purple_buddy_get_contact_alias(b); } } } - if (!(flags & GAIM_MESSAGE_NO_LOG) && gaim_conversation_is_logging(conv)) { + if (!(flags & PURPLE_MESSAGE_NO_LOG) && purple_conversation_is_logging(conv)) { GList *log; if (conv->logs == NULL) @@ -872,35 +872,35 @@ log = conv->logs; while (log != NULL) { - gaim_log_write((GaimLog *)log->data, flags, alias, mtime, displayed); + purple_log_write((PurpleLog *)log->data, flags, alias, mtime, displayed); log = log->next; } } - if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM) { - if ((flags & GAIM_MESSAGE_RECV) == GAIM_MESSAGE_RECV) { - gaim_conv_im_set_typing_state(GAIM_CONV_IM(conv), GAIM_NOT_TYPING); + if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) { + if ((flags & PURPLE_MESSAGE_RECV) == PURPLE_MESSAGE_RECV) { + purple_conv_im_set_typing_state(PURPLE_CONV_IM(conv), PURPLE_NOT_TYPING); } } ops->write_conv(conv, who, alias, displayed, flags, mtime); - gaim_signal_emit(gaim_conversations_get_handle(), - (type == GAIM_CONV_TYPE_IM ? "wrote-im-msg" : "wrote-chat-msg"), + purple_signal_emit(purple_conversations_get_handle(), + (type == PURPLE_CONV_TYPE_IM ? "wrote-im-msg" : "wrote-chat-msg"), account, who, displayed, conv, flags); g_free(displayed); } gboolean -gaim_conversation_has_focus(GaimConversation *conv) +purple_conversation_has_focus(PurpleConversation *conv) { gboolean ret = FALSE; - GaimConversationUiOps *ops; + PurpleConversationUiOps *ops; g_return_val_if_fail(conv != NULL, FALSE); - ops = gaim_conversation_get_ui_ops(conv); + ops = purple_conversation_get_ui_ops(conv); if (ops != NULL && ops->has_focus != NULL) ret = ops->has_focus(conv); @@ -915,19 +915,19 @@ * when chats are added/removed from the blist. */ void -gaim_conversation_update(GaimConversation *conv, GaimConvUpdateType type) +purple_conversation_update(PurpleConversation *conv, PurpleConvUpdateType type) { g_return_if_fail(conv != NULL); - gaim_signal_emit(gaim_conversations_get_handle(), + purple_signal_emit(purple_conversations_get_handle(), "conversation-updated", conv, type); } /************************************************************************** * IM Conversation API **************************************************************************/ -GaimConversation * -gaim_conv_im_get_conversation(const GaimConvIm *im) +PurpleConversation * +purple_conv_im_get_conversation(const PurpleConvIm *im) { g_return_val_if_fail(im != NULL, NULL); @@ -935,24 +935,24 @@ } void -gaim_conv_im_set_icon(GaimConvIm *im, GaimBuddyIcon *icon) +purple_conv_im_set_icon(PurpleConvIm *im, PurpleBuddyIcon *icon) { g_return_if_fail(im != NULL); if (im->icon != icon) { if (im->icon != NULL) - gaim_buddy_icon_unref(im->icon); - - im->icon = (icon == NULL ? NULL : gaim_buddy_icon_ref(icon)); + purple_buddy_icon_unref(im->icon); + + im->icon = (icon == NULL ? NULL : purple_buddy_icon_ref(icon)); } - gaim_conversation_update(gaim_conv_im_get_conversation(im), - GAIM_CONV_UPDATE_ICON); + purple_conversation_update(purple_conv_im_get_conversation(im), + PURPLE_CONV_UPDATE_ICON); } -GaimBuddyIcon * -gaim_conv_im_get_icon(const GaimConvIm *im) +PurpleBuddyIcon * +purple_conv_im_get_icon(const PurpleConvIm *im) { g_return_val_if_fail(im != NULL, NULL); @@ -960,7 +960,7 @@ } void -gaim_conv_im_set_typing_state(GaimConvIm *im, GaimTypingState state) +purple_conv_im_set_typing_state(PurpleConvIm *im, PurpleTypingState state) { g_return_if_fail(im != NULL); @@ -968,26 +968,26 @@ { im->typing_state = state; - if (state == GAIM_TYPING) + if (state == PURPLE_TYPING) { - gaim_signal_emit(gaim_conversations_get_handle(), + purple_signal_emit(purple_conversations_get_handle(), "buddy-typing", im->conv->account, im->conv->name); } - else if (state == GAIM_TYPED) + else if (state == PURPLE_TYPED) { - gaim_signal_emit(gaim_conversations_get_handle(), + purple_signal_emit(purple_conversations_get_handle(), "buddy-typed", im->conv->account, im->conv->name); } - else if (state == GAIM_NOT_TYPING) + else if (state == PURPLE_NOT_TYPING) { - gaim_signal_emit(gaim_conversations_get_handle(), + purple_signal_emit(purple_conversations_get_handle(), "buddy-typing-stopped", im->conv->account, im->conv->name); } } } -GaimTypingState -gaim_conv_im_get_typing_state(const GaimConvIm *im) +PurpleTypingState +purple_conv_im_get_typing_state(const PurpleConvIm *im) { g_return_val_if_fail(im != NULL, 0); @@ -995,36 +995,36 @@ } void -gaim_conv_im_start_typing_timeout(GaimConvIm *im, int timeout) +purple_conv_im_start_typing_timeout(PurpleConvIm *im, int timeout) { - GaimConversation *conv; + PurpleConversation *conv; const char *name; g_return_if_fail(im != NULL); if (im->typing_timeout > 0) - gaim_conv_im_stop_typing_timeout(im); - - conv = gaim_conv_im_get_conversation(im); - name = gaim_conversation_get_name(conv); - - im->typing_timeout = gaim_timeout_add(timeout * 1000, reset_typing_cb, conv); + purple_conv_im_stop_typing_timeout(im); + + conv = purple_conv_im_get_conversation(im); + name = purple_conversation_get_name(conv); + + im->typing_timeout = purple_timeout_add(timeout * 1000, reset_typing_cb, conv); } void -gaim_conv_im_stop_typing_timeout(GaimConvIm *im) +purple_conv_im_stop_typing_timeout(PurpleConvIm *im) { g_return_if_fail(im != NULL); if (im->typing_timeout == 0) return; - gaim_timeout_remove(im->typing_timeout); + purple_timeout_remove(im->typing_timeout); im->typing_timeout = 0; } guint -gaim_conv_im_get_typing_timeout(const GaimConvIm *im) +purple_conv_im_get_typing_timeout(const PurpleConvIm *im) { g_return_val_if_fail(im != NULL, 0); @@ -1032,7 +1032,7 @@ } void -gaim_conv_im_set_type_again(GaimConvIm *im, unsigned int val) +purple_conv_im_set_type_again(PurpleConvIm *im, unsigned int val) { g_return_if_fail(im != NULL); @@ -1043,7 +1043,7 @@ } time_t -gaim_conv_im_get_type_again(const GaimConvIm *im) +purple_conv_im_get_type_again(const PurpleConvIm *im) { g_return_val_if_fail(im != NULL, 0); @@ -1051,28 +1051,28 @@ } void -gaim_conv_im_start_send_typed_timeout(GaimConvIm *im) +purple_conv_im_start_send_typed_timeout(PurpleConvIm *im) { g_return_if_fail(im != NULL); - im->send_typed_timeout = gaim_timeout_add(SEND_TYPED_TIMEOUT, send_typed_cb, - gaim_conv_im_get_conversation(im)); + im->send_typed_timeout = purple_timeout_add(SEND_TYPED_TIMEOUT, send_typed_cb, + purple_conv_im_get_conversation(im)); } void -gaim_conv_im_stop_send_typed_timeout(GaimConvIm *im) +purple_conv_im_stop_send_typed_timeout(PurpleConvIm *im) { g_return_if_fail(im != NULL); if (im->send_typed_timeout == 0) return; - gaim_timeout_remove(im->send_typed_timeout); + purple_timeout_remove(im->send_typed_timeout); im->send_typed_timeout = 0; } guint -gaim_conv_im_get_send_typed_timeout(const GaimConvIm *im) +purple_conv_im_get_send_typed_timeout(const PurpleConvIm *im) { g_return_val_if_fail(im != NULL, 0); @@ -1080,43 +1080,43 @@ } void -gaim_conv_im_update_typing(GaimConvIm *im) +purple_conv_im_update_typing(PurpleConvIm *im) { g_return_if_fail(im != NULL); - gaim_conversation_update(gaim_conv_im_get_conversation(im), - GAIM_CONV_UPDATE_TYPING); + purple_conversation_update(purple_conv_im_get_conversation(im), + PURPLE_CONV_UPDATE_TYPING); } void -gaim_conv_im_write(GaimConvIm *im, const char *who, const char *message, - GaimMessageFlags flags, time_t mtime) +purple_conv_im_write(PurpleConvIm *im, const char *who, const char *message, + PurpleMessageFlags flags, time_t mtime) { - GaimConversation *c; + PurpleConversation *c; g_return_if_fail(im != NULL); g_return_if_fail(message != NULL); - c = gaim_conv_im_get_conversation(im); + c = purple_conv_im_get_conversation(im); /* Raise the window, if specified in prefs. */ if (c->ui_ops != NULL && c->ui_ops->write_im != NULL) c->ui_ops->write_im(c, who, message, flags, mtime); else - gaim_conversation_write(c, who, message, flags, mtime); + purple_conversation_write(c, who, message, flags, mtime); } -gboolean gaim_conv_present_error(const char *who, GaimAccount *account, const char *what) +gboolean purple_conv_present_error(const char *who, PurpleAccount *account, const char *what) { - GaimConversation *conv; + PurpleConversation *conv; g_return_val_if_fail(who != NULL, FALSE); g_return_val_if_fail(account !=NULL, FALSE); g_return_val_if_fail(what != NULL, FALSE); - conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_ANY, who, account); + conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY, who, account); if (conv != NULL) - gaim_conversation_write(conv, NULL, what, GAIM_MESSAGE_ERROR, time(NULL)); + purple_conversation_write(conv, NULL, what, PURPLE_MESSAGE_ERROR, time(NULL)); else return FALSE; @@ -1124,15 +1124,15 @@ } void -gaim_conv_im_send(GaimConvIm *im, const char *message) +purple_conv_im_send(PurpleConvIm *im, const char *message) { - gaim_conv_im_send_with_flags(im, message, 0); + purple_conv_im_send_with_flags(im, message, 0); } static void -gaim_conv_send_confirm_cb(gpointer *data) +purple_conv_send_confirm_cb(gpointer *data) { - GaimConversation *conv = data[0]; + PurpleConversation *conv = data[0]; char *message = data[1]; g_free(data); @@ -1140,7 +1140,7 @@ } void -gaim_conv_send_confirm(GaimConversation *conv, const char *message) +purple_conv_send_confirm(PurpleConversation *conv, const char *message) { char *text; gpointer *data; @@ -1159,22 +1159,22 @@ data[0] = conv; data[1] = (gpointer)message; - gaim_request_action(conv, NULL, _("Send Message"), text, 0, data, 2, - _("_Send Message"), G_CALLBACK(gaim_conv_send_confirm_cb), + purple_request_action(conv, NULL, _("Send Message"), text, 0, data, 2, + _("_Send Message"), G_CALLBACK(purple_conv_send_confirm_cb), _("Cancel"), NULL); } void -gaim_conv_im_send_with_flags(GaimConvIm *im, const char *message, GaimMessageFlags flags) +purple_conv_im_send_with_flags(PurpleConvIm *im, const char *message, PurpleMessageFlags flags) { g_return_if_fail(im != NULL); g_return_if_fail(message != NULL); - common_send(gaim_conv_im_get_conversation(im), message, flags); + common_send(purple_conv_im_get_conversation(im), message, flags); } gboolean -gaim_conv_custom_smiley_add(GaimConversation *conv, const char *smile, +purple_conv_custom_smiley_add(PurpleConversation *conv, const char *smile, const char *cksum_type, const char *chksum, gboolean remote) { @@ -1187,14 +1187,14 @@ if (conv->ui_ops != NULL && conv->ui_ops->custom_smiley_add !=NULL) { return conv->ui_ops->custom_smiley_add(conv, smile, remote); } else { - gaim_debug_info("conversation", "Could not find add custom smiley function"); + purple_debug_info("conversation", "Could not find add custom smiley function"); return FALSE; } } void -gaim_conv_custom_smiley_write(GaimConversation *conv, const char *smile, +purple_conv_custom_smiley_write(PurpleConversation *conv, const char *smile, const guchar *data, gsize size) { g_return_if_fail(conv != NULL); @@ -1203,11 +1203,11 @@ if (conv->ui_ops != NULL && conv->ui_ops->custom_smiley_write != NULL) conv->ui_ops->custom_smiley_write(conv, smile, data, size); else - gaim_debug_info("conversation", "Could not find the smiley write function"); + purple_debug_info("conversation", "Could not find the smiley write function"); } void -gaim_conv_custom_smiley_close(GaimConversation *conv, const char *smile) +purple_conv_custom_smiley_close(PurpleConversation *conv, const char *smile) { g_return_if_fail(conv != NULL); g_return_if_fail(smile != NULL && *smile); @@ -1215,7 +1215,7 @@ if (conv->ui_ops != NULL && conv->ui_ops->custom_smiley_close != NULL) conv->ui_ops->custom_smiley_close(conv, smile); else - gaim_debug_info("conversation", "Could not find custom smiley close function"); + purple_debug_info("conversation", "Could not find custom smiley close function"); } @@ -1223,8 +1223,8 @@ * Chat Conversation API **************************************************************************/ -GaimConversation * -gaim_conv_chat_get_conversation(const GaimConvChat *chat) +PurpleConversation * +purple_conv_chat_get_conversation(const PurpleConvChat *chat) { g_return_val_if_fail(chat != NULL, NULL); @@ -1232,7 +1232,7 @@ } GList * -gaim_conv_chat_set_users(GaimConvChat *chat, GList *users) +purple_conv_chat_set_users(PurpleConvChat *chat, GList *users) { g_return_val_if_fail(chat != NULL, NULL); @@ -1242,7 +1242,7 @@ } GList * -gaim_conv_chat_get_users(const GaimConvChat *chat) +purple_conv_chat_get_users(const PurpleConvChat *chat) { g_return_val_if_fail(chat != NULL, NULL); @@ -1250,21 +1250,21 @@ } void -gaim_conv_chat_ignore(GaimConvChat *chat, const char *name) +purple_conv_chat_ignore(PurpleConvChat *chat, const char *name) { g_return_if_fail(chat != NULL); g_return_if_fail(name != NULL); /* Make sure the user isn't already ignored. */ - if (gaim_conv_chat_is_user_ignored(chat, name)) + if (purple_conv_chat_is_user_ignored(chat, name)) return; - gaim_conv_chat_set_ignored(chat, - g_list_append(gaim_conv_chat_get_ignored(chat), g_strdup(name))); + purple_conv_chat_set_ignored(chat, + g_list_append(purple_conv_chat_get_ignored(chat), g_strdup(name))); } void -gaim_conv_chat_unignore(GaimConvChat *chat, const char *name) +purple_conv_chat_unignore(PurpleConvChat *chat, const char *name) { GList *item; @@ -1272,21 +1272,21 @@ g_return_if_fail(name != NULL); /* Make sure the user is actually ignored. */ - if (!gaim_conv_chat_is_user_ignored(chat, name)) + if (!purple_conv_chat_is_user_ignored(chat, name)) return; - item = g_list_find(gaim_conv_chat_get_ignored(chat), - gaim_conv_chat_get_ignored_user(chat, name)); - - gaim_conv_chat_set_ignored(chat, - g_list_remove_link(gaim_conv_chat_get_ignored(chat), item)); + item = g_list_find(purple_conv_chat_get_ignored(chat), + purple_conv_chat_get_ignored_user(chat, name)); + + purple_conv_chat_set_ignored(chat, + g_list_remove_link(purple_conv_chat_get_ignored(chat), item)); g_free(item->data); g_list_free_1(item); } GList * -gaim_conv_chat_set_ignored(GaimConvChat *chat, GList *ignored) +purple_conv_chat_set_ignored(PurpleConvChat *chat, GList *ignored) { g_return_val_if_fail(chat != NULL, NULL); @@ -1296,7 +1296,7 @@ } GList * -gaim_conv_chat_get_ignored(const GaimConvChat *chat) +purple_conv_chat_get_ignored(const PurpleConvChat *chat) { g_return_val_if_fail(chat != NULL, NULL); @@ -1304,28 +1304,28 @@ } const char * -gaim_conv_chat_get_ignored_user(const GaimConvChat *chat, const char *user) +purple_conv_chat_get_ignored_user(const PurpleConvChat *chat, const char *user) { GList *ignored; g_return_val_if_fail(chat != NULL, NULL); g_return_val_if_fail(user != NULL, NULL); - for (ignored = gaim_conv_chat_get_ignored(chat); + for (ignored = purple_conv_chat_get_ignored(chat); ignored != NULL; ignored = ignored->next) { const char *ign = (const char *)ignored->data; - if (!gaim_utf8_strcasecmp(user, ign) || - ((*ign == '+' || *ign == '%') && !gaim_utf8_strcasecmp(user, ign + 1))) + if (!purple_utf8_strcasecmp(user, ign) || + ((*ign == '+' || *ign == '%') && !purple_utf8_strcasecmp(user, ign + 1))) return ign; if (*ign == '@') { ign++; - if ((*ign == '+' && !gaim_utf8_strcasecmp(user, ign + 1)) || - (*ign != '+' && !gaim_utf8_strcasecmp(user, ign))) + if ((*ign == '+' && !purple_utf8_strcasecmp(user, ign + 1)) || + (*ign != '+' && !purple_utf8_strcasecmp(user, ign))) return ign; } } @@ -1334,16 +1334,16 @@ } gboolean -gaim_conv_chat_is_user_ignored(const GaimConvChat *chat, const char *user) +purple_conv_chat_is_user_ignored(const PurpleConvChat *chat, const char *user) { g_return_val_if_fail(chat != NULL, FALSE); g_return_val_if_fail(user != NULL, FALSE); - return (gaim_conv_chat_get_ignored_user(chat, user) != NULL); + return (purple_conv_chat_get_ignored_user(chat, user) != NULL); } void -gaim_conv_chat_set_topic(GaimConvChat *chat, const char *who, const char *topic) +purple_conv_chat_set_topic(PurpleConvChat *chat, const char *who, const char *topic) { g_return_if_fail(chat != NULL); @@ -1353,15 +1353,15 @@ chat->who = g_strdup(who); chat->topic = g_strdup(topic); - gaim_conversation_update(gaim_conv_chat_get_conversation(chat), - GAIM_CONV_UPDATE_TOPIC); - - gaim_signal_emit(gaim_conversations_get_handle(), "chat-topic-changed", + purple_conversation_update(purple_conv_chat_get_conversation(chat), + PURPLE_CONV_UPDATE_TOPIC); + + purple_signal_emit(purple_conversations_get_handle(), "chat-topic-changed", chat->conv, chat->who, chat->topic); } const char * -gaim_conv_chat_get_topic(const GaimConvChat *chat) +purple_conv_chat_get_topic(const PurpleConvChat *chat) { g_return_val_if_fail(chat != NULL, NULL); @@ -1369,7 +1369,7 @@ } void -gaim_conv_chat_set_id(GaimConvChat *chat, int id) +purple_conv_chat_set_id(PurpleConvChat *chat, int id) { g_return_if_fail(chat != NULL); @@ -1377,7 +1377,7 @@ } int -gaim_conv_chat_get_id(const GaimConvChat *chat) +purple_conv_chat_get_id(const PurpleConvChat *chat) { g_return_val_if_fail(chat != NULL, -1); @@ -1385,39 +1385,39 @@ } void -gaim_conv_chat_write(GaimConvChat *chat, const char *who, const char *message, - GaimMessageFlags flags, time_t mtime) +purple_conv_chat_write(PurpleConvChat *chat, const char *who, const char *message, + PurpleMessageFlags flags, time_t mtime) { - GaimAccount *account; - GaimConversation *conv; - GaimConnection *gc; - GaimPluginProtocolInfo *prpl_info; + PurpleAccount *account; + PurpleConversation *conv; + PurpleConnection *gc; + PurplePluginProtocolInfo *prpl_info; g_return_if_fail(chat != NULL); g_return_if_fail(who != NULL); g_return_if_fail(message != NULL); - conv = gaim_conv_chat_get_conversation(chat); - gc = gaim_conversation_get_gc(conv); - account = gaim_connection_get_account(gc); - prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl); + conv = purple_conv_chat_get_conversation(chat); + gc = purple_conversation_get_gc(conv); + account = purple_connection_get_account(gc); + prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl); /* Don't display this if the person who wrote it is ignored. */ - if (gaim_conv_chat_is_user_ignored(chat, who)) + if (purple_conv_chat_is_user_ignored(chat, who)) return; - if (!(flags & GAIM_MESSAGE_WHISPER)) { + if (!(flags & PURPLE_MESSAGE_WHISPER)) { char *str; - str = g_strdup(gaim_normalize(account, who)); - - if (!strcmp(str, gaim_normalize(account, chat->nick))) { - flags |= GAIM_MESSAGE_SEND; + str = g_strdup(purple_normalize(account, who)); + + if (!strcmp(str, purple_normalize(account, chat->nick))) { + flags |= PURPLE_MESSAGE_SEND; } else { - flags |= GAIM_MESSAGE_RECV; - - if (gaim_utf8_has_word(message, chat->nick)) - flags |= GAIM_MESSAGE_NICK; + flags |= PURPLE_MESSAGE_RECV; + + if (purple_utf8_has_word(message, chat->nick)) + flags |= PURPLE_MESSAGE_NICK; } g_free(str); @@ -1427,34 +1427,34 @@ if (conv->ui_ops != NULL && conv->ui_ops->write_chat != NULL) conv->ui_ops->write_chat(conv, who, message, flags, mtime); else - gaim_conversation_write(conv, who, message, flags, mtime); + purple_conversation_write(conv, who, message, flags, mtime); } void -gaim_conv_chat_send(GaimConvChat *chat, const char *message) +purple_conv_chat_send(PurpleConvChat *chat, const char *message) { - gaim_conv_chat_send_with_flags(chat, message, 0); + purple_conv_chat_send_with_flags(chat, message, 0); } void -gaim_conv_chat_send_with_flags(GaimConvChat *chat, const char *message, GaimMessageFlags flags) +purple_conv_chat_send_with_flags(PurpleConvChat *chat, const char *message, PurpleMessageFlags flags) { g_return_if_fail(chat != NULL); g_return_if_fail(message != NULL); - common_send(gaim_conv_chat_get_conversation(chat), message, flags); + common_send(purple_conv_chat_get_conversation(chat), message, flags); } void -gaim_conv_chat_add_user(GaimConvChat *chat, const char *user, - const char *extra_msg, GaimConvChatBuddyFlags flags, +purple_conv_chat_add_user(PurpleConvChat *chat, const char *user, + const char *extra_msg, PurpleConvChatBuddyFlags flags, gboolean new_arrival) { GList *users = g_list_append(NULL, (char *)user); GList *extra_msgs = g_list_append(NULL, (char *)extra_msg); GList *flags2 = g_list_append(NULL, GINT_TO_POINTER(flags)); - gaim_conv_chat_add_users(chat, users, extra_msgs, flags2, new_arrival); + purple_conv_chat_add_users(chat, users, extra_msgs, flags2, new_arrival); g_list_free(users); g_list_free(extra_msgs); @@ -1462,9 +1462,9 @@ } static int -gaim_conv_chat_cb_compare(GaimConvChatBuddy *a, GaimConvChatBuddy *b) +purple_conv_chat_cb_compare(PurpleConvChatBuddy *a, PurpleConvChatBuddy *b) { - GaimConvChatBuddyFlags f1 = 0, f2 = 0; + PurpleConvChatBuddyFlags f1 = 0, f2 = 0; char *user1 = NULL, *user2 = NULL; gint ret = 0; @@ -1500,26 +1500,26 @@ } void -gaim_conv_chat_add_users(GaimConvChat *chat, GList *users, GList *extra_msgs, +purple_conv_chat_add_users(PurpleConvChat *chat, GList *users, GList *extra_msgs, GList *flags, gboolean new_arrivals) { - GaimConversation *conv; - GaimConversationUiOps *ops; - GaimConvChatBuddy *cbuddy; - GaimConnection *gc; - GaimPluginProtocolInfo *prpl_info; + PurpleConversation *conv; + PurpleConversationUiOps *ops; + PurpleConvChatBuddy *cbuddy; + PurpleConnection *gc; + PurplePluginProtocolInfo *prpl_info; GList *ul, *fl; GList *cbuddies = NULL; g_return_if_fail(chat != NULL); g_return_if_fail(users != NULL); - conv = gaim_conv_chat_get_conversation(chat); - ops = gaim_conversation_get_ui_ops(conv); - - gc = gaim_conversation_get_gc(conv); + conv = purple_conv_chat_get_conversation(chat); + ops = purple_conversation_get_ui_ops(conv); + + gc = purple_conversation_get_gc(conv); g_return_if_fail(gc != NULL); - prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl); + prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl); g_return_if_fail(prpl_info != NULL); ul = users; @@ -1528,33 +1528,33 @@ const char *user = (const char *)ul->data; const char *alias = user; gboolean quiet; - GaimConvChatBuddyFlags flag = GPOINTER_TO_INT(fl->data); + PurpleConvChatBuddyFlags flag = GPOINTER_TO_INT(fl->data); const char *extra_msg = (extra_msgs ? extra_msgs->data : NULL); - if (!strcmp(chat->nick, gaim_normalize(conv->account, user))) { - const char *alias2 = gaim_account_get_alias(conv->account); + if (!strcmp(chat->nick, purple_normalize(conv->account, user))) { + const char *alias2 = purple_account_get_alias(conv->account); if (alias2 != NULL) alias = alias2; else { - const char *display_name = gaim_connection_get_display_name(gc); + const char *display_name = purple_connection_get_display_name(gc); if (display_name != NULL) alias = display_name; } } else if (!(prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME)) { - GaimBuddy *buddy; - if ((buddy = gaim_find_buddy(gc->account, user)) != NULL) - alias = gaim_buddy_get_contact_alias(buddy); + PurpleBuddy *buddy; + if ((buddy = purple_find_buddy(gc->account, user)) != NULL) + alias = purple_buddy_get_contact_alias(buddy); } - quiet = GPOINTER_TO_INT(gaim_signal_emit_return_1(gaim_conversations_get_handle(), + quiet = GPOINTER_TO_INT(purple_signal_emit_return_1(purple_conversations_get_handle(), "chat-buddy-joining", conv, user, flag)) | - gaim_conv_chat_is_user_ignored(chat, user); - - cbuddy = gaim_conv_chat_cb_new(user, alias, flag); + purple_conv_chat_is_user_ignored(chat, user); + + cbuddy = purple_conv_chat_cb_new(user, alias, flag); /* This seems dumb. Why should we set users thousands of times? */ - gaim_conv_chat_set_users(chat, - g_list_prepend(gaim_conv_chat_get_users(chat), cbuddy)); + purple_conv_chat_set_users(chat, + g_list_prepend(purple_conv_chat_get_users(chat), cbuddy)); cbuddies = g_list_prepend(cbuddies, cbuddy); @@ -1572,11 +1572,11 @@ } g_free(escaped); - gaim_conversation_write(conv, NULL, tmp, GAIM_MESSAGE_SYSTEM, time(NULL)); + purple_conversation_write(conv, NULL, tmp, PURPLE_MESSAGE_SYSTEM, time(NULL)); g_free(tmp); } - gaim_signal_emit(gaim_conversations_get_handle(), + purple_signal_emit(purple_conversations_get_handle(), "chat-buddy-joined", conv, user, flag, new_arrivals); ul = ul->next; fl = fl->next; @@ -1584,7 +1584,7 @@ extra_msgs = extra_msgs->next; } - cbuddies = g_list_sort(cbuddies, (GCompareFunc)gaim_conv_chat_cb_compare); + cbuddies = g_list_sort(cbuddies, (GCompareFunc)purple_conv_chat_cb_compare); if (ops != NULL && ops->chat_add_users != NULL) ops->chat_add_users(conv, cbuddies, new_arrivals); @@ -1593,15 +1593,15 @@ } void -gaim_conv_chat_rename_user(GaimConvChat *chat, const char *old_user, +purple_conv_chat_rename_user(PurpleConvChat *chat, const char *old_user, const char *new_user) { - GaimConversation *conv; - GaimConversationUiOps *ops; - GaimConnection *gc; - GaimPluginProtocolInfo *prpl_info; - GaimConvChatBuddy *cb; - GaimConvChatBuddyFlags flags; + PurpleConversation *conv; + PurpleConversationUiOps *ops; + PurpleConnection *gc; + PurplePluginProtocolInfo *prpl_info; + PurpleConvChatBuddy *cb; + PurpleConvChatBuddyFlags flags; const char *new_alias = new_user; char tmp[BUF_LONG]; gboolean is_me = FALSE; @@ -1610,63 +1610,63 @@ g_return_if_fail(old_user != NULL); g_return_if_fail(new_user != NULL); - conv = gaim_conv_chat_get_conversation(chat); - ops = gaim_conversation_get_ui_ops(conv); - - gc = gaim_conversation_get_gc(conv); + conv = purple_conv_chat_get_conversation(chat); + ops = purple_conversation_get_ui_ops(conv); + + gc = purple_conversation_get_gc(conv); g_return_if_fail(gc != NULL); - prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl); + prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl); g_return_if_fail(prpl_info != NULL); - flags = gaim_conv_chat_user_get_flags(chat, old_user); - cb = gaim_conv_chat_cb_new(new_user, NULL, flags); - gaim_conv_chat_set_users(chat, - g_list_prepend(gaim_conv_chat_get_users(chat), cb)); - - if (!strcmp(chat->nick, gaim_normalize(conv->account, old_user))) { + flags = purple_conv_chat_user_get_flags(chat, old_user); + cb = purple_conv_chat_cb_new(new_user, NULL, flags); + purple_conv_chat_set_users(chat, + g_list_prepend(purple_conv_chat_get_users(chat), cb)); + + if (!strcmp(chat->nick, purple_normalize(conv->account, old_user))) { const char *alias; /* Note this for later. */ is_me = TRUE; - alias = gaim_account_get_alias(conv->account); + alias = purple_account_get_alias(conv->account); if (alias != NULL) new_alias = alias; else { - const char *display_name = gaim_connection_get_display_name(gc); + const char *display_name = purple_connection_get_display_name(gc); if (display_name != NULL) alias = display_name; } } else if (!(prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME)) { - GaimBuddy *buddy; - if ((buddy = gaim_find_buddy(gc->account, new_user)) != NULL) - new_alias = gaim_buddy_get_contact_alias(buddy); + PurpleBuddy *buddy; + if ((buddy = purple_find_buddy(gc->account, new_user)) != NULL) + new_alias = purple_buddy_get_contact_alias(buddy); } if (ops != NULL && ops->chat_rename_user != NULL) ops->chat_rename_user(conv, old_user, new_user, new_alias); - cb = gaim_conv_chat_cb_find(chat, old_user); + cb = purple_conv_chat_cb_find(chat, old_user); if (cb) { - gaim_conv_chat_set_users(chat, - g_list_remove(gaim_conv_chat_get_users(chat), cb)); - gaim_conv_chat_cb_destroy(cb); + purple_conv_chat_set_users(chat, + g_list_remove(purple_conv_chat_get_users(chat), cb)); + purple_conv_chat_cb_destroy(cb); } - if (gaim_conv_chat_is_user_ignored(chat, old_user)) { - gaim_conv_chat_unignore(chat, old_user); - gaim_conv_chat_ignore(chat, new_user); + if (purple_conv_chat_is_user_ignored(chat, old_user)) { + purple_conv_chat_unignore(chat, old_user); + purple_conv_chat_ignore(chat, new_user); } - else if (gaim_conv_chat_is_user_ignored(chat, new_user)) - gaim_conv_chat_unignore(chat, new_user); + else if (purple_conv_chat_is_user_ignored(chat, new_user)) + purple_conv_chat_unignore(chat, new_user); if (is_me) - gaim_conv_chat_set_nick(chat, new_user); - - if (gaim_prefs_get_bool("/core/conversations/chat/show_nick_change") && - !gaim_conv_chat_is_user_ignored(chat, new_user)) { + purple_conv_chat_set_nick(chat, new_user); + + if (purple_prefs_get_bool("/core/conversations/chat/show_nick_change") && + !purple_conv_chat_is_user_ignored(chat, new_user)) { if (is_me) { char *escaped = g_markup_escape_text(new_user, -1); @@ -1680,12 +1680,12 @@ char *escaped2; if (!(prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME)) { - GaimBuddy *buddy; - - if ((buddy = gaim_find_buddy(gc->account, old_user)) != NULL) - old_alias = gaim_buddy_get_contact_alias(buddy); - if ((buddy = gaim_find_buddy(gc->account, new_user)) != NULL) - new_alias = gaim_buddy_get_contact_alias(buddy); + PurpleBuddy *buddy; + + if ((buddy = purple_find_buddy(gc->account, old_user)) != NULL) + old_alias = purple_buddy_get_contact_alias(buddy); + if ((buddy = purple_find_buddy(gc->account, new_user)) != NULL) + new_alias = purple_buddy_get_contact_alias(buddy); } escaped = g_markup_escape_text(old_alias, -1); @@ -1696,55 +1696,55 @@ g_free(escaped2); } - gaim_conversation_write(conv, NULL, tmp, GAIM_MESSAGE_SYSTEM, time(NULL)); + purple_conversation_write(conv, NULL, tmp, PURPLE_MESSAGE_SYSTEM, time(NULL)); } } void -gaim_conv_chat_remove_user(GaimConvChat *chat, const char *user, const char *reason) +purple_conv_chat_remove_user(PurpleConvChat *chat, const char *user, const char *reason) { GList *users = g_list_append(NULL, (char *)user); - gaim_conv_chat_remove_users(chat, users, reason); + purple_conv_chat_remove_users(chat, users, reason); g_list_free(users); } void -gaim_conv_chat_remove_users(GaimConvChat *chat, GList *users, const char *reason) +purple_conv_chat_remove_users(PurpleConvChat *chat, GList *users, const char *reason) { - GaimConversation *conv; - GaimConnection *gc; - GaimPluginProtocolInfo *prpl_info; - GaimConversationUiOps *ops; - GaimConvChatBuddy *cb; + PurpleConversation *conv; + PurpleConnection *gc; + PurplePluginProtocolInfo *prpl_info; + PurpleConversationUiOps *ops; + PurpleConvChatBuddy *cb; GList *l; gboolean quiet; g_return_if_fail(chat != NULL); g_return_if_fail(users != NULL); - conv = gaim_conv_chat_get_conversation(chat); - - gc = gaim_conversation_get_gc(conv); + conv = purple_conv_chat_get_conversation(chat); + + gc = purple_conversation_get_gc(conv); g_return_if_fail(gc != NULL); - prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl); + prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl); g_return_if_fail(prpl_info != NULL); - ops = gaim_conversation_get_ui_ops(conv); + ops = purple_conversation_get_ui_ops(conv); for (l = users; l != NULL; l = l->next) { const char *user = (const char *)l->data; - quiet = GPOINTER_TO_INT(gaim_signal_emit_return_1(gaim_conversations_get_handle(), + quiet = GPOINTER_TO_INT(purple_signal_emit_return_1(purple_conversations_get_handle(), "chat-buddy-leaving", conv, user, reason)) | - gaim_conv_chat_is_user_ignored(chat, user); - - cb = gaim_conv_chat_cb_find(chat, user); + purple_conv_chat_is_user_ignored(chat, user); + + cb = purple_conv_chat_cb_find(chat, user); if (cb) { - gaim_conv_chat_set_users(chat, - g_list_remove(gaim_conv_chat_get_users(chat), cb)); - gaim_conv_chat_cb_destroy(cb); + purple_conv_chat_set_users(chat, + g_list_remove(purple_conv_chat_get_users(chat), cb)); + purple_conv_chat_cb_destroy(cb); } /* NOTE: Don't remove them from ignored in case they re-enter. */ @@ -1755,10 +1755,10 @@ char *tmp; if (!(prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME)) { - GaimBuddy *buddy; - - if ((buddy = gaim_find_buddy(gc->account, user)) != NULL) - alias = gaim_buddy_get_contact_alias(buddy); + PurpleBuddy *buddy; + + if ((buddy = purple_find_buddy(gc->account, user)) != NULL) + alias = purple_buddy_get_contact_alias(buddy); } escaped = g_markup_escape_text(alias, -1); @@ -1773,11 +1773,11 @@ } g_free(escaped); - gaim_conversation_write(conv, NULL, tmp, GAIM_MESSAGE_SYSTEM, time(NULL)); + purple_conversation_write(conv, NULL, tmp, PURPLE_MESSAGE_SYSTEM, time(NULL)); g_free(tmp); } - gaim_signal_emit(gaim_conversations_get_handle(), "chat-buddy-left", + purple_signal_emit(purple_conversations_get_handle(), "chat-buddy-left", conv, user, reason); } @@ -1786,22 +1786,22 @@ } void -gaim_conv_chat_clear_users(GaimConvChat *chat) +purple_conv_chat_clear_users(PurpleConvChat *chat) { - GaimConversation *conv; - GaimConversationUiOps *ops; + PurpleConversation *conv; + PurpleConversationUiOps *ops; GList *users, *names = NULL; GList *l; g_return_if_fail(chat != NULL); - conv = gaim_conv_chat_get_conversation(chat); - ops = gaim_conversation_get_ui_ops(conv); - users = gaim_conv_chat_get_users(chat); + conv = purple_conv_chat_get_conversation(chat); + ops = purple_conversation_get_ui_ops(conv); + users = purple_conv_chat_get_users(chat); if (ops != NULL && ops->chat_remove_users != NULL) { for (l = users; l; l = l->next) { - GaimConvChatBuddy *cb = l->data; + PurpleConvChatBuddy *cb = l->data; names = g_list_append(names, cb->name); } ops->chat_remove_users(conv, names); @@ -1810,43 +1810,43 @@ for (l = users; l; l = l->next) { - GaimConvChatBuddy *cb = l->data; - - gaim_signal_emit(gaim_conversations_get_handle(), + PurpleConvChatBuddy *cb = l->data; + + purple_signal_emit(purple_conversations_get_handle(), "chat-buddy-leaving", conv, cb->name, NULL); - gaim_signal_emit(gaim_conversations_get_handle(), + purple_signal_emit(purple_conversations_get_handle(), "chat-buddy-left", conv, cb->name, NULL); - gaim_conv_chat_cb_destroy(cb); + purple_conv_chat_cb_destroy(cb); } g_list_free(users); - gaim_conv_chat_set_users(chat, NULL); + purple_conv_chat_set_users(chat, NULL); } gboolean -gaim_conv_chat_find_user(GaimConvChat *chat, const char *user) +purple_conv_chat_find_user(PurpleConvChat *chat, const char *user) { g_return_val_if_fail(chat != NULL, FALSE); g_return_val_if_fail(user != NULL, FALSE); - return (gaim_conv_chat_cb_find(chat, user) != NULL); + return (purple_conv_chat_cb_find(chat, user) != NULL); } void -gaim_conv_chat_user_set_flags(GaimConvChat *chat, const char *user, - GaimConvChatBuddyFlags flags) +purple_conv_chat_user_set_flags(PurpleConvChat *chat, const char *user, + PurpleConvChatBuddyFlags flags) { - GaimConversation *conv; - GaimConversationUiOps *ops; - GaimConvChatBuddy *cb; - GaimConvChatBuddyFlags oldflags; + PurpleConversation *conv; + PurpleConversationUiOps *ops; + PurpleConvChatBuddy *cb; + PurpleConvChatBuddyFlags oldflags; g_return_if_fail(chat != NULL); g_return_if_fail(user != NULL); - cb = gaim_conv_chat_cb_find(chat, user); + cb = purple_conv_chat_cb_find(chat, user); if (!cb) return; @@ -1857,56 +1857,56 @@ oldflags = cb->flags; cb->flags = flags; - conv = gaim_conv_chat_get_conversation(chat); - ops = gaim_conversation_get_ui_ops(conv); + conv = purple_conv_chat_get_conversation(chat); + ops = purple_conversation_get_ui_ops(conv); if (ops != NULL && ops->chat_update_user != NULL) ops->chat_update_user(conv, user); - gaim_signal_emit(gaim_conversations_get_handle(), + purple_signal_emit(purple_conversations_get_handle(), "chat-buddy-flags", conv, user, oldflags, flags); } -GaimConvChatBuddyFlags -gaim_conv_chat_user_get_flags(GaimConvChat *chat, const char *user) +PurpleConvChatBuddyFlags +purple_conv_chat_user_get_flags(PurpleConvChat *chat, const char *user) { - GaimConvChatBuddy *cb; + PurpleConvChatBuddy *cb; g_return_val_if_fail(chat != NULL, 0); g_return_val_if_fail(user != NULL, 0); - cb = gaim_conv_chat_cb_find(chat, user); + cb = purple_conv_chat_cb_find(chat, user); if (!cb) - return GAIM_CBFLAGS_NONE; + return PURPLE_CBFLAGS_NONE; return cb->flags; } -void gaim_conv_chat_set_nick(GaimConvChat *chat, const char *nick) { +void purple_conv_chat_set_nick(PurpleConvChat *chat, const char *nick) { g_return_if_fail(chat != NULL); g_free(chat->nick); - chat->nick = g_strdup(gaim_normalize(chat->conv->account, nick)); + chat->nick = g_strdup(purple_normalize(chat->conv->account, nick)); } -const char *gaim_conv_chat_get_nick(GaimConvChat *chat) { +const char *purple_conv_chat_get_nick(PurpleConvChat *chat) { g_return_val_if_fail(chat != NULL, NULL); return chat->nick; } -GaimConversation * -gaim_find_chat(const GaimConnection *gc, int id) +PurpleConversation * +purple_find_chat(const PurpleConnection *gc, int id) { GList *l; - GaimConversation *conv; - - for (l = gaim_get_chats(); l != NULL; l = l->next) { - conv = (GaimConversation *)l->data; - - if (gaim_conv_chat_get_id(GAIM_CONV_CHAT(conv)) == id && - gaim_conversation_get_gc(conv) == gc) + PurpleConversation *conv; + + for (l = purple_get_chats(); l != NULL; l = l->next) { + conv = (PurpleConversation *)l->data; + + if (purple_conv_chat_get_id(PURPLE_CONV_CHAT(conv)) == id && + purple_conversation_get_gc(conv) == gc) return conv; } @@ -1914,49 +1914,49 @@ } void -gaim_conv_chat_left(GaimConvChat *chat) +purple_conv_chat_left(PurpleConvChat *chat) { g_return_if_fail(chat != NULL); chat->left = TRUE; - gaim_conversation_update(chat->conv, GAIM_CONV_UPDATE_CHATLEFT); + purple_conversation_update(chat->conv, PURPLE_CONV_UPDATE_CHATLEFT); } gboolean -gaim_conv_chat_has_left(GaimConvChat *chat) +purple_conv_chat_has_left(PurpleConvChat *chat) { g_return_val_if_fail(chat != NULL, TRUE); return chat->left; } -GaimConvChatBuddy * -gaim_conv_chat_cb_new(const char *name, const char *alias, GaimConvChatBuddyFlags flags) +PurpleConvChatBuddy * +purple_conv_chat_cb_new(const char *name, const char *alias, PurpleConvChatBuddyFlags flags) { - GaimConvChatBuddy *cb; + PurpleConvChatBuddy *cb; g_return_val_if_fail(name != NULL, NULL); - cb = g_new0(GaimConvChatBuddy, 1); + cb = g_new0(PurpleConvChatBuddy, 1); cb->name = g_strdup(name); cb->flags = flags; cb->alias = g_strdup(alias); - GAIM_DBUS_REGISTER_POINTER(cb, GaimConvChatBuddy); + PURPLE_DBUS_REGISTER_POINTER(cb, PurpleConvChatBuddy); return cb; } -GaimConvChatBuddy * -gaim_conv_chat_cb_find(GaimConvChat *chat, const char *name) +PurpleConvChatBuddy * +purple_conv_chat_cb_find(PurpleConvChat *chat, const char *name) { GList *l; - GaimConvChatBuddy *cb = NULL; + PurpleConvChatBuddy *cb = NULL; g_return_val_if_fail(chat != NULL, NULL); g_return_val_if_fail(name != NULL, NULL); - for (l = gaim_conv_chat_get_users(chat); l; l = l->next) { + for (l = purple_conv_chat_get_users(chat); l; l = l->next) { cb = l->data; - if (!gaim_utf8_strcasecmp(cb->name, name)) + if (!purple_utf8_strcasecmp(cb->name, name)) return cb; } @@ -1964,7 +1964,7 @@ } void -gaim_conv_chat_cb_destroy(GaimConvChatBuddy *cb) +purple_conv_chat_cb_destroy(PurpleConvChatBuddy *cb) { if (cb == NULL) return; @@ -1973,12 +1973,12 @@ g_free(cb->alias_key); g_free(cb->name); - GAIM_DBUS_UNREGISTER_POINTER(cb); + PURPLE_DBUS_UNREGISTER_POINTER(cb); g_free(cb); } const char * -gaim_conv_chat_cb_get_name(GaimConvChatBuddy *cb) +purple_conv_chat_cb_get_name(PurpleConvChatBuddy *cb) { g_return_val_if_fail(cb != NULL, NULL); @@ -1986,7 +1986,7 @@ } void * -gaim_conversations_get_handle(void) +purple_conversations_get_handle(void) { static int handle; @@ -1994,266 +1994,266 @@ } void -gaim_conversations_init(void) +purple_conversations_init(void) { - void *handle = gaim_conversations_get_handle(); + void *handle = purple_conversations_get_handle(); /********************************************************************** * Register preferences **********************************************************************/ /* Conversations */ - gaim_prefs_add_none("/core/conversations"); + purple_prefs_add_none("/core/conversations"); /* Conversations -> Chat */ - gaim_prefs_add_none("/core/conversations/chat"); - gaim_prefs_add_bool("/core/conversations/chat/show_nick_change", TRUE); + purple_prefs_add_none("/core/conversations/chat"); + purple_prefs_add_bool("/core/conversations/chat/show_nick_change", TRUE); /* Conversations -> IM */ - gaim_prefs_add_none("/core/conversations/im"); - gaim_prefs_add_bool("/core/conversations/im/send_typing", TRUE); + purple_prefs_add_none("/core/conversations/im"); + purple_prefs_add_bool("/core/conversations/im/send_typing", TRUE); /********************************************************************** * Register signals **********************************************************************/ - gaim_signal_register(handle, "writing-im-msg", - gaim_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER, - gaim_value_new(GAIM_TYPE_BOOLEAN), 5, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_ACCOUNT), - gaim_value_new(GAIM_TYPE_STRING), - gaim_value_new_outgoing(GAIM_TYPE_STRING), - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_CONVERSATION), - gaim_value_new(GAIM_TYPE_UINT)); - - gaim_signal_register(handle, "wrote-im-msg", - gaim_marshal_VOID__POINTER_POINTER_POINTER_POINTER_UINT, + purple_signal_register(handle, "writing-im-msg", + purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER, + purple_value_new(PURPLE_TYPE_BOOLEAN), 5, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_ACCOUNT), + purple_value_new(PURPLE_TYPE_STRING), + purple_value_new_outgoing(PURPLE_TYPE_STRING), + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_CONVERSATION), + purple_value_new(PURPLE_TYPE_UINT)); + + purple_signal_register(handle, "wrote-im-msg", + purple_marshal_VOID__POINTER_POINTER_POINTER_POINTER_UINT, NULL, 5, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_ACCOUNT), - gaim_value_new(GAIM_TYPE_STRING), - gaim_value_new(GAIM_TYPE_STRING), - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_CONVERSATION), - gaim_value_new(GAIM_TYPE_UINT)); - - gaim_signal_register(handle, "sending-im-msg", - gaim_marshal_VOID__POINTER_POINTER_POINTER, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_ACCOUNT), + purple_value_new(PURPLE_TYPE_STRING), + purple_value_new(PURPLE_TYPE_STRING), + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_CONVERSATION), + purple_value_new(PURPLE_TYPE_UINT)); + + purple_signal_register(handle, "sending-im-msg", + purple_marshal_VOID__POINTER_POINTER_POINTER, NULL, 3, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_ACCOUNT), - gaim_value_new(GAIM_TYPE_STRING), - gaim_value_new_outgoing(GAIM_TYPE_STRING)); - - gaim_signal_register(handle, "sent-im-msg", - gaim_marshal_VOID__POINTER_POINTER_POINTER, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_ACCOUNT), + purple_value_new(PURPLE_TYPE_STRING), + purple_value_new_outgoing(PURPLE_TYPE_STRING)); + + purple_signal_register(handle, "sent-im-msg", + purple_marshal_VOID__POINTER_POINTER_POINTER, NULL, 3, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_ACCOUNT), - gaim_value_new(GAIM_TYPE_STRING), - gaim_value_new(GAIM_TYPE_STRING)); - - gaim_signal_register(handle, "receiving-im-msg", - gaim_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER, - gaim_value_new(GAIM_TYPE_BOOLEAN), 5, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_ACCOUNT), - gaim_value_new_outgoing(GAIM_TYPE_STRING), - gaim_value_new_outgoing(GAIM_TYPE_STRING), - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_CONVERSATION), - gaim_value_new_outgoing(GAIM_TYPE_UINT)); - - gaim_signal_register(handle, "received-im-msg", - gaim_marshal_VOID__POINTER_POINTER_POINTER_POINTER_UINT, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_ACCOUNT), + purple_value_new(PURPLE_TYPE_STRING), + purple_value_new(PURPLE_TYPE_STRING)); + + purple_signal_register(handle, "receiving-im-msg", + purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER, + purple_value_new(PURPLE_TYPE_BOOLEAN), 5, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_ACCOUNT), + purple_value_new_outgoing(PURPLE_TYPE_STRING), + purple_value_new_outgoing(PURPLE_TYPE_STRING), + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_CONVERSATION), + purple_value_new_outgoing(PURPLE_TYPE_UINT)); + + purple_signal_register(handle, "received-im-msg", + purple_marshal_VOID__POINTER_POINTER_POINTER_POINTER_UINT, NULL, 5, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_ACCOUNT), - gaim_value_new(GAIM_TYPE_STRING), - gaim_value_new(GAIM_TYPE_STRING), - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_CONVERSATION), - gaim_value_new(GAIM_TYPE_UINT)); - - gaim_signal_register(handle, "writing-chat-msg", - gaim_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER, - gaim_value_new(GAIM_TYPE_BOOLEAN), 5, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_ACCOUNT), - gaim_value_new(GAIM_TYPE_STRING), - gaim_value_new_outgoing(GAIM_TYPE_STRING), - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_CONVERSATION), - gaim_value_new(GAIM_TYPE_UINT)); - - gaim_signal_register(handle, "wrote-chat-msg", - gaim_marshal_VOID__POINTER_POINTER_POINTER_POINTER_UINT, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_ACCOUNT), + purple_value_new(PURPLE_TYPE_STRING), + purple_value_new(PURPLE_TYPE_STRING), + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_CONVERSATION), + purple_value_new(PURPLE_TYPE_UINT)); + + purple_signal_register(handle, "writing-chat-msg", + purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER, + purple_value_new(PURPLE_TYPE_BOOLEAN), 5, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_ACCOUNT), + purple_value_new(PURPLE_TYPE_STRING), + purple_value_new_outgoing(PURPLE_TYPE_STRING), + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_CONVERSATION), + purple_value_new(PURPLE_TYPE_UINT)); + + purple_signal_register(handle, "wrote-chat-msg", + purple_marshal_VOID__POINTER_POINTER_POINTER_POINTER_UINT, NULL, 5, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_ACCOUNT), - gaim_value_new(GAIM_TYPE_STRING), - gaim_value_new(GAIM_TYPE_STRING), - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_CONVERSATION), - gaim_value_new(GAIM_TYPE_UINT)); - - gaim_signal_register(handle, "sending-chat-msg", - gaim_marshal_VOID__POINTER_POINTER_UINT, NULL, 3, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_ACCOUNT), - gaim_value_new_outgoing(GAIM_TYPE_STRING), - gaim_value_new(GAIM_TYPE_UINT)); - - gaim_signal_register(handle, "sent-chat-msg", - gaim_marshal_VOID__POINTER_POINTER_UINT, NULL, 3, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_ACCOUNT), - gaim_value_new(GAIM_TYPE_STRING), - gaim_value_new(GAIM_TYPE_UINT)); - - gaim_signal_register(handle, "receiving-chat-msg", - gaim_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER, - gaim_value_new(GAIM_TYPE_BOOLEAN), 5, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_ACCOUNT), - gaim_value_new_outgoing(GAIM_TYPE_STRING), - gaim_value_new_outgoing(GAIM_TYPE_STRING), - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_CONVERSATION), - gaim_value_new_outgoing(GAIM_TYPE_UINT)); - - gaim_signal_register(handle, "received-chat-msg", - gaim_marshal_VOID__POINTER_POINTER_POINTER_POINTER_UINT, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_ACCOUNT), + purple_value_new(PURPLE_TYPE_STRING), + purple_value_new(PURPLE_TYPE_STRING), + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_CONVERSATION), + purple_value_new(PURPLE_TYPE_UINT)); + + purple_signal_register(handle, "sending-chat-msg", + purple_marshal_VOID__POINTER_POINTER_UINT, NULL, 3, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_ACCOUNT), + purple_value_new_outgoing(PURPLE_TYPE_STRING), + purple_value_new(PURPLE_TYPE_UINT)); + + purple_signal_register(handle, "sent-chat-msg", + purple_marshal_VOID__POINTER_POINTER_UINT, NULL, 3, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_ACCOUNT), + purple_value_new(PURPLE_TYPE_STRING), + purple_value_new(PURPLE_TYPE_UINT)); + + purple_signal_register(handle, "receiving-chat-msg", + purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER, + purple_value_new(PURPLE_TYPE_BOOLEAN), 5, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_ACCOUNT), + purple_value_new_outgoing(PURPLE_TYPE_STRING), + purple_value_new_outgoing(PURPLE_TYPE_STRING), + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_CONVERSATION), + purple_value_new_outgoing(PURPLE_TYPE_UINT)); + + purple_signal_register(handle, "received-chat-msg", + purple_marshal_VOID__POINTER_POINTER_POINTER_POINTER_UINT, NULL, 5, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_ACCOUNT), - gaim_value_new(GAIM_TYPE_STRING), - gaim_value_new(GAIM_TYPE_STRING), - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_CONVERSATION), - gaim_value_new(GAIM_TYPE_UINT)); - - gaim_signal_register(handle, "conversation-created", - gaim_marshal_VOID__POINTER, NULL, 1, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_CONVERSATION)); - - gaim_signal_register(handle, "conversation-updated", - gaim_marshal_VOID__POINTER_UINT, NULL, 2, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_CONVERSATION), - gaim_value_new(GAIM_TYPE_UINT)); - - gaim_signal_register(handle, "deleting-conversation", - gaim_marshal_VOID__POINTER, NULL, 1, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_CONVERSATION)); - - gaim_signal_register(handle, "buddy-typing", - gaim_marshal_VOID__POINTER_POINTER, NULL, 2, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_ACCOUNT), - gaim_value_new(GAIM_TYPE_STRING)); - - gaim_signal_register(handle, "buddy-typed", - gaim_marshal_VOID__POINTER_POINTER, NULL, 2, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_ACCOUNT), - gaim_value_new(GAIM_TYPE_STRING)); - - gaim_signal_register(handle, "buddy-typing-stopped", - gaim_marshal_VOID__POINTER_POINTER, NULL, 2, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_ACCOUNT), - gaim_value_new(GAIM_TYPE_STRING)); - - gaim_signal_register(handle, "chat-buddy-joining", - gaim_marshal_BOOLEAN__POINTER_POINTER_UINT, - gaim_value_new(GAIM_TYPE_BOOLEAN), 3, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_CONVERSATION), - gaim_value_new(GAIM_TYPE_STRING), - gaim_value_new(GAIM_TYPE_UINT)); - - gaim_signal_register(handle, "chat-buddy-joined", - gaim_marshal_VOID__POINTER_POINTER_UINT_UINT, NULL, 4, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_CONVERSATION), - gaim_value_new(GAIM_TYPE_STRING), - gaim_value_new(GAIM_TYPE_UINT), - gaim_value_new(GAIM_TYPE_BOOLEAN)); - - gaim_signal_register(handle, "chat-buddy-flags", - gaim_marshal_VOID__POINTER_POINTER_UINT_UINT, NULL, 4, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_CONVERSATION), - gaim_value_new(GAIM_TYPE_STRING), - gaim_value_new(GAIM_TYPE_UINT), - gaim_value_new(GAIM_TYPE_UINT)); - - gaim_signal_register(handle, "chat-buddy-leaving", - gaim_marshal_BOOLEAN__POINTER_POINTER_POINTER, - gaim_value_new(GAIM_TYPE_BOOLEAN), 3, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_CONVERSATION), - gaim_value_new(GAIM_TYPE_STRING), - gaim_value_new(GAIM_TYPE_STRING)); - - gaim_signal_register(handle, "chat-buddy-left", - gaim_marshal_VOID__POINTER_POINTER_POINTER, NULL, 3, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_CONVERSATION), - gaim_value_new(GAIM_TYPE_STRING), - gaim_value_new(GAIM_TYPE_STRING)); - - gaim_signal_register(handle, "chat-inviting-user", - gaim_marshal_VOID__POINTER_POINTER_POINTER, NULL, 3, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_CONVERSATION), - gaim_value_new(GAIM_TYPE_STRING), - gaim_value_new_outgoing(GAIM_TYPE_STRING)); - - gaim_signal_register(handle, "chat-invited-user", - gaim_marshal_VOID__POINTER_POINTER_POINTER, NULL, 3, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_CONVERSATION), - gaim_value_new(GAIM_TYPE_STRING), - gaim_value_new(GAIM_TYPE_STRING)); - - gaim_signal_register(handle, "chat-invited", - gaim_marshal_INT__POINTER_POINTER_POINTER_POINTER_POINTER, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_ACCOUNT), + purple_value_new(PURPLE_TYPE_STRING), + purple_value_new(PURPLE_TYPE_STRING), + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_CONVERSATION), + purple_value_new(PURPLE_TYPE_UINT)); + + purple_signal_register(handle, "conversation-created", + purple_marshal_VOID__POINTER, NULL, 1, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_CONVERSATION)); + + purple_signal_register(handle, "conversation-updated", + purple_marshal_VOID__POINTER_UINT, NULL, 2, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_CONVERSATION), + purple_value_new(PURPLE_TYPE_UINT)); + + purple_signal_register(handle, "deleting-conversation", + purple_marshal_VOID__POINTER, NULL, 1, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_CONVERSATION)); + + purple_signal_register(handle, "buddy-typing", + purple_marshal_VOID__POINTER_POINTER, NULL, 2, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_ACCOUNT), + purple_value_new(PURPLE_TYPE_STRING)); + + purple_signal_register(handle, "buddy-typed", + purple_marshal_VOID__POINTER_POINTER, NULL, 2, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_ACCOUNT), + purple_value_new(PURPLE_TYPE_STRING)); + + purple_signal_register(handle, "buddy-typing-stopped", + purple_marshal_VOID__POINTER_POINTER, NULL, 2, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_ACCOUNT), + purple_value_new(PURPLE_TYPE_STRING)); + + purple_signal_register(handle, "chat-buddy-joining", + purple_marshal_BOOLEAN__POINTER_POINTER_UINT, + purple_value_new(PURPLE_TYPE_BOOLEAN), 3, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_CONVERSATION), + purple_value_new(PURPLE_TYPE_STRING), + purple_value_new(PURPLE_TYPE_UINT)); + + purple_signal_register(handle, "chat-buddy-joined", + purple_marshal_VOID__POINTER_POINTER_UINT_UINT, NULL, 4, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_CONVERSATION), + purple_value_new(PURPLE_TYPE_STRING), + purple_value_new(PURPLE_TYPE_UINT), + purple_value_new(PURPLE_TYPE_BOOLEAN)); + + purple_signal_register(handle, "chat-buddy-flags", + purple_marshal_VOID__POINTER_POINTER_UINT_UINT, NULL, 4, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_CONVERSATION), + purple_value_new(PURPLE_TYPE_STRING), + purple_value_new(PURPLE_TYPE_UINT), + purple_value_new(PURPLE_TYPE_UINT)); + + purple_signal_register(handle, "chat-buddy-leaving", + purple_marshal_BOOLEAN__POINTER_POINTER_POINTER, + purple_value_new(PURPLE_TYPE_BOOLEAN), 3, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_CONVERSATION), + purple_value_new(PURPLE_TYPE_STRING), + purple_value_new(PURPLE_TYPE_STRING)); + + purple_signal_register(handle, "chat-buddy-left", + purple_marshal_VOID__POINTER_POINTER_POINTER, NULL, 3, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_CONVERSATION), + purple_value_new(PURPLE_TYPE_STRING), + purple_value_new(PURPLE_TYPE_STRING)); + + purple_signal_register(handle, "chat-inviting-user", + purple_marshal_VOID__POINTER_POINTER_POINTER, NULL, 3, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_CONVERSATION), + purple_value_new(PURPLE_TYPE_STRING), + purple_value_new_outgoing(PURPLE_TYPE_STRING)); + + purple_signal_register(handle, "chat-invited-user", + purple_marshal_VOID__POINTER_POINTER_POINTER, NULL, 3, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_CONVERSATION), + purple_value_new(PURPLE_TYPE_STRING), + purple_value_new(PURPLE_TYPE_STRING)); + + purple_signal_register(handle, "chat-invited", + purple_marshal_INT__POINTER_POINTER_POINTER_POINTER_POINTER, NULL, 5, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_ACCOUNT), - gaim_value_new(GAIM_TYPE_STRING), - gaim_value_new(GAIM_TYPE_STRING), - gaim_value_new(GAIM_TYPE_STRING), - gaim_value_new(GAIM_TYPE_POINTER)); - - gaim_signal_register(handle, "chat-joined", - gaim_marshal_VOID__POINTER, NULL, 1, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_CONVERSATION)); - - gaim_signal_register(handle, "chat-left", - gaim_marshal_VOID__POINTER, NULL, 1, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_CONVERSATION)); - - gaim_signal_register(handle, "chat-topic-changed", - gaim_marshal_VOID__POINTER_POINTER_POINTER, NULL, 3, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_CONVERSATION), - gaim_value_new(GAIM_TYPE_STRING), - gaim_value_new(GAIM_TYPE_STRING)); + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_ACCOUNT), + purple_value_new(PURPLE_TYPE_STRING), + purple_value_new(PURPLE_TYPE_STRING), + purple_value_new(PURPLE_TYPE_STRING), + purple_value_new(PURPLE_TYPE_POINTER)); + + purple_signal_register(handle, "chat-joined", + purple_marshal_VOID__POINTER, NULL, 1, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_CONVERSATION)); + + purple_signal_register(handle, "chat-left", + purple_marshal_VOID__POINTER, NULL, 1, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_CONVERSATION)); + + purple_signal_register(handle, "chat-topic-changed", + purple_marshal_VOID__POINTER_POINTER_POINTER, NULL, 3, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_CONVERSATION), + purple_value_new(PURPLE_TYPE_STRING), + purple_value_new(PURPLE_TYPE_STRING)); } void -gaim_conversations_uninit(void) +purple_conversations_uninit(void) { while (conversations) - gaim_conversation_destroy((GaimConversation*)conversations->data); - gaim_signals_unregister_by_instance(gaim_conversations_get_handle()); + purple_conversation_destroy((PurpleConversation*)conversations->data); + purple_signals_unregister_by_instance(purple_conversations_get_handle()); }