changeset 6700:57161e3abbb5

[gaim-migrate @ 7226] This certainly doesn't work, and possibly doesn't load, but it *does* compile, which means I can now fix it in my own sweet time. committer: Tailor Script <[e-mail]>

--- a/plugins/tcl/tcl_cmds.c	Tue Sep 02 03:56:08 2003 +0000
+++ b/plugins/tcl/tcl_cmds.c	Tue Sep 02 04:28:34 2003 +0000
@@ -28,6 +28,7 @@
 #include "account.h"
 #include "server.h"
 #include "notify.h"
+#include "blist.h"
 #include "debug.h"
 #include "prefs.h"
 #include "core.h"
@@ -248,8 +249,8 @@
 	struct gaim_buddy_list *blist;
 	GaimBlistNode *node, *gnode;
 	GaimAccount *account;
-	struct buddy *bnode;
-	struct chat *cnode;
+	GaimBuddy *bnode;
+	GaimBlistChat *cnode;
 	int error, all = 0, count;
 
 	if (objc < 2) {
@@ -272,9 +273,9 @@
 		if ((node = tcl_list_to_buddy(interp, count, elems)) == NULL)
 			return TCL_ERROR;
 		if (node->type == GAIM_BLIST_CHAT_NODE)
-			Tcl_SetStringObj(result, ((struct chat *)node)->alias, -1);
+			Tcl_SetStringObj(result, ((GaimBlistChat *)node)->alias, -1);
 		else if (node->type == GAIM_BLIST_BUDDY_NODE)
-			Tcl_SetStringObj(result, gaim_get_buddy_alias((struct buddy *)node), -1);
+			Tcl_SetStringObj(result, (char *)gaim_get_buddy_alias((GaimBuddy *)node), -1);
 		return TCL_OK;
 		break;
 	case CMD_BUDDY_HANDLE:
@@ -329,12 +330,12 @@
 			tclgroup = Tcl_NewListObj(0, NULL);
 			Tcl_ListObjAppendElement(interp, tclgroup, Tcl_NewStringObj("group", -1));
 			Tcl_ListObjAppendElement(interp, tclgroup,
-						 Tcl_NewStringObj(((struct group *)gnode)->name, -1));
+						 Tcl_NewStringObj(((GaimGroup *)gnode)->name, -1));
 			tclgrouplist = Tcl_NewListObj(0, NULL);
 			for (node = gnode->child; node != NULL; node = node->next) {
 				switch (node->type) {
 				case GAIM_BLIST_BUDDY_NODE:
-					bnode = (struct buddy *)node;
+					bnode = (GaimBuddy *)node;
 					if (!all && !gaim_account_is_connected(bnode->account))
 						continue;
 					tclbud = Tcl_NewListObj(0, NULL);
@@ -343,7 +344,7 @@
 					Tcl_ListObjAppendElement(interp, tclbud, Tcl_NewIntObj((int)bnode->account));
 					break;
 				case GAIM_BLIST_CHAT_NODE:
-					cnode = (struct chat *)node;
+					cnode = (GaimBlistChat *)node;
 					if (!all && !gaim_account_is_connected(cnode->account))
 						continue;
 					tclbud = Tcl_NewListObj(0, NULL);

--- a/plugins/tcl/tcl_signals.c	Tue Sep 02 03:56:08 2003 +0000
+++ b/plugins/tcl/tcl_signals.c	Tue Sep 02 04:28:34 2003 +0000
@@ -229,15 +229,15 @@
 					node = va_arg(args, GaimBlistNode *);
 				switch (node->type) {
 				case GAIM_BLIST_GROUP_NODE:
-					g_string_printf(val, "group {%s}", ((struct group *)node)->name);
+					g_string_printf(val, "group {%s}", ((GaimGroup *)node)->name);
 					break;
 				case GAIM_BLIST_BUDDY_NODE:
-					g_string_printf(val, "buddy {%s} %lu", ((struct buddy *)node)->name,
-							(unsigned long)((struct buddy *)node)->account);
+					g_string_printf(val, "buddy {%s} %lu", ((GaimBuddy *)node)->name,
+							(unsigned long)((GaimBuddy *)node)->account);
 					break;
 				case GAIM_BLIST_CHAT_NODE:
-					g_string_printf(val, "chat {%s} %lu", ((struct chat *)node)->alias,
-							(unsigned long)((struct chat *)node)->account);
+					g_string_printf(val, "chat {%s} %lu", ((GaimBlistChat *)node)->alias,
+							(unsigned long)((GaimBlistChat *)node)->account);
 					break;
 				case GAIM_BLIST_OTHER_NODE:
 					g_string_printf(val, "other");