Mercurial > pidgin
diff libpurple/plugins/tcl/tcl_cmds.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 | 31a6bfedf7be |
| children | 4ca97b26a8fb |
line wrap: on
line diff
--- a/libpurple/plugins/tcl/tcl_cmds.c Mon Mar 19 06:11:46 2007 +0000 +++ b/libpurple/plugins/tcl/tcl_cmds.c Mon Mar 19 07:01:17 2007 +0000 @@ -1,7 +1,7 @@ /** - * @file tcl_cmds.c Commands for the Gaim Tcl plugin bindings + * @file tcl_cmds.c Commands for the Purple Tcl plugin bindings * - * gaim + * purple * * Copyright (C) 2003 Ethan Blanton <eblanton@cs.purdue.edu> * @@ -34,23 +34,23 @@ #include "prefs.h" #include "core.h" -#include "tcl_gaim.h" +#include "tcl_purple.h" -static GaimAccount *tcl_validate_account(Tcl_Obj *obj, Tcl_Interp *interp); -static GaimConversation *tcl_validate_conversation(Tcl_Obj *obj, Tcl_Interp *interp); -static GaimConnection *tcl_validate_gc(Tcl_Obj *obj, Tcl_Interp *interp); +static PurpleAccount *tcl_validate_account(Tcl_Obj *obj, Tcl_Interp *interp); +static PurpleConversation *tcl_validate_conversation(Tcl_Obj *obj, Tcl_Interp *interp); +static PurpleConnection *tcl_validate_gc(Tcl_Obj *obj, Tcl_Interp *interp); -static GaimAccount *tcl_validate_account(Tcl_Obj *obj, Tcl_Interp *interp) +static PurpleAccount *tcl_validate_account(Tcl_Obj *obj, Tcl_Interp *interp) { - GaimAccount *account; + PurpleAccount *account; GList *cur; - account = gaim_tcl_ref_get(interp, obj, GaimTclRefAccount); + account = purple_tcl_ref_get(interp, obj, PurpleTclRefAccount); if (account == NULL) return NULL; - for (cur = gaim_accounts_get_all(); cur != NULL; cur = g_list_next(cur)) { + for (cur = purple_accounts_get_all(); cur != NULL; cur = g_list_next(cur)) { if (account == cur->data) return account; } @@ -59,17 +59,17 @@ return NULL; } -static GaimConversation *tcl_validate_conversation(Tcl_Obj *obj, Tcl_Interp *interp) +static PurpleConversation *tcl_validate_conversation(Tcl_Obj *obj, Tcl_Interp *interp) { - GaimConversation *convo; + PurpleConversation *convo; GList *cur; - convo = gaim_tcl_ref_get(interp, obj, GaimTclRefConversation); + convo = purple_tcl_ref_get(interp, obj, PurpleTclRefConversation); if (convo == NULL) return NULL; - for (cur = gaim_get_conversations(); cur != NULL; cur = g_list_next(cur)) { + for (cur = purple_get_conversations(); cur != NULL; cur = g_list_next(cur)) { if (convo == cur->data) return convo; } @@ -78,17 +78,17 @@ return NULL; } -static GaimConnection *tcl_validate_gc(Tcl_Obj *obj, Tcl_Interp *interp) +static PurpleConnection *tcl_validate_gc(Tcl_Obj *obj, Tcl_Interp *interp) { - GaimConnection *gc; + PurpleConnection *gc; GList *cur; - gc = gaim_tcl_ref_get(interp, obj, GaimTclRefConnection); + gc = purple_tcl_ref_get(interp, obj, PurpleTclRefConnection); if (gc == NULL) return NULL; - for (cur = gaim_connections_get_all(); cur != NULL; cur = g_list_next(cur)) { + for (cur = purple_connections_get_all(); cur != NULL; cur = g_list_next(cur)) { if (gc == cur->data) return gc; } @@ -114,10 +114,10 @@ enum { CMD_ACCOUNTLIST_ALL, CMD_ACCOUNTLIST_ONLINE } listopt; const char *alias; const GList *cur; - GaimAccount *account; - GaimStatus *status; - GaimStatusType *status_type; - GaimValue *value; + PurpleAccount *account; + PurpleStatus *status; + PurpleStatusType *status_type; + PurpleValue *value; char *attr_id; int error; int b, i; @@ -138,7 +138,7 @@ } if ((account = tcl_validate_account(objv[2], interp)) == NULL) return TCL_ERROR; - alias = gaim_account_get_alias(account); + alias = purple_account_get_alias(account); Tcl_SetStringObj(result, alias ? (char *)alias : "", -1); break; case CMD_ACCOUNT_CONNECT: @@ -148,11 +148,11 @@ } if ((account = tcl_validate_account(objv[2], interp)) == NULL) return TCL_ERROR; - if (!gaim_account_is_connected(account)) - gaim_account_connect(account); + if (!purple_account_is_connected(account)) + purple_account_connect(account); Tcl_SetObjResult(interp, - gaim_tcl_ref_new(GaimTclRefConnection, - gaim_account_get_connection(account))); + purple_tcl_ref_new(PurpleTclRefConnection, + purple_account_get_connection(account))); break; case CMD_ACCOUNT_CONNECTION: if (objc != 3) { @@ -163,8 +163,8 @@ if ((account = tcl_validate_account(objv[2], interp)) == NULL) return TCL_ERROR; Tcl_SetObjResult(interp, - gaim_tcl_ref_new(GaimTclRefConnection, - gaim_account_get_connection(account))); + purple_tcl_ref_new(PurpleTclRefConnection, + purple_account_get_connection(account))); break; case CMD_ACCOUNT_DISCONNECT: if (objc != 3) { @@ -173,7 +173,7 @@ } if ((account = tcl_validate_account(objv[2], interp)) == NULL) return TCL_ERROR; - gaim_account_disconnect(account); + purple_account_disconnect(account); break; case CMD_ACCOUNT_ENABLED: if (objc != 3 && objc != 4) { @@ -184,12 +184,12 @@ return TCL_ERROR; if (objc == 3) { Tcl_SetBooleanObj(result, - gaim_account_get_enabled(account, - gaim_core_get_ui())); + purple_account_get_enabled(account, + purple_core_get_ui())); } else { if ((error = Tcl_GetBooleanFromObj(interp, objv[3], &b)) != TCL_OK) return TCL_ERROR; - gaim_account_set_enabled(account, gaim_core_get_ui(), b); + purple_account_set_enabled(account, purple_core_get_ui(), b); } break; case CMD_ACCOUNT_FIND: @@ -197,17 +197,17 @@ Tcl_WrongNumArgs(interp, 2, objv, "username protocol"); return TCL_ERROR; } - account = gaim_accounts_find(Tcl_GetString(objv[2]), + account = purple_accounts_find(Tcl_GetString(objv[2]), Tcl_GetString(objv[3])); Tcl_SetObjResult(interp, - gaim_tcl_ref_new(GaimTclRefAccount, account)); + purple_tcl_ref_new(PurpleTclRefAccount, account)); break; case CMD_ACCOUNT_HANDLE: if (objc != 2) { Tcl_WrongNumArgs(interp, 2, objv, ""); return TCL_ERROR; } - Tcl_SetIntObj(result, (int)gaim_accounts_get_handle()); + Tcl_SetIntObj(result, (int)purple_accounts_get_handle()); break; case CMD_ACCOUNT_ISCONNECTED: if (objc != 3) { @@ -216,7 +216,7 @@ } if ((account = tcl_validate_account(objv[2], interp)) == NULL) return TCL_ERROR; - Tcl_SetBooleanObj(result, gaim_account_is_connected(account)); + Tcl_SetBooleanObj(result, purple_account_is_connected(account)); break; case CMD_ACCOUNT_LIST: listopt = CMD_ACCOUNTLIST_ALL; @@ -229,11 +229,11 @@ return error; } list = Tcl_NewListObj(0, NULL); - for (cur = gaim_accounts_get_all(); cur != NULL; cur = g_list_next(cur)) { + for (cur = purple_accounts_get_all(); cur != NULL; cur = g_list_next(cur)) { account = cur->data; - if (listopt == CMD_ACCOUNTLIST_ONLINE && !gaim_account_is_connected(account)) + if (listopt == CMD_ACCOUNTLIST_ONLINE && !purple_account_is_connected(account)) continue; - elem = gaim_tcl_ref_new(GaimTclRefAccount, account); + elem = purple_tcl_ref_new(PurpleTclRefAccount, account); Tcl_ListObjAppendElement(interp, list, elem); } Tcl_SetObjResult(interp, list); @@ -245,8 +245,8 @@ } if ((account = tcl_validate_account(objv[2], interp)) == NULL) return TCL_ERROR; - Tcl_SetObjResult(interp, gaim_tcl_ref_new(GaimTclRefPresence, - gaim_account_get_presence(account))); + Tcl_SetObjResult(interp, purple_tcl_ref_new(PurpleTclRefPresence, + purple_account_get_presence(account))); break; case CMD_ACCOUNT_PROTOCOL: if (objc != 3) { @@ -255,7 +255,7 @@ } if ((account = tcl_validate_account(objv[2], interp)) == NULL) return TCL_ERROR; - Tcl_SetStringObj(result, (char *)gaim_account_get_protocol_id(account), -1); + Tcl_SetStringObj(result, (char *)purple_account_get_protocol_id(account), -1); break; case CMD_ACCOUNT_STATUS: if (objc < 3) { @@ -266,51 +266,51 @@ return TCL_ERROR; if (objc == 3) { Tcl_SetObjResult(interp, - gaim_tcl_ref_new(GaimTclRefStatus, - gaim_account_get_active_status(account))); + purple_tcl_ref_new(PurpleTclRefStatus, + purple_account_get_active_status(account))); } else { GList *l = NULL; if (objc % 2) { Tcl_SetStringObj(result, "name without value setting status", -1); return TCL_ERROR; } - status = gaim_account_get_status(account, Tcl_GetString(objv[3])); + status = purple_account_get_status(account, Tcl_GetString(objv[3])); if (status == NULL) { Tcl_SetStringObj(result, "invalid status for account", -1); return TCL_ERROR; } for (i = 4; i < objc; i += 2) { attr_id = Tcl_GetString(objv[i]); - value = gaim_status_get_attr_value(status, attr_id); + value = purple_status_get_attr_value(status, attr_id); if (value == NULL) { Tcl_SetStringObj(result, "invalid attribute for account", -1); return TCL_ERROR; } - switch (gaim_value_get_type(value)) { - case GAIM_TYPE_BOOLEAN: + switch (purple_value_get_type(value)) { + case PURPLE_TYPE_BOOLEAN: error = Tcl_GetBooleanFromObj(interp, objv[i + 1], &b); if (error != TCL_OK) return error; l = g_list_append(l, attr_id); l = g_list_append(l, GINT_TO_POINTER(b)); break; - case GAIM_TYPE_INT: + case PURPLE_TYPE_INT: error = Tcl_GetIntFromObj(interp, objv[i + 1], &b); if (error != TCL_OK) return error; l = g_list_append(l, attr_id); l = g_list_append(l, GINT_TO_POINTER(b)); break; - case GAIM_TYPE_STRING: + case PURPLE_TYPE_STRING: l = g_list_append(l, attr_id); l = g_list_append(l, Tcl_GetString(objv[i + 1])); break; default: - Tcl_SetStringObj(result, "unknown GaimValue type", -1); + Tcl_SetStringObj(result, "unknown PurpleValue type", -1); return TCL_ERROR; } } - gaim_account_set_status_list(account, Tcl_GetString(objv[3]), TRUE, l); + purple_account_set_status_list(account, Tcl_GetString(objv[3]), TRUE, l); g_list_free(l); } break; @@ -322,10 +322,10 @@ if ((account = tcl_validate_account(objv[2], interp)) == NULL) return TCL_ERROR; if (objc == 4) { - status_type = gaim_account_get_status_type(account, + status_type = purple_account_get_status_type(account, Tcl_GetString(objv[3])); } else { - GaimStatusPrimitive primitive; + PurpleStatusPrimitive primitive; if (strcmp(Tcl_GetString(objv[3]), "-primitive")) { Tcl_SetStringObj(result, "bad option \"", -1); Tcl_AppendObjToObj(result, objv[3]); @@ -333,8 +333,8 @@ "\": should be -primitive", -1); return TCL_ERROR; } - primitive = gaim_primitive_get_type_from_id(Tcl_GetString(objv[4])); - status_type = gaim_account_get_status_type_with_primitive(account, + primitive = purple_primitive_get_type_from_id(Tcl_GetString(objv[4])); + status_type = purple_account_get_status_type_with_primitive(account, primitive); } if (status_type == NULL) { @@ -342,7 +342,7 @@ return TCL_ERROR; } Tcl_SetObjResult(interp, - gaim_tcl_ref_new(GaimTclRefStatusType, + purple_tcl_ref_new(PurpleTclRefStatusType, status_type)); break; case CMD_ACCOUNT_STATUS_TYPES: @@ -353,10 +353,10 @@ if ((account = tcl_validate_account(objv[2], interp)) == NULL) return TCL_ERROR; list = Tcl_NewListObj(0, NULL); - for (cur = gaim_account_get_status_types(account); cur != NULL; + for (cur = purple_account_get_status_types(account); cur != NULL; cur = g_list_next(cur)) { Tcl_ListObjAppendElement(interp, list, - gaim_tcl_ref_new(GaimTclRefStatusType, + purple_tcl_ref_new(PurpleTclRefStatusType, cur->data)); } Tcl_SetObjResult(interp, list); @@ -368,17 +368,17 @@ } if ((account = tcl_validate_account(objv[2], interp)) == NULL) return TCL_ERROR; - Tcl_SetStringObj(result, (char *)gaim_account_get_username(account), -1); + Tcl_SetStringObj(result, (char *)purple_account_get_username(account), -1); break; } return TCL_OK; } -static GaimBlistNode *tcl_list_to_buddy(Tcl_Interp *interp, int count, Tcl_Obj **elems) +static PurpleBlistNode *tcl_list_to_buddy(Tcl_Interp *interp, int count, Tcl_Obj **elems) { - GaimBlistNode *node = NULL; - GaimAccount *account; + PurpleBlistNode *node = NULL; + PurpleAccount *account; char *name; char *type; @@ -393,9 +393,9 @@ return NULL; if (!strcmp(type, "buddy")) { - node = (GaimBlistNode *)gaim_find_buddy(account, name); + node = (PurpleBlistNode *)purple_find_buddy(account, name); } else if (!strcmp(type, "group")) { - node = (GaimBlistNode *)gaim_blist_find_chat(account, name); + node = (PurpleBlistNode *)purple_blist_find_chat(account, name); } return node; @@ -406,11 +406,11 @@ Tcl_Obj *list, *tclgroup, *tclgrouplist, *tclcontact, *tclcontactlist, *tclbud, **elems, *result; const char *cmds[] = { "alias", "handle", "info", "list", NULL }; enum { CMD_BUDDY_ALIAS, CMD_BUDDY_HANDLE, CMD_BUDDY_INFO, CMD_BUDDY_LIST } cmd; - GaimBuddyList *blist; - GaimBlistNode *node, *gnode, *bnode; - GaimAccount *account; - GaimBuddy *bud; - GaimChat *cnode; + PurpleBuddyList *blist; + PurpleBlistNode *node, *gnode, *bnode; + PurpleAccount *account; + PurpleBuddy *bud; + PurpleChat *cnode; int error, all = 0, count; if (objc < 2) { @@ -432,10 +432,10 @@ return error; if ((node = tcl_list_to_buddy(interp, count, elems)) == NULL) return TCL_ERROR; - if (node->type == GAIM_BLIST_CHAT_NODE) - Tcl_SetStringObj(result, ((GaimChat *)node)->alias, -1); - else if (node->type == GAIM_BLIST_BUDDY_NODE) - Tcl_SetStringObj(result, (char *)gaim_buddy_get_alias((GaimBuddy *)node), -1); + if (node->type == PURPLE_BLIST_CHAT_NODE) + Tcl_SetStringObj(result, ((PurpleChat *)node)->alias, -1); + else if (node->type == PURPLE_BLIST_BUDDY_NODE) + Tcl_SetStringObj(result, (char *)purple_buddy_get_alias((PurpleBuddy *)node), -1); return TCL_OK; break; case CMD_BUDDY_HANDLE: @@ -443,7 +443,7 @@ Tcl_WrongNumArgs(interp, 2, objv, ""); return TCL_ERROR; } - Tcl_SetIntObj(result, (int)gaim_blist_get_handle()); + Tcl_SetIntObj(result, (int)purple_blist_get_handle()); break; case CMD_BUDDY_INFO: if (objc != 3 && objc != 4) { @@ -463,11 +463,11 @@ } if ((account = tcl_validate_account(elems[2], interp)) == NULL) return TCL_ERROR; - serv_get_info(gaim_account_get_connection(account), Tcl_GetString(elems[1])); + serv_get_info(purple_account_get_connection(account), Tcl_GetString(elems[1])); } else { if ((account = tcl_validate_account(objv[2], interp)) == NULL) return TCL_ERROR; - serv_get_info(gaim_account_get_connection(account), Tcl_GetString(objv[3])); + serv_get_info(purple_account_get_connection(account), Tcl_GetString(objv[3])); } break; case CMD_BUDDY_LIST: @@ -481,16 +481,16 @@ } } list = Tcl_NewListObj(0, NULL); - blist = gaim_get_blist(); + blist = purple_get_blist(); for (gnode = blist->root; gnode != NULL; gnode = gnode->next) { tclgroup = Tcl_NewListObj(0, NULL); Tcl_ListObjAppendElement(interp, tclgroup, Tcl_NewStringObj("group", -1)); Tcl_ListObjAppendElement(interp, tclgroup, - Tcl_NewStringObj(((GaimGroup *)gnode)->name, -1)); + Tcl_NewStringObj(((PurpleGroup *)gnode)->name, -1)); tclgrouplist = Tcl_NewListObj(0, NULL); for (node = gnode->child; node != NULL; node = node->next) { switch (node->type) { - case GAIM_BLIST_CONTACT_NODE: + case PURPLE_BLIST_CONTACT_NODE: tclcontact = Tcl_NewListObj(0, NULL); Tcl_IncrRefCount(tclcontact); Tcl_ListObjAppendElement(interp, tclcontact, Tcl_NewStringObj("contact", -1)); @@ -498,16 +498,16 @@ Tcl_IncrRefCount(tclcontactlist); count = 0; for (bnode = node->child; bnode != NULL; bnode = bnode ->next) { - if (bnode->type != GAIM_BLIST_BUDDY_NODE) + if (bnode->type != PURPLE_BLIST_BUDDY_NODE) continue; - bud = (GaimBuddy *)bnode; - if (!all && !gaim_account_is_connected(bud->account)) + bud = (PurpleBuddy *)bnode; + if (!all && !purple_account_is_connected(bud->account)) continue; count++; tclbud = Tcl_NewListObj(0, NULL); Tcl_ListObjAppendElement(interp, tclbud, Tcl_NewStringObj("buddy", -1)); Tcl_ListObjAppendElement(interp, tclbud, Tcl_NewStringObj(bud->name, -1)); - Tcl_ListObjAppendElement(interp, tclbud, gaim_tcl_ref_new(GaimTclRefAccount, bud->account)); + Tcl_ListObjAppendElement(interp, tclbud, purple_tcl_ref_new(PurpleTclRefAccount, bud->account)); Tcl_ListObjAppendElement(interp, tclcontactlist, tclbud); } if (count) { @@ -517,18 +517,18 @@ Tcl_DecrRefCount(tclcontact); Tcl_DecrRefCount(tclcontactlist); break; - case GAIM_BLIST_CHAT_NODE: - cnode = (GaimChat *)node; - if (!all && !gaim_account_is_connected(cnode->account)) + case PURPLE_BLIST_CHAT_NODE: + cnode = (PurpleChat *)node; + if (!all && !purple_account_is_connected(cnode->account)) continue; tclbud = Tcl_NewListObj(0, NULL); Tcl_ListObjAppendElement(interp, tclbud, Tcl_NewStringObj("chat", -1)); Tcl_ListObjAppendElement(interp, tclbud, Tcl_NewStringObj(cnode->alias, -1)); - Tcl_ListObjAppendElement(interp, tclbud, gaim_tcl_ref_new(GaimTclRefAccount, cnode->account)); + Tcl_ListObjAppendElement(interp, tclbud, purple_tcl_ref_new(PurpleTclRefAccount, cnode->account)); Tcl_ListObjAppendElement(interp, tclgrouplist, tclbud); break; default: - gaim_debug(GAIM_DEBUG_WARNING, "tcl", "Unexpected buddy type %d", node->type); + purple_debug(PURPLE_DEBUG_WARNING, "tcl", "Unexpected buddy type %d", node->type); continue; } } @@ -548,7 +548,7 @@ enum { CMD_CMD_REGISTER, CMD_CMD_UNREGISTER } cmd; struct tcl_cmd_handler *handler; Tcl_Obj *result = Tcl_GetObjResult(interp); - GaimCmdId id; + PurpleCmdId id; int error; if (objc < 2) { @@ -613,7 +613,7 @@ enum { CMD_CONN_ACCOUNT, CMD_CONN_DISPLAYNAME, CMD_CONN_HANDLE, CMD_CONN_LIST } cmd; int error; GList *cur; - GaimConnection *gc; + PurpleConnection *gc; if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "subcommand ?args?"); @@ -632,8 +632,8 @@ if ((gc = tcl_validate_gc(objv[2], interp)) == NULL) return TCL_ERROR; Tcl_SetObjResult(interp, - gaim_tcl_ref_new(GaimTclRefAccount, - gaim_connection_get_account(gc))); + purple_tcl_ref_new(PurpleTclRefAccount, + purple_connection_get_account(gc))); break; case CMD_CONN_DISPLAYNAME: if (objc != 3) { @@ -642,14 +642,14 @@ } if ((gc = tcl_validate_gc(objv[2], interp)) == NULL) return TCL_ERROR; - Tcl_SetStringObj(result, (char *)gaim_connection_get_display_name(gc), -1); + Tcl_SetStringObj(result, (char *)purple_connection_get_display_name(gc), -1); break; case CMD_CONN_HANDLE: if (objc != 2) { Tcl_WrongNumArgs(interp, 2, objv, ""); return TCL_ERROR; } - Tcl_SetIntObj(result, (int)gaim_connections_get_handle()); + Tcl_SetIntObj(result, (int)purple_connections_get_handle()); break; case CMD_CONN_LIST: if (objc != 2) { @@ -657,8 +657,8 @@ return TCL_ERROR; } list = Tcl_NewListObj(0, NULL); - for (cur = gaim_connections_get_all(); cur != NULL; cur = g_list_next(cur)) { - elem = gaim_tcl_ref_new(GaimTclRefConnection, cur->data); + for (cur = purple_connections_get_all(); cur != NULL; cur = g_list_next(cur)) { + elem = purple_tcl_ref_new(PurpleTclRefConnection, cur->data); Tcl_ListObjAppendElement(interp, list, elem); } Tcl_SetObjResult(interp, list); @@ -677,9 +677,9 @@ enum { CMD_CONV_WRITE_SEND, CMD_CONV_WRITE_RECV, CMD_CONV_WRITE_SYSTEM } style; const char *newopts[] = { "-chat", "-im" }; enum { CMD_CONV_NEW_CHAT, CMD_CONV_NEW_IM } newopt; - GaimConversation *convo; - GaimAccount *account; - GaimConversationType type; + PurpleConversation *convo; + PurpleAccount *account; + PurpleConversationType type; GList *cur; char *opt, *from, *what; int error, argsused, flags = 0; @@ -701,22 +701,22 @@ account = NULL; if ((account = tcl_validate_account(objv[2], interp)) == NULL) return TCL_ERROR; - convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_ANY, + convo = purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY, Tcl_GetString(objv[3]), account); - Tcl_SetObjResult(interp, gaim_tcl_ref_new(GaimTclRefConversation, convo)); + Tcl_SetObjResult(interp, purple_tcl_ref_new(PurpleTclRefConversation, convo)); break; case CMD_CONV_HANDLE: if (objc != 2) { Tcl_WrongNumArgs(interp, 2, objv, ""); return TCL_ERROR; } - Tcl_SetIntObj(result, (int)gaim_conversations_get_handle()); + Tcl_SetIntObj(result, (int)purple_conversations_get_handle()); break; case CMD_CONV_LIST: list = Tcl_NewListObj(0, NULL); - for (cur = gaim_get_conversations(); cur != NULL; cur = g_list_next(cur)) { - elem = gaim_tcl_ref_new(GaimTclRefConversation, cur->data); + for (cur = purple_get_conversations(); cur != NULL; cur = g_list_next(cur)) { + elem = purple_tcl_ref_new(PurpleTclRefConversation, cur->data); Tcl_ListObjAppendElement(interp, list, elem); } Tcl_SetObjResult(interp, list); @@ -727,7 +727,7 @@ return TCL_ERROR; } argsused = 2; - type = GAIM_CONV_TYPE_IM; + type = PURPLE_CONV_TYPE_IM; while (argsused < objc) { opt = Tcl_GetString(objv[argsused]); if (*opt == '-') { @@ -737,10 +737,10 @@ argsused++; switch (newopt) { case CMD_CONV_NEW_CHAT: - type = GAIM_CONV_TYPE_CHAT; + type = PURPLE_CONV_TYPE_CHAT; break; case CMD_CONV_NEW_IM: - type = GAIM_CONV_TYPE_IM; + type = PURPLE_CONV_TYPE_IM; break; } } else { @@ -753,8 +753,8 @@ } if ((account = tcl_validate_account(objv[argsused++], interp)) == NULL) return TCL_ERROR; - convo = gaim_conversation_new(type, account, Tcl_GetString(objv[argsused])); - Tcl_SetObjResult(interp, gaim_tcl_ref_new(GaimTclRefConversation, convo)); + convo = purple_conversation_new(type, account, Tcl_GetString(objv[argsused])); + Tcl_SetObjResult(interp, purple_tcl_ref_new(PurpleTclRefConversation, convo)); break; case CMD_CONV_WRITE: if (objc != 6) { @@ -770,19 +770,19 @@ switch (style) { case CMD_CONV_WRITE_SEND: - flags = GAIM_MESSAGE_SEND; + flags = PURPLE_MESSAGE_SEND; break; case CMD_CONV_WRITE_RECV: - flags = GAIM_MESSAGE_RECV; + flags = PURPLE_MESSAGE_RECV; break; case CMD_CONV_WRITE_SYSTEM: - flags = GAIM_MESSAGE_SYSTEM; + flags = PURPLE_MESSAGE_SYSTEM; break; } - if (gaim_conversation_get_type(convo) == GAIM_CONV_TYPE_CHAT) - gaim_conv_chat_write(GAIM_CONV_CHAT(convo), from, what, flags, time(NULL)); + if (purple_conversation_get_type(convo) == PURPLE_CONV_TYPE_CHAT) + purple_conv_chat_write(PURPLE_CONV_CHAT(convo), from, what, flags, time(NULL)); else - gaim_conv_im_write(GAIM_CONV_IM(convo), from, what, flags, time(NULL)); + purple_conv_im_write(PURPLE_CONV_IM(convo), from, what, flags, time(NULL)); break; case CMD_CONV_NAME: if (objc != 3) { @@ -792,7 +792,7 @@ if ((convo = tcl_validate_conversation(objv[2], interp)) == NULL) return TCL_ERROR; - Tcl_SetStringObj(result, (char *)gaim_conversation_get_name(convo), -1); + Tcl_SetStringObj(result, (char *)purple_conversation_get_name(convo), -1); break; case CMD_CONV_TITLE: if (objc != 3) { @@ -802,7 +802,7 @@ if ((convo = tcl_validate_conversation(objv[2], interp)) == NULL) return TCL_ERROR; - Tcl_SetStringObj(result, (char *)gaim_conversation_get_title(convo), -1); + Tcl_SetStringObj(result, (char *)purple_conversation_get_title(convo), -1); break; case CMD_CONV_SEND: if (objc != 4) { @@ -812,10 +812,10 @@ if ((convo = tcl_validate_conversation(objv[2], interp)) == NULL) return TCL_ERROR; what = Tcl_GetString(objv[3]); - if (gaim_conversation_get_type(convo) == GAIM_CONV_TYPE_CHAT) - gaim_conv_chat_send(GAIM_CONV_CHAT(convo), what); + if (purple_conversation_get_type(convo) == PURPLE_CONV_TYPE_CHAT) + purple_conv_chat_send(PURPLE_CONV_CHAT(convo), what); else - gaim_conv_im_send(GAIM_CONV_IM(convo), what); + purple_conv_im_send(PURPLE_CONV_IM(convo), what); break; } @@ -843,14 +843,14 @@ Tcl_WrongNumArgs(interp, 2, objv, ""); return TCL_ERROR; } - Tcl_SetIntObj(result, (int)gaim_get_core()); + Tcl_SetIntObj(result, (int)purple_get_core()); break; case CMD_CORE_QUIT: if (objc != 2) { Tcl_WrongNumArgs(interp, 2, objv, ""); return TCL_ERROR; } - gaim_core_quit(); + purple_core_quit(); break; } @@ -862,7 +862,7 @@ char *category, *message; int lev; const char *levels[] = { "-misc", "-info", "-warning", "-error", NULL }; - GaimDebugLevel levelind[] = { GAIM_DEBUG_MISC, GAIM_DEBUG_INFO, GAIM_DEBUG_WARNING, GAIM_DEBUG_ERROR }; + PurpleDebugLevel levelind[] = { PURPLE_DEBUG_MISC, PURPLE_DEBUG_INFO, PURPLE_DEBUG_WARNING, PURPLE_DEBUG_ERROR }; int error; if (objc != 4) { @@ -877,7 +877,7 @@ category = Tcl_GetString(objv[2]); message = Tcl_GetString(objv[3]); - gaim_debug(levelind[lev], category, "%s\n", message); + purple_debug(levelind[lev], category, "%s\n", message); return TCL_OK; } @@ -886,7 +886,7 @@ { int error, type; const char *opts[] = { "-error", "-warning", "-info", NULL }; - GaimNotifyMsgType optind[] = { GAIM_NOTIFY_MSG_ERROR, GAIM_NOTIFY_MSG_WARNING, GAIM_NOTIFY_MSG_INFO }; + PurpleNotifyMsgType optind[] = { PURPLE_NOTIFY_MSG_ERROR, PURPLE_NOTIFY_MSG_WARNING, PURPLE_NOTIFY_MSG_INFO }; char *title, *msg1, *msg2; if (objc < 4 || objc > 5) { @@ -908,7 +908,7 @@ msg2 = Tcl_GetString(objv[4]); } - gaim_notify_message(_tcl_plugin, optind[type], title, msg1, msg2, NULL, NULL); + purple_notify_message(_tcl_plugin, optind[type], title, msg1, msg2, NULL, NULL); return TCL_OK; } @@ -934,7 +934,7 @@ Tcl_WrongNumArgs(interp, 2, objv, ""); return TCL_ERROR; } - Tcl_SetIntObj(result, (int)gaim_plugins_get_handle()); + Tcl_SetIntObj(result, (int)purple_plugins_get_handle()); break; } @@ -948,7 +948,7 @@ enum { CMD_PREFS_GET, CMD_PREFS_SET, CMD_PREFS_TYPE } cmd; /* char *types[] = { "none", "boolean", "int", "string", "stringlist", NULL }; */ /* enum { TCL_PREFS_NONE, TCL_PREFS_BOOL, TCL_PREFS_INT, TCL_PREFS_STRING, TCL_PREFS_STRINGLIST } type; */ - GaimPrefType preftype; + PurplePrefType preftype; GList *cur; int error, intval, nelem, i; @@ -967,23 +967,23 @@ Tcl_WrongNumArgs(interp, 1, objv, "path"); return TCL_ERROR; } - preftype = gaim_prefs_get_type(Tcl_GetString(objv[2])); + preftype = purple_prefs_get_type(Tcl_GetString(objv[2])); switch (preftype) { - case GAIM_PREF_NONE: + case PURPLE_PREF_NONE: Tcl_SetStringObj(result, "pref type none", -1); return TCL_ERROR; break; - case GAIM_PREF_BOOLEAN: - Tcl_SetBooleanObj(result, gaim_prefs_get_bool(Tcl_GetString(objv[2]))); + case PURPLE_PREF_BOOLEAN: + Tcl_SetBooleanObj(result, purple_prefs_get_bool(Tcl_GetString(objv[2]))); break; - case GAIM_PREF_INT: - Tcl_SetIntObj(result, gaim_prefs_get_int(Tcl_GetString(objv[2]))); + case PURPLE_PREF_INT: + Tcl_SetIntObj(result, purple_prefs_get_int(Tcl_GetString(objv[2]))); break; - case GAIM_PREF_STRING: - Tcl_SetStringObj(result, (char *)gaim_prefs_get_string(Tcl_GetString(objv[2])), -1); + case PURPLE_PREF_STRING: + Tcl_SetStringObj(result, (char *)purple_prefs_get_string(Tcl_GetString(objv[2])), -1); break; - case GAIM_PREF_STRING_LIST: - cur = gaim_prefs_get_string_list(Tcl_GetString(objv[2])); + case PURPLE_PREF_STRING_LIST: + cur = purple_prefs_get_string_list(Tcl_GetString(objv[2])); list = Tcl_NewListObj(0, NULL); while (cur != NULL) { elem = Tcl_NewStringObj((char *)cur->data, -1); @@ -993,7 +993,7 @@ Tcl_SetObjResult(interp, list); break; default: - gaim_debug(GAIM_DEBUG_ERROR, "tcl", "tcl does not know about pref type %d\n", preftype); + purple_debug(PURPLE_DEBUG_ERROR, "tcl", "tcl does not know about pref type %d\n", preftype); Tcl_SetStringObj(result, "unknown pref type", -1); return TCL_ERROR; } @@ -1003,37 +1003,37 @@ Tcl_WrongNumArgs(interp, 1, objv, "path value"); return TCL_ERROR; } - preftype = gaim_prefs_get_type(Tcl_GetString(objv[2])); + preftype = purple_prefs_get_type(Tcl_GetString(objv[2])); switch (preftype) { - case GAIM_PREF_NONE: + case PURPLE_PREF_NONE: Tcl_SetStringObj(result, "bad path or pref type none", -1); return TCL_ERROR; break; - case GAIM_PREF_BOOLEAN: + case PURPLE_PREF_BOOLEAN: if ((error = Tcl_GetBooleanFromObj(interp, objv[3], &intval)) != TCL_OK) return error; - gaim_prefs_set_bool(Tcl_GetString(objv[2]), intval); + purple_prefs_set_bool(Tcl_GetString(objv[2]), intval); break; - case GAIM_PREF_INT: + case PURPLE_PREF_INT: if ((error = Tcl_GetIntFromObj(interp, objv[3], &intval)) != TCL_OK) return error; - gaim_prefs_set_int(Tcl_GetString(objv[2]), intval); + purple_prefs_set_int(Tcl_GetString(objv[2]), intval); break; - case GAIM_PREF_STRING: - gaim_prefs_set_string(Tcl_GetString(objv[2]), Tcl_GetString(objv[3])); + case PURPLE_PREF_STRING: + purple_prefs_set_string(Tcl_GetString(objv[2]), Tcl_GetString(objv[3])); break; - case GAIM_PREF_STRING_LIST: + case PURPLE_PREF_STRING_LIST: if ((error = Tcl_ListObjGetElements(interp, objv[3], &nelem, &elems)) != TCL_OK) return error; cur = NULL; for (i = 0; i < nelem; i++) { cur = g_list_append(cur, (gpointer)Tcl_GetString(elems[i])); } - gaim_prefs_set_string_list(Tcl_GetString(objv[2]), cur); + purple_prefs_set_string_list(Tcl_GetString(objv[2]), cur); g_list_free(cur); break; default: - gaim_debug(GAIM_DEBUG_ERROR, "tcl", "tcl does not know about pref type %d\n", preftype); + purple_debug(PURPLE_DEBUG_ERROR, "tcl", "tcl does not know about pref type %d\n", preftype); return TCL_ERROR; } break; @@ -1042,25 +1042,25 @@ Tcl_WrongNumArgs(interp, 1, objv, "path"); return TCL_ERROR; } - preftype = gaim_prefs_get_type(Tcl_GetString(objv[2])); + preftype = purple_prefs_get_type(Tcl_GetString(objv[2])); switch (preftype) { - case GAIM_PREF_NONE: + case PURPLE_PREF_NONE: Tcl_SetStringObj(result, "none", -1); break; - case GAIM_PREF_BOOLEAN: + case PURPLE_PREF_BOOLEAN: Tcl_SetStringObj(result, "boolean", -1); break; - case GAIM_PREF_INT: + case PURPLE_PREF_INT: Tcl_SetStringObj(result, "int", -1); break; - case GAIM_PREF_STRING: + case PURPLE_PREF_STRING: Tcl_SetStringObj(result, "string", -1); break; - case GAIM_PREF_STRING_LIST: + case PURPLE_PREF_STRING_LIST: Tcl_SetStringObj(result, "stringlist", -1); break; default: - gaim_debug(GAIM_DEBUG_ERROR, "tcl", "tcl does not know about pref type %d\n", preftype); + purple_debug(PURPLE_DEBUG_ERROR, "tcl", "tcl does not know about pref type %d\n", preftype); Tcl_SetStringObj(result, "unknown", -1); } break; @@ -1081,7 +1081,7 @@ CMD_PRESENCE_STATUS, CMD_PRESENCE_STATUSES } cmd; Tcl_Obj *result = Tcl_GetObjResult(interp); Tcl_Obj *list, *elem; - GaimPresence *presence; + PurplePresence *presence; const GList *cur; int error, idle, idle_time, login_time; @@ -1099,28 +1099,28 @@ Tcl_WrongNumArgs(interp, 2, objv, "presence"); return TCL_ERROR; } - if ((presence = gaim_tcl_ref_get(interp, objv[2], GaimTclRefPresence)) == NULL) + if ((presence = purple_tcl_ref_get(interp, objv[2], PurpleTclRefPresence)) == NULL) return TCL_ERROR; - Tcl_SetObjResult(interp, gaim_tcl_ref_new(GaimTclRefAccount, - gaim_presence_get_account(presence))); + Tcl_SetObjResult(interp, purple_tcl_ref_new(PurpleTclRefAccount, + purple_presence_get_account(presence))); break; case CMD_PRESENCE_ACTIVE_STATUS: if (objc != 3 && objc != 4 && objc != 5) { Tcl_WrongNumArgs(interp, 2, objv, "presence [?status_id? | ?-primitive primitive?]"); return TCL_ERROR; } - if ((presence = gaim_tcl_ref_get(interp, objv[2], GaimTclRefPresence)) == NULL) + if ((presence = purple_tcl_ref_get(interp, objv[2], PurpleTclRefPresence)) == NULL) return TCL_ERROR; if (objc == 3) { Tcl_SetObjResult(interp, - gaim_tcl_ref_new(GaimTclRefStatus, - gaim_presence_get_active_status(presence))); + purple_tcl_ref_new(PurpleTclRefStatus, + purple_presence_get_active_status(presence))); } else if (objc == 4) { Tcl_SetBooleanObj(result, - gaim_presence_is_status_active(presence, + purple_presence_is_status_active(presence, Tcl_GetString(objv[3]))); } else { - GaimStatusPrimitive primitive; + PurpleStatusPrimitive primitive; if (strcmp(Tcl_GetString(objv[3]), "-primitive")) { Tcl_SetStringObj(result, "bad option \"", -1); Tcl_AppendObjToObj(result, objv[3]); @@ -1128,13 +1128,13 @@ "\": should be -primitive", -1); return TCL_ERROR; } - primitive = gaim_primitive_get_type_from_id(Tcl_GetString(objv[4])); - if (primitive == GAIM_STATUS_UNSET) { + primitive = purple_primitive_get_type_from_id(Tcl_GetString(objv[4])); + if (primitive == PURPLE_STATUS_UNSET) { Tcl_SetStringObj(result, "invalid primitive ", -1); Tcl_AppendObjToObj(result, objv[4]); return TCL_ERROR; } - Tcl_SetBooleanObj(result, gaim_presence_is_status_primitive_active(presence, primitive)); + Tcl_SetBooleanObj(result, purple_presence_is_status_primitive_active(presence, primitive)); break; } break; @@ -1143,37 +1143,37 @@ Tcl_WrongNumArgs(interp, 2, objv, "presence"); return TCL_ERROR; } - if ((presence = gaim_tcl_ref_get(interp, objv[2], GaimTclRefPresence)) == NULL) + if ((presence = purple_tcl_ref_get(interp, objv[2], PurpleTclRefPresence)) == NULL) return TCL_ERROR; - Tcl_SetBooleanObj(result, gaim_presence_is_available(presence)); + Tcl_SetBooleanObj(result, purple_presence_is_available(presence)); break; case CMD_PRESENCE_CHAT_USER: if (objc != 3) { Tcl_WrongNumArgs(interp, 2, objv, "presence"); return TCL_ERROR; } - if ((presence = gaim_tcl_ref_get(interp, objv[2], GaimTclRefPresence)) == NULL) + if ((presence = purple_tcl_ref_get(interp, objv[2], PurpleTclRefPresence)) == NULL) return TCL_ERROR; - Tcl_SetStringObj(result, gaim_presence_get_chat_user(presence), -1); + Tcl_SetStringObj(result, purple_presence_get_chat_user(presence), -1); break; case CMD_PRESENCE_CONTEXT: if (objc != 3) { Tcl_WrongNumArgs(interp, 2, objv, "presence"); return TCL_ERROR; } - if ((presence = gaim_tcl_ref_get(interp, objv[2], GaimTclRefPresence)) == NULL) + if ((presence = purple_tcl_ref_get(interp, objv[2], PurpleTclRefPresence)) == NULL) return TCL_ERROR; - switch (gaim_presence_get_context(presence)) { - case GAIM_PRESENCE_CONTEXT_UNSET: + switch (purple_presence_get_context(presence)) { + case PURPLE_PRESENCE_CONTEXT_UNSET: Tcl_SetStringObj(result, "unset", -1); break; - case GAIM_PRESENCE_CONTEXT_ACCOUNT: + case PURPLE_PRESENCE_CONTEXT_ACCOUNT: Tcl_SetStringObj(result, "account", -1); break; - case GAIM_PRESENCE_CONTEXT_CONV: + case PURPLE_PRESENCE_CONTEXT_CONV: Tcl_SetStringObj(result, "conversation", -1); break; - case GAIM_PRESENCE_CONTEXT_BUDDY: + case PURPLE_PRESENCE_CONTEXT_BUDDY: Tcl_SetStringObj(result, "buddy", -1); break; } @@ -1183,21 +1183,21 @@ Tcl_WrongNumArgs(interp, 2, objv, "presence"); return TCL_ERROR; } - if ((presence = gaim_tcl_ref_get(interp, objv[2], GaimTclRefPresence)) == NULL) + if ((presence = purple_tcl_ref_get(interp, objv[2], PurpleTclRefPresence)) == NULL) return TCL_ERROR; - Tcl_SetObjResult(interp, gaim_tcl_ref_new(GaimTclRefConversation, - gaim_presence_get_conversation(presence))); + Tcl_SetObjResult(interp, purple_tcl_ref_new(PurpleTclRefConversation, + purple_presence_get_conversation(presence))); break; case CMD_PRESENCE_IDLE: if (objc < 3 || objc > 5) { Tcl_WrongNumArgs(interp, 2, objv, "presence ?idle? ?time?"); return TCL_ERROR; } - if ((presence = gaim_tcl_ref_get(interp, objv[2], GaimTclRefPresence)) == NULL) + if ((presence = purple_tcl_ref_get(interp, objv[2], PurpleTclRefPresence)) == NULL) return TCL_ERROR; if (objc == 3) { - if (gaim_presence_is_idle(presence)) { - idle_time = gaim_presence_get_idle_time (presence); + if (purple_presence_is_idle(presence)) { + idle_time = purple_presence_get_idle_time (presence); Tcl_SetIntObj(result, idle_time); } else { result = Tcl_NewListObj(0, NULL); @@ -1208,13 +1208,13 @@ if ((error = Tcl_GetBooleanFromObj(interp, objv[3], &idle)) != TCL_OK) return TCL_ERROR; if (objc == 4) { - gaim_presence_set_idle(presence, idle, time(NULL)); + purple_presence_set_idle(presence, idle, time(NULL)); } else if (objc == 5) { if ((error = Tcl_GetIntFromObj(interp, objv[4], &idle_time)) != TCL_OK) return TCL_ERROR; - gaim_presence_set_idle(presence, idle, idle_time); + purple_presence_set_idle(presence, idle, idle_time); } break; case CMD_PRESENCE_LOGIN: @@ -1222,16 +1222,16 @@ Tcl_WrongNumArgs(interp, 2, objv, "presence ?time?"); return TCL_ERROR; } - if ((presence = gaim_tcl_ref_get(interp, objv[2], GaimTclRefPresence)) == NULL) + if ((presence = purple_tcl_ref_get(interp, objv[2], PurpleTclRefPresence)) == NULL) return TCL_ERROR; if (objc == 3) { - Tcl_SetIntObj(result, gaim_presence_get_login_time(presence)); + Tcl_SetIntObj(result, purple_presence_get_login_time(presence)); } else { if ((error == Tcl_GetIntFromObj(interp, objv[3], &login_time)) != TCL_OK) return TCL_ERROR; - gaim_presence_set_login_time(presence, login_time); + purple_presence_set_login_time(presence, login_time); } break; case CMD_PRESENCE_ONLINE: @@ -1239,20 +1239,20 @@ Tcl_WrongNumArgs(interp, 2, objv, "presence"); return TCL_ERROR; } - if ((presence = gaim_tcl_ref_get(interp, objv[2], GaimTclRefPresence)) == NULL) + if ((presence = purple_tcl_ref_get(interp, objv[2], PurpleTclRefPresence)) == NULL) return TCL_ERROR; - Tcl_SetBooleanObj(result, gaim_presence_is_online(presence)); + Tcl_SetBooleanObj(result, purple_presence_is_online(presence)); break; case CMD_PRESENCE_STATUS: if (objc != 4) { Tcl_WrongNumArgs(interp, 2, objv, "presence status_id"); return TCL_ERROR; } - if ((presence = gaim_tcl_ref_get(interp, objv[2], GaimTclRefPresence)) == NULL) + if ((presence = purple_tcl_ref_get(interp, objv[2], PurpleTclRefPresence)) == NULL) return TCL_ERROR; Tcl_SetObjResult(interp, - gaim_tcl_ref_new(GaimTclRefStatus, - gaim_presence_get_status(presence, + purple_tcl_ref_new(PurpleTclRefStatus, + purple_presence_get_status(presence, Tcl_GetString(objv[3])))); break; case CMD_PRESENCE_STATUSES: @@ -1260,12 +1260,12 @@ Tcl_WrongNumArgs(interp, 2, objv, "presence"); return TCL_ERROR; } - if ((presence = gaim_tcl_ref_get(interp, objv[2], GaimTclRefPresence)) == NULL) + if ((presence = purple_tcl_ref_get(interp, objv[2], PurpleTclRefPresence)) == NULL) return TCL_ERROR; list = Tcl_NewListObj(0, NULL); - for (cur = gaim_presence_get_statuses(presence); cur != NULL; + for (cur = purple_presence_get_statuses(presence); cur != NULL; cur = g_list_next(cur)) { - elem = gaim_tcl_ref_new(GaimTclRefStatus, cur->data); + elem = purple_tcl_ref_new(PurpleTclRefStatus, cur->data); Tcl_ListObjAppendElement(interp, list, elem); } Tcl_SetObjResult(interp, list); @@ -1281,7 +1281,7 @@ const char *cmds[] = { "current", "handle", NULL }; enum { CMD_SAVEDSTATUS_CURRENT, CMD_SAVEDSTATUS_HANDLE } cmd; int error; - GaimSavedStatus *saved_status; + PurpleSavedStatus *saved_status; if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "subcommand ?args?"); @@ -1297,18 +1297,18 @@ Tcl_WrongNumArgs(interp, 2, objv, ""); return TCL_ERROR; } - if ((saved_status = gaim_savedstatus_get_current()) == NULL) + if ((saved_status = purple_savedstatus_get_current()) == NULL) return TCL_ERROR; - Tcl_ListObjAppendElement(interp, result, Tcl_NewStringObj(gaim_savedstatus_get_title(saved_status), -1)); - Tcl_ListObjAppendElement(interp, result, Tcl_NewIntObj(gaim_savedstatus_get_type(saved_status))); - Tcl_ListObjAppendElement(interp, result, Tcl_NewStringObj(gaim_savedstatus_get_message(saved_status), -1)); + Tcl_ListObjAppendElement(interp, result, Tcl_NewStringObj(purple_savedstatus_get_title(saved_status), -1)); + Tcl_ListObjAppendElement(interp, result, Tcl_NewIntObj(purple_savedstatus_get_type(saved_status))); + Tcl_ListObjAppendElement(interp, result, Tcl_NewStringObj(purple_savedstatus_get_message(saved_status), -1)); break; case CMD_SAVEDSTATUS_HANDLE: if (objc != 2) { Tcl_WrongNumArgs(interp, 2, objv, ""); return TCL_ERROR; } - Tcl_SetIntObj(result, (int)gaim_savedstatuses_get_handle()); + Tcl_SetIntObj(result, (int)purple_savedstatuses_get_handle()); break; } @@ -1317,7 +1317,7 @@ int tcl_cmd_send_im(ClientData unused, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { - GaimConnection *gc; + PurpleConnection *gc; char *who, *text; if (objc != 4) { @@ -1395,9 +1395,9 @@ const char *cmds[] = { "attr", "type", NULL }; enum { CMD_STATUS_ATTR, CMD_STATUS_TYPE } cmd; Tcl_Obj *result = Tcl_GetObjResult(interp); - GaimStatus *status; - GaimStatusType *status_type; - GaimValue *value; + PurpleStatus *status; + PurpleStatusType *status_type; + PurpleValue *value; const char *attr; int error, v; @@ -1415,38 +1415,38 @@ Tcl_WrongNumArgs(interp, 2, objv, "status attr_id ?value?"); return TCL_ERROR; } - if ((status = gaim_tcl_ref_get(interp, objv[2], GaimTclRefStatus)) == NULL) + if ((status = purple_tcl_ref_get(interp, objv[2], PurpleTclRefStatus)) == NULL) return TCL_ERROR; attr = Tcl_GetString(objv[3]); - value = gaim_status_get_attr_value(status, attr); + value = purple_status_get_attr_value(status, attr); if (value == NULL) { Tcl_SetStringObj(result, "no such attribute", -1); return TCL_ERROR; } - switch (gaim_value_get_type(value)) { - case GAIM_TYPE_BOOLEAN: + switch (purple_value_get_type(value)) { + case PURPLE_TYPE_BOOLEAN: if (objc == 4) { - Tcl_SetBooleanObj(result, gaim_value_get_boolean(value)); + Tcl_SetBooleanObj(result, purple_value_get_boolean(value)); } else { if ((error = Tcl_GetBooleanFromObj(interp, objv[4], &v)) != TCL_OK) return error; - gaim_status_set_attr_boolean(status, attr, v); + purple_status_set_attr_boolean(status, attr, v); } break; - case GAIM_TYPE_INT: + case PURPLE_TYPE_INT: if (objc == 4) { - Tcl_SetIntObj(result, gaim_value_get_int(value)); + Tcl_SetIntObj(result, purple_value_get_int(value)); } else { if ((error = Tcl_GetIntFromObj(interp, objv[4], &v)) != TCL_OK) return error; - gaim_status_set_attr_int(status, attr, v ); + purple_status_set_attr_int(status, attr, v ); } break; - case GAIM_TYPE_STRING: + case PURPLE_TYPE_STRING: if (objc == 4) - Tcl_SetStringObj(result, gaim_value_get_string(value), -1); + Tcl_SetStringObj(result, purple_value_get_string(value), -1); else - gaim_status_set_attr_string(status, attr, Tcl_GetString(objv[4])); + purple_status_set_attr_string(status, attr, Tcl_GetString(objv[4])); break; default: Tcl_SetStringObj(result, "attribute has unknown type", -1); @@ -1458,10 +1458,10 @@ Tcl_WrongNumArgs(interp, 2, objv, "status"); return TCL_ERROR; } - if ((status = gaim_tcl_ref_get(interp, objv[2], GaimTclRefStatus)) == NULL) + if ((status = purple_tcl_ref_get(interp, objv[2], PurpleTclRefStatus)) == NULL) return TCL_ERROR; - status_type = gaim_status_get_type(status); - Tcl_SetObjResult(interp, gaim_tcl_ref_new(GaimTclRefStatusType, + status_type = purple_status_get_type(status); + Tcl_SetObjResult(interp, purple_tcl_ref_new(PurpleTclRefStatusType, status_type)); break; } @@ -1474,7 +1474,7 @@ const char *cmds[] = { "id", "name", NULL }; enum { CMD_STATUS_ATTR_ID, CMD_STATUS_ATTR_NAME } cmd; Tcl_Obj *result = Tcl_GetObjResult(interp); - GaimStatusAttr *attr; + PurpleStatusAttr *attr; int error; if (objc < 2) { @@ -1491,18 +1491,18 @@ Tcl_WrongNumArgs(interp, 2, objv, "attr"); return TCL_ERROR; } - if ((attr = gaim_tcl_ref_get(interp, objv[2], GaimTclRefStatusAttr)) == NULL) + if ((attr = purple_tcl_ref_get(interp, objv[2], PurpleTclRefStatusAttr)) == NULL) return TCL_ERROR; - Tcl_SetStringObj(result, gaim_status_attr_get_id(attr), -1); + Tcl_SetStringObj(result, purple_status_attr_get_id(attr), -1); break; case CMD_STATUS_ATTR_NAME: if (objc != 3) { Tcl_WrongNumArgs(interp, 2, objv, "attr"); return TCL_ERROR; } - if ((attr = gaim_tcl_ref_get(interp, objv[2], GaimTclRefStatusAttr)) == NULL) + if ((attr = purple_tcl_ref_get(interp, objv[2], PurpleTclRefStatusAttr)) == NULL) return TCL_ERROR; - Tcl_SetStringObj(result, gaim_status_attr_get_name(attr), -1); + Tcl_SetStringObj(result, purple_status_attr_get_name(attr), -1); break; } @@ -1522,7 +1522,7 @@ CMD_STATUS_TYPE_PRIMITIVE, CMD_STATUS_TYPE_SAVEABLE, CMD_STATUS_TYPE_USER_SETTABLE } cmd; Tcl_Obj *result = Tcl_GetObjResult(interp); - GaimStatusType *status_type; + PurpleStatusType *status_type; Tcl_Obj *list, *elem; const GList *cur; int error; @@ -1541,20 +1541,20 @@ Tcl_WrongNumArgs(interp, 2, objv, "statustype"); return TCL_ERROR; } - if ((status_type = gaim_tcl_ref_get(interp, objv[2], GaimTclRefStatusType)) == NULL) + if ((status_type = purple_tcl_ref_get(interp, objv[2], PurpleTclRefStatusType)) == NULL) return TCL_ERROR; - Tcl_SetBooleanObj(result, gaim_status_type_is_available(status_type)); + Tcl_SetBooleanObj(result, purple_status_type_is_available(status_type)); break; case CMD_STATUS_TYPE_ATTR: if (objc != 4) { Tcl_WrongNumArgs(interp, 2, objv, "statustype attr"); return TCL_ERROR; } - if ((status_type = gaim_tcl_ref_get(interp, objv[2], GaimTclRefStatusType)) == NULL) + if ((status_type = purple_tcl_ref_get(interp, objv[2], PurpleTclRefStatusType)) == NULL) return TCL_ERROR; Tcl_SetObjResult(interp, - gaim_tcl_ref_new(GaimTclRefStatusAttr, - gaim_status_type_get_attr(status_type, + purple_tcl_ref_new(PurpleTclRefStatusAttr, + purple_status_type_get_attr(status_type, Tcl_GetStringFromObj(objv[3], NULL)))); break; case CMD_STATUS_TYPE_ATTRS: @@ -1562,12 +1562,12 @@ Tcl_WrongNumArgs(interp, 2, objv, "statustype"); return TCL_ERROR; } - if ((status_type = gaim_tcl_ref_get(interp, objv[2], GaimTclRefStatusType)) == NULL) + if ((status_type = purple_tcl_ref_get(interp, objv[2], PurpleTclRefStatusType)) == NULL) return TCL_ERROR; list = Tcl_NewListObj(0, NULL); - for (cur = gaim_status_type_get_attrs(status_type); + for (cur = purple_status_type_get_attrs(status_type); cur != NULL; cur = g_list_next(cur)) { - elem = gaim_tcl_ref_new(GaimTclRefStatusAttr, cur->data); + elem = purple_tcl_ref_new(PurpleTclRefStatusAttr, cur->data); Tcl_ListObjAppendElement(interp, list, elem); } Tcl_SetObjResult(interp, list); @@ -1577,72 +1577,72 @@ Tcl_WrongNumArgs(interp, 2, objv, "statustype"); return TCL_ERROR; } - if ((status_type = gaim_tcl_ref_get(interp, objv[2], GaimTclRefStatusType)) == NULL) + if ((status_type = purple_tcl_ref_get(interp, objv[2], PurpleTclRefStatusType)) == NULL) return TCL_ERROR; - Tcl_SetBooleanObj(result, gaim_status_type_is_exclusive(status_type)); + Tcl_SetBooleanObj(result, purple_status_type_is_exclusive(status_type)); break; case CMD_STATUS_TYPE_ID: if (objc != 3) { Tcl_WrongNumArgs(interp, 2, objv, "statustype"); return TCL_ERROR; } - if ((status_type = gaim_tcl_ref_get(interp, objv[2], GaimTclRefStatusType)) == NULL) + if ((status_type = purple_tcl_ref_get(interp, objv[2], PurpleTclRefStatusType)) == NULL) return TCL_ERROR; - Tcl_SetStringObj(result, gaim_status_type_get_id(status_type), -1); + Tcl_SetStringObj(result, purple_status_type_get_id(status_type), -1); break; case CMD_STATUS_TYPE_INDEPENDENT: if (objc != 3) { Tcl_WrongNumArgs(interp, 2, objv, "statustype"); return TCL_ERROR; } - if ((status_type = gaim_tcl_ref_get(interp, objv[2], GaimTclRefStatusType)) == NULL) + if ((status_type = purple_tcl_ref_get(interp, objv[2], PurpleTclRefStatusType)) == NULL) return TCL_ERROR; - Tcl_SetBooleanObj(result, gaim_status_type_is_independent(status_type)); + Tcl_SetBooleanObj(result, purple_status_type_is_independent(status_type)); break; case CMD_STATUS_TYPE_NAME: if (objc != 3) { Tcl_WrongNumArgs(interp, 2, objv, "statustype"); return TCL_ERROR; } - if ((status_type = gaim_tcl_ref_get(interp, objv[2], GaimTclRefStatusType)) == NULL) + if ((status_type = purple_tcl_ref_get(interp, objv[2], PurpleTclRefStatusType)) == NULL) return TCL_ERROR; - Tcl_SetStringObj(result, gaim_status_type_get_name(status_type), -1); + Tcl_SetStringObj(result, purple_status_type_get_name(status_type), -1); break; case CMD_STATUS_TYPE_PRIMITIVE: if (objc != 3) { Tcl_WrongNumArgs(interp, 2, objv, "statustype"); return TCL_ERROR; } - if ((status_type = gaim_tcl_ref_get(interp, objv[2], GaimTclRefStatusType)) == NULL) + if ((status_type = purple_tcl_ref_get(interp, objv[2], PurpleTclRefStatusType)) == NULL) return TCL_ERROR; - Tcl_SetStringObj(result, gaim_primitive_get_id_from_type(gaim_status_type_get_primitive(status_type)), -1); + Tcl_SetStringObj(result, purple_primitive_get_id_from_type(purple_status_type_get_primitive(status_type)), -1); break; case CMD_STATUS_TYPE_PRIMARY_ATTR: if (objc != 3) { Tcl_WrongNumArgs(interp, 2, objv, "statustype"); return TCL_ERROR; } - if ((status_type = gaim_tcl_ref_get(interp, objv[2], GaimTclRefStatusType)) == NULL) + if ((status_type = purple_tcl_ref_get(interp, objv[2], PurpleTclRefStatusType)) == NULL) return TCL_ERROR; - Tcl_SetStringObj(result, gaim_status_type_get_primary_attr(status_type), -1); + Tcl_SetStringObj(result, purple_status_type_get_primary_attr(status_type), -1); break; case CMD_STATUS_TYPE_SAVEABLE: if (objc != 3) { Tcl_WrongNumArgs(interp, 2, objv, "statustype"); return TCL_ERROR; } - if ((status_type = gaim_tcl_ref_get(interp, objv[2], GaimTclRefStatusType)) == NULL) + if ((status_type = purple_tcl_ref_get(interp, objv[2], PurpleTclRefStatusType)) == NULL) return TCL_ERROR; - Tcl_SetBooleanObj(result, gaim_status_type_is_saveable(status_type)); + Tcl_SetBooleanObj(result, purple_status_type_is_saveable(status_type)); break; case CMD_STATUS_TYPE_USER_SETTABLE: if (objc != 3) { Tcl_WrongNumArgs(interp, 2, objv, "statustype"); return TCL_ERROR; } - if ((status_type = gaim_tcl_ref_get(interp, objv[2], GaimTclRefStatusType)) == NULL) + if ((status_type = purple_tcl_ref_get(interp, objv[2], PurpleTclRefStatusType)) == NULL) return TCL_ERROR; - Tcl_SetBooleanObj(result, gaim_status_type_is_user_settable(status_type)); + Tcl_SetBooleanObj(result, purple_status_type_is_user_settable(status_type)); break; } @@ -1651,14 +1651,14 @@ static gboolean unload_self(gpointer data) { - GaimPlugin *plugin = data; - gaim_plugin_unload(plugin); + PurplePlugin *plugin = data; + purple_plugin_unload(plugin); return FALSE; } int tcl_cmd_unload(ClientData unused, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) { - GaimPlugin *plugin; + PurplePlugin *plugin; if (objc != 1) { Tcl_WrongNumArgs(interp, 1, objv, ""); return TCL_ERROR;