Mercurial > pidgin
diff finch/gntconv.c @ 15822:32c366eeeb99
sed -ie 's/gaim/purple/g'
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Mon, 19 Mar 2007 07:01:17 +0000 |
| parents | 0e3a8505ebbe |
| children | 66dff3dfdea6 |
line wrap: on
line diff
--- a/finch/gntconv.c Mon Mar 19 06:11:46 2007 +0000 +++ b/finch/gntconv.c Mon Mar 19 07:01:17 2007 +0000 @@ -2,9 +2,9 @@ * @file gntconv.c GNT Conversation API * @ingroup gntui * - * 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. * @@ -29,7 +29,7 @@ #include <prefs.h> #include <util.h> -#include "gntgaim.h" +#include "finch.h" #include "gntaccount.h" #include "gntblist.h" #include "gntconv.h" @@ -43,7 +43,7 @@ #include "gntentry.h" #include "gnttextview.h" -#define PREF_ROOT "/gaim/gnt/conversations" +#define PREF_ROOT "/purple/gnt/conversations" #include "config.h" @@ -52,28 +52,28 @@ { const char *text = gnt_entry_get_text(GNT_ENTRY(ggconv->entry)); gboolean empty = (!text || !*text); - if (gaim_prefs_get_bool("/gaim/gnt/conversations/notify_typing")) { - GaimConversation *conv = ggconv->active_conv; - GaimConvIm *im = GAIM_CONV_IM(conv); + if (purple_prefs_get_bool("/purple/gnt/conversations/notify_typing")) { + PurpleConversation *conv = ggconv->active_conv; + PurpleConvIm *im = PURPLE_CONV_IM(conv); if (!empty) { - gboolean send = (gaim_conv_im_get_send_typed_timeout(im) == 0); + gboolean send = (purple_conv_im_get_send_typed_timeout(im) == 0); - gaim_conv_im_stop_send_typed_timeout(im); - gaim_conv_im_start_send_typed_timeout(im); - if (send || (gaim_conv_im_get_type_again(im) != 0 && - time(NULL) > gaim_conv_im_get_type_again(im))) { + purple_conv_im_stop_send_typed_timeout(im); + purple_conv_im_start_send_typed_timeout(im); + if (send || (purple_conv_im_get_type_again(im) != 0 && + time(NULL) > purple_conv_im_get_type_again(im))) { unsigned int timeout; - timeout = serv_send_typing(gaim_conversation_get_gc(conv), - gaim_conversation_get_name(conv), - GAIM_TYPING); - gaim_conv_im_set_type_again(im, timeout); + timeout = serv_send_typing(purple_conversation_get_gc(conv), + purple_conversation_get_name(conv), + PURPLE_TYPING); + purple_conv_im_set_type_again(im, timeout); } } else { - gaim_conv_im_stop_send_typed_timeout(im); + purple_conv_im_stop_send_typed_timeout(im); - serv_send_typing(gaim_conversation_get_gc(conv), - gaim_conversation_get_name(conv), - GAIM_NOT_TYPING); + serv_send_typing(purple_conversation_get_gc(conv), + purple_conversation_get_name(conv), + PURPLE_NOT_TYPING); } } } @@ -86,43 +86,43 @@ const char *text = gnt_entry_get_text(GNT_ENTRY(ggconv->entry)); if (*text == '/') { - GaimConversation *conv = ggconv->active_conv; - GaimCmdStatus status; + PurpleConversation *conv = ggconv->active_conv; + PurpleCmdStatus status; const char *cmdline = text + 1; char *error = NULL, *escape; escape = g_markup_escape_text(cmdline, -1); - status = gaim_cmd_do_command(conv, cmdline, escape, &error); + status = purple_cmd_do_command(conv, cmdline, escape, &error); g_free(escape); switch (status) { - case GAIM_CMD_STATUS_OK: + case PURPLE_CMD_STATUS_OK: break; - case GAIM_CMD_STATUS_NOT_FOUND: - gaim_conversation_write(conv, "", _("No such command."), - GAIM_MESSAGE_NO_LOG, time(NULL)); + case PURPLE_CMD_STATUS_NOT_FOUND: + purple_conversation_write(conv, "", _("No such command."), + PURPLE_MESSAGE_NO_LOG, time(NULL)); break; - case GAIM_CMD_STATUS_WRONG_ARGS: - gaim_conversation_write(conv, "", _("Syntax Error: You typed the wrong number of arguments " + case PURPLE_CMD_STATUS_WRONG_ARGS: + purple_conversation_write(conv, "", _("Syntax Error: You typed the wrong number of arguments " "to that command."), - GAIM_MESSAGE_NO_LOG, time(NULL)); + PURPLE_MESSAGE_NO_LOG, time(NULL)); break; - case GAIM_CMD_STATUS_FAILED: - gaim_conversation_write(conv, "", error ? error : _("Your command failed for an unknown reason."), - GAIM_MESSAGE_NO_LOG, time(NULL)); + case PURPLE_CMD_STATUS_FAILED: + purple_conversation_write(conv, "", error ? error : _("Your command failed for an unknown reason."), + PURPLE_MESSAGE_NO_LOG, time(NULL)); break; - case GAIM_CMD_STATUS_WRONG_TYPE: - if(gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM) - gaim_conversation_write(conv, "", _("That command only works in chats, not IMs."), - GAIM_MESSAGE_NO_LOG, time(NULL)); + case PURPLE_CMD_STATUS_WRONG_TYPE: + if(purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) + purple_conversation_write(conv, "", _("That command only works in chats, not IMs."), + PURPLE_MESSAGE_NO_LOG, time(NULL)); else - gaim_conversation_write(conv, "", _("That command only works in IMs, not chats."), - GAIM_MESSAGE_NO_LOG, time(NULL)); + purple_conversation_write(conv, "", _("That command only works in IMs, not chats."), + PURPLE_MESSAGE_NO_LOG, time(NULL)); break; - case GAIM_CMD_STATUS_WRONG_PRPL: - gaim_conversation_write(conv, "", _("That command doesn't work on this protocol."), - GAIM_MESSAGE_NO_LOG, time(NULL)); + case PURPLE_CMD_STATUS_WRONG_PRPL: + purple_conversation_write(conv, "", _("That command doesn't work on this protocol."), + PURPLE_MESSAGE_NO_LOG, time(NULL)); break; } g_free(error); @@ -137,23 +137,23 @@ else { char *escape = g_markup_escape_text(text, -1); - char *apos = gaim_strreplace(escape, "'", "'"); + char *apos = purple_strreplace(escape, "'", "'"); g_free(escape); escape = apos; - switch (gaim_conversation_get_type(ggconv->active_conv)) + switch (purple_conversation_get_type(ggconv->active_conv)) { - case GAIM_CONV_TYPE_IM: - gaim_conv_im_send_with_flags(GAIM_CONV_IM(ggconv->active_conv), escape, GAIM_MESSAGE_SEND); + case PURPLE_CONV_TYPE_IM: + purple_conv_im_send_with_flags(PURPLE_CONV_IM(ggconv->active_conv), escape, PURPLE_MESSAGE_SEND); break; - case GAIM_CONV_TYPE_CHAT: - gaim_conv_chat_send(GAIM_CONV_CHAT(ggconv->active_conv), escape); + case PURPLE_CONV_TYPE_CHAT: + purple_conv_chat_send(PURPLE_CONV_CHAT(ggconv->active_conv), escape); break; default: g_free(escape); g_return_val_if_reached(FALSE); } g_free(escape); - gaim_idle_touch(); + purple_idle_touch(); } gnt_entry_add_to_history(GNT_ENTRY(ggconv->entry), text); gnt_entry_clear(GNT_ENTRY(ggconv->entry)); @@ -186,9 +186,9 @@ GList *list = ggconv->list; ggconv->window = NULL; while (list) { - GaimConversation *conv = list->data; + PurpleConversation *conv = list->data; list = list->next; - gaim_conversation_destroy(conv); + purple_conversation_destroy(conv); } } @@ -197,61 +197,61 @@ { int w, h; gnt_widget_get_size(widget, &w, &h); - gaim_prefs_set_int(PREF_ROOT "/size/width", w); - gaim_prefs_set_int(PREF_ROOT "/size/height", h); + purple_prefs_set_int(PREF_ROOT "/size/width", w); + purple_prefs_set_int(PREF_ROOT "/size/height", h); } static void save_position_cb(GntWidget *w, int x, int y) { - gaim_prefs_set_int(PREF_ROOT "/position/x", x); - gaim_prefs_set_int(PREF_ROOT "/position/y", y); + purple_prefs_set_int(PREF_ROOT "/position/x", x); + purple_prefs_set_int(PREF_ROOT "/position/y", y); } -static GaimConversation * -find_conv_with_contact(GaimConversation *conv) +static PurpleConversation * +find_conv_with_contact(PurpleConversation *conv) { - GaimBlistNode *node; - GaimBuddy *buddy = gaim_find_buddy(conv->account, conv->name); - GaimConversation *ret = NULL; + PurpleBlistNode *node; + PurpleBuddy *buddy = purple_find_buddy(conv->account, conv->name); + PurpleConversation *ret = NULL; if (!buddy) return NULL; - for (node = ((GaimBlistNode*)buddy)->parent->child; node; node = node->next) { - if (node == (GaimBlistNode*)buddy) + for (node = ((PurpleBlistNode*)buddy)->parent->child; node; node = node->next) { + if (node == (PurpleBlistNode*)buddy) continue; - if ((ret = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, - ((GaimBuddy*)node)->name, ((GaimBuddy*)node)->account)) != NULL) + if ((ret = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, + ((PurpleBuddy*)node)->name, ((PurpleBuddy*)node)->account)) != NULL) break; } return ret; } static char * -get_conversation_title(GaimConversation *conv, GaimAccount *account) +get_conversation_title(PurpleConversation *conv, PurpleAccount *account) { - return g_strdup_printf(_("%s (%s -- %s)"), gaim_conversation_get_title(conv), - gaim_account_get_username(account), gaim_account_get_protocol_name(account)); + return g_strdup_printf(_("%s (%s -- %s)"), purple_conversation_get_title(conv), + purple_account_get_username(account), purple_account_get_protocol_name(account)); } static void -update_buddy_typing(GaimAccount *account, const char *who, gpointer null) +update_buddy_typing(PurpleAccount *account, const char *who, gpointer null) { - GaimConversation *conv; + PurpleConversation *conv; FinchConv *ggc; - GaimConvIm *im = NULL; + PurpleConvIm *im = NULL; char *title, *str; - conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, who, account); + conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, who, account); if (!conv) return; - im = GAIM_CONV_IM(conv); + im = PURPLE_CONV_IM(conv); ggc = conv->ui_data; - if (gaim_conv_im_get_typing_state(im) == GAIM_TYPING) { + if (purple_conv_im_get_typing_state(im) == PURPLE_TYPING) { int scroll; str = get_conversation_title(conv, account); title = g_strdup_printf(_("%s [%s]"), str, @@ -259,7 +259,7 @@ g_free(str); scroll = gnt_text_view_get_lines_below(GNT_TEXT_VIEW(ggc->tv)); - str = g_strdup_printf(_("\n%s is typing..."), gaim_conversation_get_name(conv)); + str = g_strdup_printf(_("\n%s is typing..."), purple_conversation_get_name(conv)); /* Updating is a little buggy. So just remove and add a new one */ gnt_text_view_tag_change(GNT_TEXT_VIEW(ggc->tv), "typing", NULL, TRUE); gnt_text_view_append_text_with_tag(GNT_TEXT_VIEW(ggc->tv), @@ -283,13 +283,13 @@ } static void -finch_create_conversation(GaimConversation *conv) +finch_create_conversation(PurpleConversation *conv) { FinchConv *ggc = conv->ui_data; char *title; - GaimConversationType type; - GaimConversation *cc; - GaimAccount *account; + PurpleConversationType type; + PurpleConversation *cc; + PurpleAccount *account; if (ggc) return; @@ -309,8 +309,8 @@ 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); title = get_conversation_title(conv, account); ggc->window = gnt_box_new(FALSE, TRUE); @@ -322,8 +322,8 @@ ggc->tv = gnt_text_view_new(); gnt_box_add_widget(GNT_BOX(ggc->window), ggc->tv); gnt_widget_set_name(ggc->tv, "conversation-window-textview"); - gnt_widget_set_size(ggc->tv, gaim_prefs_get_int(PREF_ROOT "/size/width"), - gaim_prefs_get_int(PREF_ROOT "/size/height")); + gnt_widget_set_size(ggc->tv, purple_prefs_get_int(PREF_ROOT "/size/width"), + purple_prefs_get_int(PREF_ROOT "/size/height")); ggc->entry = gnt_entry_new(NULL); gnt_box_add_widget(GNT_BOX(ggc->window), ggc->entry); @@ -335,26 +335,26 @@ g_signal_connect_after(G_OBJECT(ggc->entry), "key_pressed", G_CALLBACK(entry_key_pressed), ggc); g_signal_connect(G_OBJECT(ggc->window), "destroy", G_CALLBACK(closing_window), ggc); - gnt_widget_set_position(ggc->window, gaim_prefs_get_int(PREF_ROOT "/position/x"), - gaim_prefs_get_int(PREF_ROOT "/position/y")); + gnt_widget_set_position(ggc->window, purple_prefs_get_int(PREF_ROOT "/position/x"), + purple_prefs_get_int(PREF_ROOT "/position/y")); gnt_widget_show(ggc->window); g_signal_connect(G_OBJECT(ggc->tv), "size_changed", G_CALLBACK(size_changed_cb), NULL); g_signal_connect(G_OBJECT(ggc->window), "position_set", G_CALLBACK(save_position_cb), NULL); - if (type == GAIM_CONV_TYPE_IM) { + if (type == PURPLE_CONV_TYPE_IM) { g_signal_connect(G_OBJECT(ggc->entry), "text_changed", G_CALLBACK(send_typing_notification), ggc); - gaim_signal_connect(gaim_conversations_get_handle(), "buddy-typing", finch_conv_get_handle(), - GAIM_CALLBACK(update_buddy_typing), NULL); - gaim_signal_connect(gaim_conversations_get_handle(), "buddy-typing-stopped", finch_conv_get_handle(), - GAIM_CALLBACK(update_buddy_typing), NULL); + purple_signal_connect(purple_conversations_get_handle(), "buddy-typing", finch_conv_get_handle(), + PURPLE_CALLBACK(update_buddy_typing), NULL); + purple_signal_connect(purple_conversations_get_handle(), "buddy-typing-stopped", finch_conv_get_handle(), + PURPLE_CALLBACK(update_buddy_typing), NULL); } g_free(title); } static void -finch_destroy_conversation(GaimConversation *conv) +finch_destroy_conversation(PurpleConversation *conv) { /* do stuff here */ FinchConv *ggc = conv->ui_data; @@ -369,8 +369,8 @@ } static void -finch_write_common(GaimConversation *conv, const char *who, const char *message, - GaimMessageFlags flags, time_t mtime) +finch_write_common(PurpleConversation *conv, const char *who, const char *message, + PurpleMessageFlags flags, time_t mtime) { FinchConv *ggconv = conv->ui_data; char *strip, *newline; @@ -381,7 +381,7 @@ g_return_if_fail(ggconv != NULL); if (ggconv->active_conv != conv) { - if (flags & (GAIM_MESSAGE_SEND | GAIM_MESSAGE_RECV)) + if (flags & (PURPLE_MESSAGE_SEND | PURPLE_MESSAGE_RECV)) finch_conversation_set_active(conv); else return; @@ -393,20 +393,20 @@ gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv), "\n", GNT_TEXT_FLAG_NORMAL); /* Unnecessary to print the timestamp for delayed message */ - if (!(flags & GAIM_MESSAGE_DELAYED) && - gaim_prefs_get_bool("/gaim/gnt/conversations/timestamps")) + if (!(flags & PURPLE_MESSAGE_DELAYED) && + purple_prefs_get_bool("/purple/gnt/conversations/timestamps")) gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv), - gaim_utf8_strftime("(%H:%M:%S) ", localtime(&mtime)), GNT_TEXT_FLAG_DIM); + purple_utf8_strftime("(%H:%M:%S) ", localtime(&mtime)), GNT_TEXT_FLAG_DIM); - if (flags & GAIM_MESSAGE_AUTO_RESP) + if (flags & PURPLE_MESSAGE_AUTO_RESP) gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv), _("<AUTO-REPLY> "), GNT_TEXT_FLAG_BOLD); - if (who && *who && (flags & (GAIM_MESSAGE_SEND | GAIM_MESSAGE_RECV))) + if (who && *who && (flags & (PURPLE_MESSAGE_SEND | PURPLE_MESSAGE_RECV))) { char * name = NULL; - if (gaim_message_meify((char*)message, -1)) + if (purple_message_meify((char*)message, -1)) name = g_strdup_printf("*** %s ", who); else name = g_strdup_printf("%s: ", who); @@ -418,14 +418,14 @@ else fl = GNT_TEXT_FLAG_DIM; - if (flags & GAIM_MESSAGE_ERROR) + if (flags & PURPLE_MESSAGE_ERROR) fl |= GNT_TEXT_FLAG_BOLD; - if (flags & GAIM_MESSAGE_NICK) + if (flags & PURPLE_MESSAGE_NICK) fl |= GNT_TEXT_FLAG_UNDERLINE; /* XXX: Remove this workaround when textview can parse messages. */ - newline = gaim_strdup_withhtml(message); - strip = gaim_markup_strip_html(newline); + newline = purple_strdup_withhtml(message); + strip = purple_markup_strip_html(newline); gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv), strip, fl); @@ -433,7 +433,7 @@ g_free(strip); if (notify) { - strip = g_strdup_printf(_("\n%s is typing..."), gaim_conversation_get_name(conv)); + strip = g_strdup_printf(_("\n%s is typing..."), purple_conversation_get_name(conv)); gnt_text_view_append_text_with_tag(GNT_TEXT_VIEW(ggconv->tv), strip, GNT_TEXT_FLAG_DIM, "typing"); g_free(strip); @@ -442,45 +442,45 @@ if (pos <= 1) gnt_text_view_scroll(GNT_TEXT_VIEW(ggconv->tv), 0); - if (flags & (GAIM_MESSAGE_RECV | GAIM_MESSAGE_NICK | GAIM_MESSAGE_ERROR)) + if (flags & (PURPLE_MESSAGE_RECV | PURPLE_MESSAGE_NICK | PURPLE_MESSAGE_ERROR)) gnt_widget_set_urgent(ggconv->tv); } static void -finch_write_chat(GaimConversation *conv, const char *who, const char *message, - GaimMessageFlags flags, time_t mtime) +finch_write_chat(PurpleConversation *conv, const char *who, const char *message, + PurpleMessageFlags flags, time_t mtime) { - gaim_conversation_write(conv, who, message, flags, mtime); + purple_conversation_write(conv, who, message, flags, mtime); } static void -finch_write_im(GaimConversation *conv, const char *who, const char *message, - GaimMessageFlags flags, time_t mtime) +finch_write_im(PurpleConversation *conv, const char *who, const char *message, + PurpleMessageFlags flags, time_t mtime) { - GaimAccount *account = gaim_conversation_get_account(conv); - if (flags & GAIM_MESSAGE_SEND) + PurpleAccount *account = purple_conversation_get_account(conv); + if (flags & PURPLE_MESSAGE_SEND) { - who = gaim_connection_get_display_name(gaim_account_get_connection(account)); + who = purple_connection_get_display_name(purple_account_get_connection(account)); if (!who) - who = gaim_account_get_alias(account); + who = purple_account_get_alias(account); if (!who) - who = gaim_account_get_username(account); + who = purple_account_get_username(account); } - else if (flags & GAIM_MESSAGE_RECV) + else if (flags & PURPLE_MESSAGE_RECV) { - GaimBuddy *buddy; - who = gaim_conversation_get_name(conv); - buddy = gaim_find_buddy(account, who); + PurpleBuddy *buddy; + who = purple_conversation_get_name(conv); + buddy = purple_find_buddy(account, who); if (buddy) - who = gaim_buddy_get_contact_alias(buddy); + who = purple_buddy_get_contact_alias(buddy); } - gaim_conversation_write(conv, who, message, flags, mtime); + purple_conversation_write(conv, who, message, flags, mtime); } static void -finch_write_conv(GaimConversation *conv, const char *who, const char *alias, - const char *message, GaimMessageFlags flags, time_t mtime) +finch_write_conv(PurpleConversation *conv, const char *who, const char *alias, + const char *message, PurpleMessageFlags flags, time_t mtime) { const char *name; if (alias && *alias) @@ -494,7 +494,7 @@ } static void -finch_chat_add_users(GaimConversation *conv, GList *users, gboolean new_arrivals) +finch_chat_add_users(PurpleConversation *conv, GList *users, gboolean new_arrivals) { FinchConv *ggc = conv->ui_data; GntEntry *entry = GNT_ENTRY(ggc->entry); @@ -507,7 +507,7 @@ for (iter = users; iter; iter = iter->next) { - GaimConvChatBuddy *cbuddy = iter->data; + PurpleConvChatBuddy *cbuddy = iter->data; char *str; if ((str = cbuddy->alias) == NULL) @@ -515,21 +515,21 @@ g_string_append_printf(string, "[ %s ]", str); } - gaim_conversation_write(conv, NULL, string->str, - GAIM_MESSAGE_SYSTEM, time(NULL)); + purple_conversation_write(conv, NULL, string->str, + PURPLE_MESSAGE_SYSTEM, time(NULL)); g_string_free(string, TRUE); } for (; users; users = users->next) { - GaimConvChatBuddy *cbuddy = users->data; + PurpleConvChatBuddy *cbuddy = users->data; gnt_entry_add_suggest(entry, cbuddy->name); gnt_entry_add_suggest(entry, cbuddy->alias); } } static void -finch_chat_rename_user(GaimConversation *conv, const char *old, const char *new_n, const char *new_a) +finch_chat_rename_user(PurpleConversation *conv, const char *old, const char *new_n, const char *new_a) { /* Update the name for string completion */ FinchConv *ggc = conv->ui_data; @@ -540,7 +540,7 @@ } static void -finch_chat_remove_user(GaimConversation *conv, GList *list) +finch_chat_remove_user(PurpleConversation *conv, GList *list) { /* Remove the name from string completion */ FinchConv *ggc = conv->ui_data; @@ -550,11 +550,11 @@ } static void -finch_chat_update_user(GaimConversation *conv, const char *user) +finch_chat_update_user(PurpleConversation *conv, const char *user) { } -static GaimConversationUiOps conv_ui_ops = +static PurpleConversationUiOps conv_ui_ops = { .create_conversation = finch_create_conversation, .destroy_conversation = finch_destroy_conversation, @@ -572,79 +572,79 @@ .custom_smiley_close = NULL }; -GaimConversationUiOps *finch_conv_get_ui_ops() +PurpleConversationUiOps *finch_conv_get_ui_ops() { return &conv_ui_ops; } /* Xerox */ -static GaimCmdRet -say_command_cb(GaimConversation *conv, +static PurpleCmdRet +say_command_cb(PurpleConversation *conv, const char *cmd, char **args, char **error, void *data) { - if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM) - gaim_conv_im_send(GAIM_CONV_IM(conv), args[0]); - else if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT) - gaim_conv_chat_send(GAIM_CONV_CHAT(conv), args[0]); + if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) + purple_conv_im_send(PURPLE_CONV_IM(conv), args[0]); + else if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) + purple_conv_chat_send(PURPLE_CONV_CHAT(conv), args[0]); - return GAIM_CMD_RET_OK; + return PURPLE_CMD_RET_OK; } /* Xerox */ -static GaimCmdRet -me_command_cb(GaimConversation *conv, +static PurpleCmdRet +me_command_cb(PurpleConversation *conv, const char *cmd, char **args, char **error, void *data) { char *tmp; tmp = g_strdup_printf("/me %s", args[0]); - if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM) - gaim_conv_im_send(GAIM_CONV_IM(conv), tmp); - else if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT) - gaim_conv_chat_send(GAIM_CONV_CHAT(conv), tmp); + if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) + purple_conv_im_send(PURPLE_CONV_IM(conv), tmp); + else if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) + purple_conv_chat_send(PURPLE_CONV_CHAT(conv), tmp); g_free(tmp); - return GAIM_CMD_RET_OK; + return PURPLE_CMD_RET_OK; } /* Xerox */ -static GaimCmdRet -debug_command_cb(GaimConversation *conv, +static PurpleCmdRet +debug_command_cb(PurpleConversation *conv, const char *cmd, char **args, char **error, void *data) { char *tmp, *markup; - GaimCmdStatus status; + PurpleCmdStatus status; if (!g_ascii_strcasecmp(args[0], "version")) { tmp = g_strdup_printf("me is using %s.", VERSION); markup = g_markup_escape_text(tmp, -1); - status = gaim_cmd_do_command(conv, tmp, markup, error); + status = purple_cmd_do_command(conv, tmp, markup, error); g_free(tmp); g_free(markup); return status; } else { - gaim_conversation_write(conv, NULL, _("Supported debug options are: version"), - GAIM_MESSAGE_NO_LOG|GAIM_MESSAGE_ERROR, time(NULL)); - return GAIM_CMD_STATUS_OK; + purple_conversation_write(conv, NULL, _("Supported debug options are: version"), + PURPLE_MESSAGE_NO_LOG|PURPLE_MESSAGE_ERROR, time(NULL)); + return PURPLE_CMD_STATUS_OK; } } /* Xerox */ -static GaimCmdRet -clear_command_cb(GaimConversation *conv, +static PurpleCmdRet +clear_command_cb(PurpleConversation *conv, const char *cmd, char **args, char **error, void *data) { FinchConv *ggconv = conv->ui_data; gnt_text_view_clear(GNT_TEXT_VIEW(ggconv->tv)); - return GAIM_CMD_STATUS_OK; + return PURPLE_CMD_STATUS_OK; } /* Xerox */ -static GaimCmdRet -help_command_cb(GaimConversation *conv, +static PurpleCmdRet +help_command_cb(PurpleConversation *conv, const char *cmd, char **args, char **error, void *data) { GList *l, *text; @@ -652,7 +652,7 @@ if (args[0] != NULL) { s = g_string_new(""); - text = gaim_cmd_help(conv, args[0]); + text = purple_cmd_help(conv, args[0]); if (text) { for (l = text; l; l = l->next) @@ -667,7 +667,7 @@ s = g_string_new(_("Use \"/help <command>\" for help on a specific command.\n" "The following commands are available in this context:\n")); - text = gaim_cmd_list(conv); + text = purple_cmd_list(conv); for (l = text; l; l = l->next) if (l->next) g_string_append_printf(s, "%s, ", (char *)l->data); @@ -676,65 +676,65 @@ g_list_free(text); } - gaim_conversation_write(conv, NULL, s->str, GAIM_MESSAGE_NO_LOG, time(NULL)); + purple_conversation_write(conv, NULL, s->str, PURPLE_MESSAGE_NO_LOG, time(NULL)); g_string_free(s, TRUE); - return GAIM_CMD_STATUS_OK; + return PURPLE_CMD_STATUS_OK; } -static GaimCmdRet -cmd_show_window(GaimConversation *conv, const char *cmd, char **args, char **error, gpointer data) +static PurpleCmdRet +cmd_show_window(PurpleConversation *conv, const char *cmd, char **args, char **error, gpointer data) { void (*callback)() = data; callback(); - return GAIM_CMD_STATUS_OK; + return PURPLE_CMD_STATUS_OK; } void finch_conversation_init() { - gaim_prefs_add_none(PREF_ROOT); - gaim_prefs_add_none(PREF_ROOT "/size"); - gaim_prefs_add_int(PREF_ROOT "/size/width", 70); - gaim_prefs_add_int(PREF_ROOT "/size/height", 20); - gaim_prefs_add_none(PREF_ROOT "/position"); - gaim_prefs_add_int(PREF_ROOT "/position/x", 0); - gaim_prefs_add_int(PREF_ROOT "/position/y", 0); + purple_prefs_add_none(PREF_ROOT); + purple_prefs_add_none(PREF_ROOT "/size"); + purple_prefs_add_int(PREF_ROOT "/size/width", 70); + purple_prefs_add_int(PREF_ROOT "/size/height", 20); + purple_prefs_add_none(PREF_ROOT "/position"); + purple_prefs_add_int(PREF_ROOT "/position/x", 0); + purple_prefs_add_int(PREF_ROOT "/position/y", 0); /* Xerox the commands */ - gaim_cmd_register("say", "S", GAIM_CMD_P_DEFAULT, - GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_IM, NULL, + purple_cmd_register("say", "S", PURPLE_CMD_P_DEFAULT, + PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_IM, NULL, say_command_cb, _("say <message>: Send a message normally as if you weren't using a command."), NULL); - gaim_cmd_register("me", "S", GAIM_CMD_P_DEFAULT, - GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_IM, NULL, + purple_cmd_register("me", "S", PURPLE_CMD_P_DEFAULT, + PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_IM, NULL, me_command_cb, _("me <action>: Send an IRC style action to a buddy or chat."), NULL); - gaim_cmd_register("debug", "w", GAIM_CMD_P_DEFAULT, - GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_IM, NULL, + purple_cmd_register("debug", "w", PURPLE_CMD_P_DEFAULT, + PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_IM, NULL, debug_command_cb, _("debug <option>: Send various debug information to the current conversation."), NULL); - gaim_cmd_register("clear", "", GAIM_CMD_P_DEFAULT, - GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_IM, NULL, + purple_cmd_register("clear", "", PURPLE_CMD_P_DEFAULT, + PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_IM, NULL, clear_command_cb, _("clear: Clears the conversation scrollback."), NULL); - gaim_cmd_register("help", "w", GAIM_CMD_P_DEFAULT, - GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_IM | GAIM_CMD_FLAG_ALLOW_WRONG_ARGS, NULL, + purple_cmd_register("help", "w", PURPLE_CMD_P_DEFAULT, + PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_IM | PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS, NULL, help_command_cb, _("help <command>: Help on a specific command."), NULL); /* Now some commands to bring up some other windows */ - gaim_cmd_register("plugins", "", GAIM_CMD_P_DEFAULT, - GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_IM, NULL, + purple_cmd_register("plugins", "", PURPLE_CMD_P_DEFAULT, + PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_IM, NULL, cmd_show_window, _("plugins: Show the plugins window."), finch_plugins_show_all); - gaim_cmd_register("buddylist", "", GAIM_CMD_P_DEFAULT, - GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_IM, NULL, + purple_cmd_register("buddylist", "", PURPLE_CMD_P_DEFAULT, + PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_IM, NULL, cmd_show_window, _("buddylist: Show the buddylist."), finch_blist_show); - gaim_cmd_register("accounts", "", GAIM_CMD_P_DEFAULT, - GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_IM, NULL, + purple_cmd_register("accounts", "", PURPLE_CMD_P_DEFAULT, + PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_IM, NULL, cmd_show_window, _("accounts: Show the accounts window."), finch_accounts_show_all); - gaim_cmd_register("debugwin", "", GAIM_CMD_P_DEFAULT, - GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_IM, NULL, + purple_cmd_register("debugwin", "", PURPLE_CMD_P_DEFAULT, + PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_IM, NULL, cmd_show_window, _("debugwin: Show the debug window."), finch_debug_window_show); - gaim_cmd_register("prefs", "", GAIM_CMD_P_DEFAULT, - GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_IM, NULL, + purple_cmd_register("prefs", "", PURPLE_CMD_P_DEFAULT, + PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_IM, NULL, cmd_show_window, _("prefs: Show the preference window."), finch_prefs_show_all); - gaim_cmd_register("status", "", GAIM_CMD_P_DEFAULT, - GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_IM, NULL, + purple_cmd_register("status", "", PURPLE_CMD_P_DEFAULT, + PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_IM, NULL, cmd_show_window, _("statuses: Show the savedstatuses window."), finch_savedstatus_show_all); } @@ -742,17 +742,17 @@ { } -void finch_conversation_set_active(GaimConversation *conv) +void finch_conversation_set_active(PurpleConversation *conv) { FinchConv *ggconv = conv->ui_data; - GaimAccount *account; + PurpleAccount *account; char *title; g_return_if_fail(ggconv); g_return_if_fail(g_list_find(ggconv->list, conv)); ggconv->active_conv = conv; - account = gaim_conversation_get_account(conv); + account = purple_conversation_get_account(conv); title = get_conversation_title(conv, account); gnt_screen_rename_widget(ggconv->window, title); g_free(title);