diff src/buddy.c @ 4687:283fb289c510

[gaim-migrate @ 4998] This is a new buddy list. Lots of things about it just Don't Work. I probably already know about those things, and you'd just be wasting my time in submitting a bug report about it. I decided that instead of getting it to all work perfectly before committing, that I'd get it in cvs, and slowly fix it with regular commits. That way, it's easier to keep track of things, and other developers can help. Plus, I'm getting pissed off at the buddy list and want it to die. It's kinda boring, and doing nothing but the buddy list for such a long time has just gotten me very bitter. After 0.60 is released later this week, Gaim will resume being fun. This week is going to be very stressful, though, I'm sure. Things you ought to know about this buddy list: - It crashes - It leaks - There's no way to edit the buddy list, or access offline buddies - Most of the menus and buttons and whatnot just plain ol' don't work. - Status icons are only implemented for AIM. That's mostly just because I'm lazy. As such, you may want to be wary of updating this. If you do decide to update this, you may want to learn "cvs update -D yesterday" as well :) All the art there is just placeholder art. You probably won't really have as many problems as it sounds like you will from reading this. This message is extra-negative to stress that I don't want to be bothered with complaints about something not working about it :). I'll repeat: If something doesn't work, I probably already know about it. If you want to actually help with something, I'd be delighted to have it. IM me. -s. committer: Tailor Script <tailor@pidgin.im>
author Sean Egan <seanegan@gmail.com>
date Mon, 10 Mar 2003 05:30:31 +0000
parents 42d53c416bb9
children e19f91053ad0
line wrap: on
line diff
--- a/src/buddy.c	Mon Mar 10 04:51:10 2003 +0000
+++ b/src/buddy.c	Mon Mar 10 05:30:31 2003 +0000
@@ -19,12 +19,6 @@
  *
  */
 
-#ifdef GTK_DISABLE_DEPRECATED
-#undef GTK_DISABLE_DEPRECATED
-#endif
-
-#define GTK_ENABLE_BROKEN
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -41,6 +35,8 @@
 #include <time.h>
 #include <ctype.h>
 
+#include "pixmaps/no_icon.xpm"
+
 #ifdef _WIN32
 #include <gdk/gdkwin32.h>
 #else
@@ -53,2645 +49,675 @@
 #include "prpl.h"
 #include "sound.h"
 #include "gaim.h"
+#include "gtklist.h"
+#include "gtkft.h"
 
 #ifdef _WIN32
 #include "win32dep.h"
 #endif
 
-#include "pixmaps/login_icon.xpm"
-#include "pixmaps/logout_icon.xpm"
-#include "pixmaps/no_icon.xpm"
-
-#include "pixmaps/away_big.xpm"
-
-#include "pixmaps/group.xpm"
-
-#include "pixmaps/arrow_down.xpm"
-#include "pixmaps/arrow_right.xpm"
-
-static GtkTooltips *tips;
-static GtkAccelGroup *accel;
-static GtkWidget *editpane;
-static GtkWidget *buddypane;
-static GtkWidget *imchatbox;
-static GtkWidget *edittree;
-static GtkWidget *imbutton, *infobutton, *chatbutton, *awaybutton;
-static GtkWidget *addbutton, *groupbutton, *rembutton;
-
-GtkWidget *blist = NULL;
-GtkWidget *bpmenu;
-GtkWidget *buddies;
-
-typedef struct _GtkTreePixmaps GtkTreePixmaps;
-
-struct buddy_show {
-	GtkWidget *item;
-	GtkWidget *pix;
-	GtkWidget *label;
-	GtkWidget *warn;
-	GtkWidget *idle;
-	char *name;
-	GSList *connlist;
-	guint log_timer;
-	gint sound;
-};
-
-/* stuff for actual display of buddy list */
-struct group_show {
-	GtkWidget *item;
-	GtkWidget *label;
-	GtkWidget *tree;
-	GSList *members;
-	char *name;
-};
-static GSList *shows = NULL;
-
-int docklet_count = 0;
 static gboolean obscured = FALSE;
 
-/* Predefine some functions */
-static void new_bp_callback(GtkWidget *w, struct buddy *bs);
-static struct group_show *find_group_show(char *group);
-static struct buddy_show *find_buddy_show(struct group_show *gs, char *name);
-static int group_number(char *group);
-static int buddy_number(char *group, char *buddy);
-static struct group_show *new_group_show(char *group);
-static struct buddy_show *new_buddy_show(struct group_show *gs, struct buddy *buddy, char **xpm);
-static void remove_buddy_show(struct group_show *gs, struct buddy_show *bs);
-static struct group_show *find_gs_by_bs(struct buddy_show *b);
-static void update_num_group(struct group_show *gs);
-static void update_idle_time(struct buddy_show *bs);
-
-void handle_group_rename(struct group *g, char *prevname)
-{
-	struct group_show *gs, *new_gs;
-	GtkCTreeNode *c;
-
-	c = gtk_ctree_find_by_row_data(GTK_CTREE(edittree), NULL, g);
-	gtk_ctree_node_set_text(GTK_CTREE(edittree), c, 0, g->name);
-
-	gs = find_group_show(prevname);
-	if (!gs) {
-		return;
-	}
-	new_gs = find_group_show(g->name);
-	if (new_gs) {
-		/* transfer everything that was in gs and is in the same gaim_conn as g
-		 * over to new_gs. */
-		while (gs->members) {
-			new_gs->members = g_slist_append(new_gs->members, gs->members->data);
-			gs->members = g_slist_remove(gs->members, gs->members->data);
-
-		}
-		shows = g_slist_remove(shows, gs);
-		gtk_tree_remove_item(GTK_TREE(buddies), gs->item);
-		g_free(gs->name);
-		g_free(gs);
-		update_num_group(new_gs);
-	} else {
-		g_free(gs->name);
-		gs->name = g_strdup(g->name);
-		update_num_group(gs);
-	}
-}
-
-void handle_buddy_rename(struct buddy *b, char *prevname)
-{
-	struct gaim_conversation *cnv;
-	struct buddy_show *bs;
-	struct group_show *gs;
-	struct group *g;
-	GtkCTreeNode *c;
-	char buf[256];
-
-	c = gtk_ctree_find_by_row_data(GTK_CTREE(edittree), NULL, b);
-	if (get_buddy_alias_only(b))
-		g_snprintf(buf, sizeof(buf), "%s (%s)", b->name, get_buddy_alias(b));
-	else
-		g_snprintf(buf, sizeof(buf), "%s", b->name);
-	gtk_ctree_node_set_text(GTK_CTREE(edittree), c, 0, buf);
-
-	if ((cnv = gaim_find_conversation(b->name)) != NULL)
-		gaim_conversation_autoset_title(cnv);
-
-	g = find_group_by_buddy(b);
-	if (!g) {
-		/* shouldn't happen */
-		return;
-	}
-	gs = find_group_show(g->name);
-	if (!gs) {
-		return;
-	}
-	bs = find_buddy_show(gs, prevname);
-	if (!bs) {
-		/* buddy's offline */
-		return;
-	}
+static void gaim_gtk_blist_update(struct gaim_buddy_list *list, GaimBlistNode *node);
 
-	if (g_strcasecmp(b->name, prevname)) {
-		bs->connlist = g_slist_remove(bs->connlist, b->account->gc);
-		if (!bs->connlist) {
-			gs->members = g_slist_remove(gs->members, bs);
-			if (bs->log_timer > 0)
-				g_source_remove(bs->log_timer);
-			bs->log_timer = 0;
-			remove_buddy_show(gs, bs);
-			g_free(bs->name);
-			g_free(bs);
-		}
-		update_num_group(gs);
-	} else {
-		gtk_label_set_text(GTK_LABEL(bs->label), get_buddy_alias(b));
-		update_idle_time(bs);
-	}
-}
-
-void destroy_buddy()
-{
-	GSList *s = shows;
-	struct group_show *g;
-	GSList *m;
-	struct buddy_show *b;
-	while (s) {
-		g = (struct group_show *)s->data;
-		debug_printf("group_show still exists: %s\n", g->name);
-		m = g->members;
-		while (m) {
-			b = (struct buddy_show *)m->data;
-			debug_printf("buddy_show still exists: %s\n", b->name);
-			m = g_slist_remove(m, b);
-			if (b->log_timer > 0)
-				g_source_remove(b->log_timer);
-			b->log_timer = 0;
-			gtk_tree_remove_item(GTK_TREE(g->tree), b->item);
-			g_free(b->name);
-			g_free(b);
-		}
-		gtk_tree_remove_item(GTK_TREE(buddies), g->item);
-		s = g_slist_remove(s, g);
-		g_free(g->name);
-		g_free(g);
-	}
-	shows = NULL;
-
-	if (blist)
-		gtk_widget_destroy(blist);
-	blist = NULL;
-	imchatbox = NULL;
-	awaymenu = NULL;
-	protomenu = NULL;
-}
-
-static void adjust_pic(GtkWidget *button, const char *c, gchar **xpm)
-{
-	GdkPixmap *pm;
-	GdkBitmap *bm;
-	GtkWidget *pic;
-	GtkWidget *label;
-
-	/*if the user had opted to put pictures on the buttons */
-	if (blist_options & OPT_BLIST_SHOW_BUTTON_XPM && xpm) {
-		pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm, NULL, xpm);
-		pic = gtk_pixmap_new(pm, bm);
-		gtk_widget_show(pic);
-		gdk_pixmap_unref(pm);
-		gdk_bitmap_unref(bm);
-		label = GTK_BIN(button)->child;
-		gtk_container_remove(GTK_CONTAINER(button), label);
-		gtk_container_add(GTK_CONTAINER(button), pic);
-	} else {
-		label = gtk_label_new(c);
-		gtk_widget_show(label);
-		pic = GTK_BIN(button)->child;
-		gtk_container_remove(GTK_CONTAINER(button), pic);
-		gtk_container_add(GTK_CONTAINER(button), label);
-	}
-
-}
-
-/* This will remain here until we phase out the others */
-static void adjust_pic2(GtkWidget *button, const char *c, gchar *icon)
-{
-	GtkWidget *pic;
-	GtkWidget *label;
+/***************************************************
+ *              Callbacks                          *
+ ***************************************************/
 
-	/*if the user had opted to put pictures on the buttons */
-	if (blist_options & OPT_BLIST_SHOW_BUTTON_XPM && icon) {
-		label = GTK_BIN(button)->child;
-		gtk_container_remove(GTK_CONTAINER(button), label);
-		gtk_container_add(GTK_CONTAINER(button), gtk_image_new_from_stock(icon, GTK_ICON_SIZE_BUTTON));
-		gtk_widget_show_all(button);
-	} else {
-		label = gtk_label_new(c);
-		gtk_widget_show(label);
-		pic = GTK_BIN(button)->child;
-		gtk_container_remove(GTK_CONTAINER(button), pic);
-		gtk_container_add(GTK_CONTAINER(button), label);
-	}
-
-}
-
-
-void toggle_show_empty_groups()
-{
-	if (blist_options & OPT_BLIST_NO_MT_GRP) {
-		/* remove any group_shows with empty members */
-		GSList *s = shows;
-		struct group_show *g;
-
-		while (s) {
-			g = (struct group_show *)s->data;
-			if (!g_slist_length(g->members)) {
-				shows = g_slist_remove(shows, g);
-				s = shows;
-				gtk_tree_remove_item(GTK_TREE(buddies), g->item);
-				g_free(g->name);
-				g_free(g);
-			} else
-				s = g_slist_next(s);
-		}
-
-	} else {
-		/* put back all groups */
-		GSList *m = groups;
-
-		while (m) {
-			struct group *g = (struct group *)m->data;
-			if (!find_group_show(g->name) && gaim_group_on_account(g, NULL))
-				new_group_show(g->name);
-			m = g_slist_next(m);
-		}
-	}
-}
-
-void toggle_buddy_pixmaps()
-{
-	GSList *s = shows;
-	struct group_show *g;
-	GSList *m;
-	struct buddy_show *b;
-
-	while (s) {
-		g = s->data;
-		m = g->members;
-		while (m) {
-			b = m->data;
-			if (blist_options & OPT_BLIST_SHOW_PIXMAPS)
-				gtk_widget_show(b->pix);
-			else
-				gtk_widget_hide(b->pix);
-			m = m->next;
-		}
-		s = s->next;
-	}
-}
-
-static void update_num_group(struct group_show *gs)
-{
-	GSList *c = connections;
-	struct group *g = find_group(gs->name);
-	struct buddy *b;
-	int total = 0, on = 0;
-	char buf[256];
-
-	if (!g_slist_find(shows, gs)) {
-		debug_printf("update_num_group called for unfound group_show %s\n", gs->name);
-		return;
-	}
-	if (g) {
-		for (c = g->members; c; c = c->next) {
-			b = c->data;
-			if(b->account->gc) {
-				if(b->present)
-					on++;
-				total++;
-			}
-		}
-	}
-
-	if (blist_options & OPT_BLIST_SHOW_GRPNUM)
-		g_snprintf(buf, sizeof buf, "%s (%d/%d)", gs->name, on, total);
-	else
-		g_snprintf(buf, sizeof buf, "%s", gs->name);
-
-	gtk_label_set_text(GTK_LABEL(gs->label), buf);
-}
-
-void update_num_groups(void)
-{
-	GSList *s = shows;
-	struct group_show *g;
-
-	while (s) {
-		g = (struct group_show *)s->data;
-		update_num_group(g);
-		s = g_slist_next(s);
-	}
-}
-
-void update_button_pix()
-{
-
-	adjust_pic2(addbutton, _("Add"), GTK_STOCK_ADD); 
-	adjust_pic(groupbutton, _("Group"), (gchar **)group_xpm);
-	adjust_pic2(rembutton, _("Remove"), GTK_STOCK_REMOVE);
-
-	if (!(blist_options & OPT_BLIST_NO_BUTTONS)) {
-		adjust_pic(awaybutton, _("Away"), (gchar **)away_big_xpm);
-		adjust_pic2(chatbutton, _("Chat"), GTK_STOCK_JUMP_TO);
-		adjust_pic2(imbutton, _("IM"), GTK_STOCK_CONVERT);
-		adjust_pic2(infobutton, _("Info"), GTK_STOCK_FIND);
-	}
-	gtk_widget_hide(addbutton->parent);
-	gtk_widget_show(addbutton->parent);
-	if (!(blist_options & OPT_BLIST_NO_BUTTONS)) {
-		gtk_widget_hide(chatbutton->parent);
-		gtk_widget_show(chatbutton->parent);
-	}
-}
-
-void set_blist_tab()
-{
-	GtkWidget *blist_notebook;
-	if (!buddypane)
-		return;
+static void gtk_blist_row_activated_cb(GtkTreeView *tv, GtkTreePath *path, GtkTreeViewColumn *col, gpointer data) {
+	GaimBlistNode *node;
+	GtkTreeIter iter;
+	GValue val = { 0, };
 	
-	blist_notebook = buddypane->parent;  /* The "Online" Page */
-
-	debug_printf("blist_options = %d\n", blist_options);
-	if((blist_options & OPT_BLIST_BOTTOM_TAB))
-		gtk_notebook_set_tab_pos(GTK_NOTEBOOK(blist_notebook), GTK_POS_BOTTOM);
-	else
-		gtk_notebook_set_tab_pos(GTK_NOTEBOOK(blist_notebook), GTK_POS_TOP);
-
-}
-
-
-static int handle_click_group(GtkWidget *widget, GdkEventButton *event, struct group *g)
-{
-	if (event->type == GDK_2BUTTON_PRESS) {
-		if (GTK_TREE_ITEM(widget)->expanded)
-			gtk_tree_item_collapse(GTK_TREE_ITEM(widget));
-		else
-			gtk_tree_item_expand(GTK_TREE_ITEM(widget));
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
-void pressed_im_bud(GtkWidget *widget, struct buddy *b)
-{
-	struct gaim_conversation *c;
-
-	c = gaim_find_conversation(b->name);
-
-	if (c != NULL)
-		gaim_window_show(gaim_conversation_get_window(c));
-	else
-		c = gaim_conversation_new(GAIM_CONV_IM, b->account, b->name);
-}
-
-void pressed_im(GtkWidget *widget, struct buddy_show *b)
-{
-	struct gaim_conversation *c;
-
-	c = gaim_find_conversation(b->name);
-
-	if (c != NULL) {
-		gaim_window_show(gaim_conversation_get_window(c));
-	} else {
-		struct gaim_account *account;
-
-		account = ((struct gaim_connection *)b->connlist->data)->account;
-		c    = gaim_conversation_new(GAIM_CONV_IM, account, b->name);
+	gtk_tree_model_get_iter(GTK_TREE_MODEL(gtkblist->treemodel), &iter, path);
+	
+	gtk_tree_model_get_value (GTK_TREE_MODEL(gtkblist->treemodel), &iter, NODE_COLUMN, &val);
+	node = g_value_get_pointer(&val);
+	
+	if (GAIM_BLIST_NODE_IS_BUDDY(node)) {
+		gaim_conversation_new(GAIM_CONV_IM, ((struct buddy*)node)->account, ((struct buddy*)node)->name);
 	}
 }
 
-void pressed_log(GtkWidget *widget, char *name)
-{
-	show_log(name);
-}
-
-void show_syslog()
-{
-	show_log(NULL);
-}
-
-void pressed_alias_bs(GtkWidget *widget, struct buddy_show *bs)
-{
-	struct gaim_connection *gc = bs->connlist->data;
-	alias_dialog_bud(find_buddy(gc->account, bs->name));
-}
-
-void pressed_alias_bud(GtkWidget *widget, struct buddy *b)
-{
-	alias_dialog_bud(b);
-}
-
-static void menu_click(GtkObject *obj, char *who)
-{
-	GList *list = gtk_object_get_user_data(obj);
-	struct proto_buddy_menu *pbm = list->data;
-	if (pbm->callback)
-		pbm->callback(pbm->gc, who);
-}
-
-static int handle_click_buddy(GtkWidget *widget, GdkEventButton *event, struct buddy_show *b)
+static void gaim_proto_menu_cb(GtkMenuItem *item, struct buddy *b)
 {
-	if (!b->connlist)
-		return FALSE;
-
-	if (event->type == GDK_2BUTTON_PRESS && event->button == 1) {
-		struct gaim_conversation *c;
-		struct gaim_account *account;
-
-		account = ((struct gaim_connection *)b->connlist->data)->account;
-
-		c = gaim_find_conversation(b->name);
-
-		if (c != NULL) {
-			struct gaim_window *win = gaim_conversation_get_window(c);
-			size_t index = gaim_conversation_get_index(c);
-
-			gaim_window_switch_conversation(win, index);
-			gaim_window_show(win);
-
-			gaim_conversation_set_account(c, account);
-		}
-		else
-			c = gaim_conversation_new(GAIM_CONV_IM, account, b->name);
-
-		gaim_window_switch_conversation(gaim_conversation_get_window(c),
-										gaim_conversation_get_index(c));
-
-		gaim_window_raise(gaim_conversation_get_window(c));
-
-		/* XXX-GTK gtk_widget_grab_focus(c->entry); */
-	} else if (event->type == GDK_BUTTON_PRESS && event->button == 3) {
-		static GtkWidget *menu = NULL;
-		static GList *mo_top = NULL;
-		GtkWidget *button;
-		GtkWidget *menuitem;
-		GtkWidget *conmenu;
-		GSList *cn = b->connlist;
-		struct gaim_connection *g;
-		/* We're gonna make us a menu right here */
-
-		/*
-		 * If a menu already exists, destroy it before creating a new one,
-		 * thus freeing-up the memory it occupied.  Same for its associated
-		 * (prpl menu items) GList.
-		 */
-		if(menu) {
-			gtk_widget_destroy(menu);
-			if(mo_top) {
-				g_list_foreach(mo_top, (GFunc)g_free, NULL);
-				g_list_free(mo_top);
-				mo_top = NULL;
-			}
-		}
-
-		menu = gtk_menu_new();
-
-		button = gtk_menu_item_new_with_label(_("IM"));
-		g_signal_connect(GTK_OBJECT(button), "activate", G_CALLBACK(pressed_im), b);
-		gtk_menu_append(GTK_MENU(menu), button);
-		gtk_widget_show(button);
-
-		button = gtk_menu_item_new_with_label(_("Alias"));
-		g_signal_connect(GTK_OBJECT(button), "activate", G_CALLBACK(pressed_alias_bs), b);
-		gtk_menu_append(GTK_MENU(menu), button);
-		gtk_widget_show(button);
-
-		button = gtk_menu_item_new_with_label(_("Add Buddy Pounce"));
-		g_signal_connect(GTK_OBJECT(button), "activate",
-				   G_CALLBACK(new_bp_callback),
-				   cn ? find_buddy(((struct gaim_connection *)cn->data)->account, b->name) : NULL);
-		gtk_menu_append(GTK_MENU(menu), button);
-		gtk_widget_show(button);
-
-		button = gtk_menu_item_new_with_label(_("View Log"));
-		g_signal_connect(GTK_OBJECT(button), "activate",
-				   G_CALLBACK(pressed_log), b->name);
-		gtk_menu_append(GTK_MENU(menu), button);
-		gtk_widget_show(button);
-
-		if (g_slist_length(cn) > 1) {
-			while (cn) {
-				g = (struct gaim_connection *)cn->data;
-				if (g->prpl->buddy_menu) {
-					GList *mo = mo_top = g->prpl->buddy_menu(g, b->name);
-
-					menuitem = gtk_menu_item_new_with_label(g->username);
-					gtk_menu_append(GTK_MENU(menu), menuitem);
-					gtk_widget_show(menuitem);
-
-					conmenu = gtk_menu_new();
-					gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), conmenu);
-					gtk_widget_show(conmenu);
-
-					while (mo) {
-						struct proto_buddy_menu *pbm = mo->data;
-						GtkWidget *button;
-
-						button = gtk_menu_item_new_with_label(pbm->label);
-						g_signal_connect(GTK_OBJECT(button), "activate",
-								   G_CALLBACK(menu_click), b->name);
-						gtk_object_set_user_data(GTK_OBJECT(button), mo);
-						gtk_menu_append(GTK_MENU(conmenu), button);
-						gtk_widget_show(button);
-
-						mo = mo->next;
-					}
-				}
-				cn = g_slist_next(cn);
-			}
-		} else {
-			g = (struct gaim_connection *)cn->data;
-			if (g->prpl->buddy_menu) {
-				GList *mo = mo_top = g->prpl->buddy_menu(g, b->name);
-
-				while (mo) {
-					struct proto_buddy_menu *pbm = mo->data;
-					GtkWidget *button;
-
-					button = gtk_menu_item_new_with_label(pbm->label);
-					g_signal_connect(GTK_OBJECT(button), "activate",
-							   G_CALLBACK(menu_click), b->name);
-					gtk_object_set_user_data(GTK_OBJECT(button), mo);
-					gtk_menu_append(GTK_MENU(menu), button);
-					gtk_widget_show(button);
-
-					mo = mo->next;
-				}
-			}
-		}
-
-		/* we send the menu widget so we can add menuitems within a plugin */
-		plugin_event(event_draw_menu, menu, b->name);
-
-		gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, event->button, event->time);
-
-	} else if (event->type == GDK_3BUTTON_PRESS && event->button == 2) {
-		if (!g_strcasecmp("zilding", normalize (b->name)))
-			 show_ee_dialog(0);
-		else if (!g_strcasecmp("robflynn", normalize (b->name)))
-			 show_ee_dialog(1);
-		else if (!g_strcasecmp("flynorange", normalize (b->name)))
-			 show_ee_dialog(2);
-		else if (!g_strcasecmp("ewarmenhoven", normalize (b->name)))
-			 show_ee_dialog(3);
-		else if (!g_strcasecmp("markster97", normalize (b->name)))
-			 show_ee_dialog(4);
-		else if (!g_strcasecmp("seanegn", normalize (b->name)))
-			show_ee_dialog(5);
-		else if (!g_strcasecmp("chipx86", normalize (b->name)))
-			show_ee_dialog(6);
-		else if (!g_strcasecmp("kingant", normalize (b->name)))
-			show_ee_dialog(7);
-		else if (!g_strcasecmp("lschiere", normalize (b->name)))
-			show_ee_dialog(8);
-
-	} else {
-
-		/* Anything for other buttons? :) */
-	}
-
-	return FALSE;
-}
-
-static void un_alias(GtkWidget *a, struct buddy *b)
-{
-	b->alias[0] = '\0';
-	handle_buddy_rename(b, b->name); /* make me a sammich! */
-	serv_alias_buddy(b);
-	gaim_blist_save();
+	struct proto_buddy_menu *pbm = g_object_get_data(G_OBJECT(item), "gaimcallback");
+	if (pbm->callback)
+		pbm->callback(pbm->gc, b->name);
 }
 
-static gboolean click_edit_tree(GtkWidget *widget, GdkEventButton *event, gpointer data)
+static gboolean gtk_blist_button_press_cb(GtkWidget *tv, GdkEventButton *event, gpointer null)
 {
-	GtkCTreeNode *node;
-	int *type;
-	int row, column;
-	static GtkWidget *menu = NULL;
-	GtkWidget *button;
-	static GList *mo_top = NULL;
-
-	if (event->button != 3 || event->type != GDK_BUTTON_PRESS)
-		return FALSE;
-
-	if (!gtk_clist_get_selection_info(GTK_CLIST(edittree), event->x, event->y, &row, &column))
-		return FALSE;
+	GtkTreePath *path;
+	GaimBlistNode *node;
+	GValue val = { 0, };
+	GtkTreeIter iter;
+	GtkWidget *menu, *menuitem;
+	GtkWidget *image;
+	GList *list;
+	struct prpl *prpl;
 
-	node = gtk_ctree_node_nth(GTK_CTREE(edittree), row);
-	type = gtk_ctree_node_get_row_data(GTK_CTREE(edittree), node);
+	if (event->button != 3)
+		return FALSE;
+	
+	/* Here we figure out which node was clicked */
+	if (!gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(tv), event->x, event->y, &path, NULL, NULL, NULL))
+		return FALSE;
+	gtk_tree_model_get_iter(GTK_TREE_MODEL(gtkblist->treemodel), &iter, path);
+	gtk_tree_model_get_value (GTK_TREE_MODEL(gtkblist->treemodel), &iter, NODE_COLUMN, &val);
+	node = g_value_get_pointer(&val);
+	
+	if (!GAIM_BLIST_NODE_IS_BUDDY(node)) 
+		return FALSE;
+		
+	menu = gtk_menu_new();
 
-	/*
-	 * If a menu already exists, destroy it before creating a new one,
-	 * thus freeing-up the memory it occupied.
-	 */
-	if(menu) {
-		gtk_widget_destroy(menu);
-		menu = NULL;	/* safety measure */
-		if(mo_top) {
-			g_list_foreach(mo_top, (GFunc)g_free, NULL);
-			g_list_free(mo_top);
-			mo_top = NULL;
+	/* Protocol specific options */
+	prpl = find_prpl(((struct buddy*)node)->account->protocol);
+	if (prpl) {
+		list = prpl->buddy_menu(((struct buddy*)node)->account->gc, ((struct buddy*)node)->name);
+		while (list) {
+			struct proto_buddy_menu *pbm = list->data;
+			menuitem = gtk_menu_item_new_with_mnemonic(pbm->label);
+			g_object_set_data(G_OBJECT(menuitem), "gaimcallback", pbm);
+			g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(gaim_proto_menu_cb), node);
+			gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
+			list = list->next;
 		}
 	}
-
-	if (*type == EDIT_GROUP) {
-		struct group *group = (struct group *)type;
-		menu = gtk_menu_new();
-
-		button = gtk_menu_item_new_with_label(_("Rename"));
-		g_signal_connect(GTK_OBJECT(button), "activate",
-				   G_CALLBACK(show_rename_group), group);
-		gtk_menu_append(GTK_MENU(menu), button);
-		gtk_widget_show(button);
-
-		gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, event->button, event->time);
-
-		return TRUE;
-	} else if (*type == EDIT_BUDDY) {
-		struct buddy *b = (struct buddy *)type;
-		menu = gtk_menu_new();
-
-		button = gtk_menu_item_new_with_label(_("IM"));
-		g_signal_connect(GTK_OBJECT(button), "activate", G_CALLBACK(pressed_im_bud), b);
-		gtk_menu_append(GTK_MENU(menu), button);
-		gtk_widget_show(button);
-
-		button = gtk_menu_item_new_with_label(_("Alias"));
-		g_signal_connect(GTK_OBJECT(button), "activate",
-				   G_CALLBACK(pressed_alias_bud), b);
-		gtk_menu_append(GTK_MENU(menu), button);
-		gtk_widget_show(button);
-
-		if (b->alias[0]) {
-			button = gtk_menu_item_new_with_label(_("Un-Alias"));
-			g_signal_connect(GTK_OBJECT(button), "activate", G_CALLBACK(un_alias), b);
-			gtk_menu_append(GTK_MENU(menu), button);
-			gtk_widget_show(button);
-		}
-
-		button = gtk_menu_item_new_with_label(_("Rename"));
-		g_signal_connect(GTK_OBJECT(button), "activate",
-				   G_CALLBACK(show_rename_buddy), b);
-		gtk_menu_append(GTK_MENU(menu), button);
-		gtk_widget_show(button);
-
-		button = gtk_menu_item_new_with_label(_("Add Buddy Pounce"));
-		g_signal_connect(GTK_OBJECT(button), "activate",
-				   G_CALLBACK(new_bp_callback), b);
-		gtk_menu_append(GTK_MENU(menu), button);
-		gtk_widget_show(button);
-
-		button = gtk_menu_item_new_with_label(_("View Log"));
-		g_signal_connect(GTK_OBJECT(button), "activate",
-				   G_CALLBACK(pressed_log), b->name);
-		gtk_menu_append(GTK_MENU(menu), button);
-		gtk_widget_show(button);
-
-		/*
-		 * Add protocol-specific edit buddy menu items if they exist
-		 */
-		if (b->account->gc && b->account->gc->prpl->edit_buddy_menu) {
-			GList *mo = mo_top = b->account->gc->prpl->edit_buddy_menu(b->account->gc, b->name);
-
-			while (mo) {
-				struct proto_buddy_menu *pbm = mo->data;
-				GtkWidget *button;
-
-				button = gtk_menu_item_new_with_label(pbm->label);
-				g_signal_connect(GTK_OBJECT(button), "activate",
-						   G_CALLBACK(menu_click), b->name);
-				gtk_object_set_user_data(GTK_OBJECT(button), mo);
-				gtk_menu_append(GTK_MENU(menu), button);
-				gtk_widget_show(button);
-
-				mo = mo->next;
-			}
-		}
-
-		gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, event->button, event->time);
-
-		return TRUE;
-	}
-
-	return FALSE;
-}
-
+	
+	menuitem = gtk_image_menu_item_new_with_mnemonic("_IM");
+ 	image = gtk_image_new_from_stock(GAIM_STOCK_IM, GTK_ICON_SIZE_MENU);
+	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), image);	
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
+	
+	menuitem = gtk_image_menu_item_new_with_mnemonic("_Alias");
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
+	
+	menuitem = gtk_image_menu_item_new_with_mnemonic("Add Buddy _Pounce");
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
+	
+	menuitem = gtk_image_menu_item_new_with_mnemonic("View _Log");
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 
-/*
- * Find and remove CTree node associated with buddylist entry
- */
-static void ui_remove_buddy_node(struct group *rem_g, struct buddy *rem_b)
-{
-	GtkCTreeNode *gnode = NULL, *bnode;
-
-	if((gnode = gtk_ctree_find_by_row_data(GTK_CTREE(edittree), NULL, rem_g)) != NULL &&
-		(bnode = gtk_ctree_find_by_row_data(GTK_CTREE(edittree), gnode, rem_b)) != NULL)
-	{
-		gtk_ctree_remove_node(GTK_CTREE(edittree), bnode);
-	}
-}
-
-void ui_remove_buddy(struct buddy *rem_b)
-{
-	struct gaim_conversation *c;
-	struct group *rem_g = find_group_by_buddy(rem_b);
-	struct group_show *gs;
-	struct buddy_show *bs;
-
-	gs = find_group_show(rem_g->name);
-	if (gs) {
-		bs = find_buddy_show(gs, rem_b->name);
-		if (bs) {
-			if (g_slist_find(bs->connlist, rem_b->account->gc)) {
-				bs->connlist = g_slist_remove(bs->connlist, rem_b->account->gc);
-				if (!g_slist_length(bs->connlist)) {
-					gs->members = g_slist_remove(gs->members, bs);
-					if (bs->log_timer > 0)
-						g_source_remove(bs->log_timer);
-					bs->log_timer = 0;
-					remove_buddy_show(gs, bs);
-					g_free(bs->name);
-					g_free(bs);
-					if (!g_slist_length(gs->members) &&
-					    (blist_options & OPT_BLIST_NO_MT_GRP)) {
-						shows = g_slist_remove(shows, gs);
-						gtk_tree_remove_item(GTK_TREE(buddies), gs->item);
-						g_free(gs->name);
-						g_free(gs);
-						gs = NULL;
-					}
-				}
-			}
-		}
-		if (gs)
-			update_num_group(gs);
-	}
-
-	c = gaim_find_conversation(rem_b->name);
-
-	if (c)
-		gaim_conversation_update(c, GAIM_CONV_UPDATE_REMOVE);
-
-		/* CONVXXX update_buttons_by_protocol(c); */
-
-	/* Remove CTree node for buddy */
-	ui_remove_buddy_node(rem_g, rem_b);
-
-}
-
-void ui_remove_group(struct group *rem_g)
-{
-	struct group_show *gs;
-	GtkCTreeNode *gnode = gtk_ctree_find_by_row_data(GTK_CTREE(edittree), NULL, rem_g);
-	gtk_ctree_remove_node(GTK_CTREE(edittree), gnode);
-
-
-	if ((gs = find_group_show(rem_g->name)) != NULL) {
-		shows = g_slist_remove(shows, gs);
-		gtk_tree_remove_item(GTK_TREE(buddies), gs->item);
-		g_free(gs->name);
-		g_free(gs);
-	}
-}
-
-gboolean edit_drag_compare_func(GtkCTree *ctree, GtkCTreeNode *source_node,
-				GtkCTreeNode *new_parent, GtkCTreeNode *new_sibling)
-{
-	int *type;
-
-	type = (int *)gtk_ctree_node_get_row_data(GTK_CTREE(ctree), source_node);
-
-	if (*type == EDIT_GROUP) {
-		if (!new_parent)
-			return TRUE;
-	} else if (*type == EDIT_BUDDY) {
-		if (new_parent) {
-			type = (int *)gtk_ctree_node_get_row_data(GTK_CTREE(ctree), new_parent);
-			if (*type == EDIT_GROUP)
-				return TRUE;
-		}
-	}
+	gtk_widget_show_all(menu);
+	
+	gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 3, event->time);
 
 	return FALSE;
 }
 
-
-/* you really shouldn't call this function */
-void redo_buddy_list()
-{
-	/* so here we can safely assume that we don't have to add or delete anything, we
-	 * just have to go through and reorder everything. remember, nothing is going to
-	 * change connections, so we can assume that we don't have to change any user
-	 * data or anything. this is just a simple reordering. so calm down. */
-	/* note: we only have to do this if we want to strongly enforce order; however,
-	 * order doesn't particularly matter to the stability of the program. but, it's
-	 * kind of nice to have */
-	/* the easy way to implement this is just to go through shows and destroy all the
-	 * group_shows, then go through the connections and put everything back. though,
-	 * there are slight complications with that; most of them deal with timeouts and
-	 * people not seeing the login icon for the full 10 seconds. butt fuck them. */
-	GSList *s = shows;
-	struct group_show *gs;
-	GSList *m;
-	struct buddy_show *bs;
-	GSList *gr;
-	struct group *g;
-	struct buddy *b;
-
-	if (!blist)
-		return;
-
-	while (s) {
-		gs = (struct group_show *)s->data;
-		s = g_slist_remove(s, gs);
-		m = gs->members;
-		gtk_tree_remove_item(GTK_TREE(buddies), gs->item);
-		while (m) {
-			bs = (struct buddy_show *)m->data;
-			m = g_slist_remove(m, bs);
-			if (bs->log_timer > 0)
-				g_source_remove(bs->log_timer);
-			g_free(bs->name);
-			g_free(bs);
-		}
-		g_free(gs->name);
-		g_free(gs);
-	}
-	shows = NULL;
-	gr = groups;
-	while (gr) {
-		g = (struct group *)gr->data;
-		gr = gr->next;
-		gs = find_group_show(g->name);
-		if (!gs && !(blist_options & OPT_BLIST_NO_MT_GRP)
-				&& gaim_group_on_account(g, NULL))
-			gs = new_group_show(g->name);
-		m = g->members;
-		while (m) {
-			b = (struct buddy *)m->data;
-			m = m->next;
-			if (b->present) {
-				if (!gs)
-					gs = new_group_show(g->name);
-				bs = find_buddy_show(gs, b->name);
-				if (!bs) {
-					if (b->account->gc->prpl->list_icon)
-						bs = new_buddy_show(gs, b,
-								b->account->gc->prpl->list_icon(b->
-									uc));
-					else
-						bs = new_buddy_show(gs, b, (char **)no_icon_xpm);
-				}
-				bs->connlist = g_slist_append(bs->connlist, b->account->gc);
-				update_num_group(gs);
-			}
-		}
-	}
-	update_idle_times();
-}
-
-static void edit_tree_move(GtkCTree *ctree, GtkCTreeNode *child,
-						   GtkCTreeNode *parent, GtkCTreeNode *sibling,
-						   gpointer data)
-{
-	int *ctype, *ptype = NULL, *stype = NULL;
-
-	ctype = (int *)gtk_ctree_node_get_row_data(GTK_CTREE(ctree), child);
-
-	if (parent)
-		ptype = (int *)gtk_ctree_node_get_row_data(GTK_CTREE(ctree), parent);
-
-	if (sibling)
-		stype = (int *)gtk_ctree_node_get_row_data(GTK_CTREE(ctree), sibling);
-
-	if (*ctype == EDIT_BUDDY) {
-		/* we moved a buddy. hopefully we just changed groups or positions or something.
-		 * if we changed connections, we copy the buddy to the new connection. if the new
-		 * connection already had the buddy in its buddy list but in a different group,
-		 * we change the group that the buddy is in */
-		struct group *old_g, *new_g = (struct group *)ptype;
-		struct buddy *s = NULL, *buddy = (struct buddy *)ctype;
-		int pos;
-
-		old_g = find_group_by_buddy(buddy);
-
-		old_g->members = g_slist_remove(old_g->members, buddy);
-
-		if (sibling) {
-			s = (struct buddy *)stype;
-			pos = g_slist_index(new_g->members, s);
-			if (pos)
-				new_g->members = g_slist_insert(new_g->members, buddy, pos);
-			else
-				new_g->members = g_slist_prepend(new_g->members, buddy);
-		} else
-			new_g->members = g_slist_append(new_g->members, buddy);
-
-		serv_move_buddy(buddy, old_g, new_g);
-
-		gaim_blist_save();
-	} else {		/* group */
-
-		/* move the group. if moving connections, copy the group, and each buddy in the
-		 * group. if the buddy exists in the new connection, leave it where it is. */
-
-		struct group *g, *g2, *group;
-		int pos;
-
-		group = (struct group *)ctype;
-
-		g = group;
-
-		groups = g_slist_remove(groups, g);
-
-		if (sibling) {
-			g2 = (struct group *)stype;
-			pos = g_slist_index(groups, g2);
-			if (pos)
-				groups = g_slist_insert(groups, g, pos);
-			else
-				groups = g_slist_prepend(groups, g);
-		} else
-			groups = g_slist_append(groups, g);
-
-		gaim_blist_save();
-	}
-
-	redo_buddy_list();
-	update_num_groups();
-}
-
-void
-create_prpl_icon(GtkWidget *widget, struct gaim_connection *gc,
-				 GdkPixmap **pixmap, GdkBitmap **mask)
+static void gaim_gtk_blist_reordered_cb(GtkTreeModel *model,
+					GtkTreePath *path,
+					GtkTreeIter *iter,
+					gint        *neworder,
+					gpointer    null)
 {
-    /* This whole thing is a hack--but it looks nice.
-     * Probably should have a prpl->icon(struct gaim_connection *) to
-     * do this. */
-	GtkStyle *style;
-	char **xpm = NULL; 
-
-	if (widget == NULL || gc == NULL || pixmap == NULL || mask == NULL)
-		return;
-	
-	style = gtk_widget_get_style( widget );
-	
-	if (gc->prpl->list_icon) {
-		if (gc->prpl->protocol ==  PROTO_OSCAR) { 
-			if (isdigit(*gc->username)) {
-				xpm = gc->prpl->list_icon(0);
-			} else {
-				xpm = gc->prpl->list_icon(0x10);
-			}
-		} else { 
-			xpm = gc->prpl->list_icon (0);
-		}
-	}
-	if (xpm == NULL)
-		xpm = (char **)no_icon_xpm;
-	
-	*pixmap = gdk_pixmap_create_from_xpm_d(widget->window, mask, &style->bg[GTK_STATE_NORMAL], xpm);
-}
-
-void build_edit_tree()
-{
-	GtkCTreeNode *p = NULL, *n;
-	GSList *grp;
-	GSList *mem;
-	struct group *g;
-	struct buddy *b;
-	char *text[1];
-
-	if (!blist)
-		return;
-
-	gtk_clist_freeze(GTK_CLIST(edittree));
-	gtk_clist_clear(GTK_CLIST(edittree));
-
-
-	grp = groups;
-
-	while (grp) {
-
-		g = (struct group *)grp->data;
-
-		text[0] = g->name;
-
-		p = gtk_ctree_insert_node(GTK_CTREE(edittree), NULL,
-				NULL, text, 5, NULL, NULL, NULL, NULL, 0, 1);
-
-		gtk_ctree_node_set_row_data(GTK_CTREE(edittree), p, g);
-
-		n = NULL;
-
-		mem = g->members;
-
-		while (mem) {
-			char buf[256];
-			b = (struct buddy *)mem->data;
-			if(b->account->gc) {
-				if (get_buddy_alias_only(b)) {
-					g_snprintf(buf, sizeof(buf), "%s (%s)", b->name, get_buddy_alias(b));
-					text[0] = buf;
-				} else
-					text[0] = b->name;
-
-				n = gtk_ctree_insert_node(GTK_CTREE(edittree),
-						p, NULL, text, 5,
-						NULL, NULL, NULL, NULL, 1, 1);
-
-				gtk_ctree_node_set_row_data(GTK_CTREE(edittree), n, b);
-			}
-
-			mem = mem->next;
-		}
-		grp = g_slist_next(grp);
-	}
-
-	gtk_clist_thaw(GTK_CLIST(edittree));
-
-}
-
-void ui_add_buddy(struct gaim_connection *gc, struct group *g, struct buddy *b)
-{
-	GtkCTreeNode *p = NULL, *n;
-	char *text[1];
-	char buf[256];
-	struct group_show *gs = find_group_show(g->name);
-
-	b->edittype = EDIT_BUDDY;
-
-	if (gs)
-		update_num_group(gs);
-
-	if (!blist)
-		return;
-
-	if(!b->account->gc)
-		return;
-
-	p = gtk_ctree_find_by_row_data(GTK_CTREE(edittree), NULL, g);
-	if (get_buddy_alias_only(b)) {
-		g_snprintf(buf, sizeof(buf), "%s (%s)", b->name, get_buddy_alias(b));
-		text[0] = buf;
-	} else
-		text[0] = b->name;
-
-	n = gtk_ctree_insert_node(GTK_CTREE(edittree), p, NULL, text, 5, NULL, NULL, NULL, NULL, 1, 1);
-	gtk_ctree_node_set_row_data(GTK_CTREE(edittree), n, b);
-}
-
-void ui_add_group(struct group *g)
-{
-	GtkCTreeNode *p;
-	char *text[1];
-
-	g->edittype = EDIT_GROUP;
-
-	if (!blist)
-		return;
-
-	text[0] = g->name;
-	p = gtk_ctree_insert_node(GTK_CTREE(edittree), NULL, NULL, text, 5, NULL, NULL, NULL, NULL, 0, 1);
-	gtk_ctree_node_set_row_data(GTK_CTREE(edittree), p, g);
-
-	if (!(blist_options & OPT_BLIST_NO_MT_GRP) && !find_group_show(g->name)
-			&& gaim_group_on_account(g, NULL))
-		new_group_show(g->name);
-}
-
-
-static void do_del_buddy(GtkWidget *w, GtkCTree *ctree)
-{
-	GtkCTreeNode *node;
-	struct buddy *b;
-	struct group *g;
-	int *type;
-	GList *i;
-
-	i = GTK_CLIST(edittree)->selection;
-	if (i) {
-		node = i->data;
-		type = (int *)gtk_ctree_node_get_row_data(GTK_CTREE(edittree), node);
-
-		if (*type == EDIT_BUDDY) {
-			b = (struct buddy *)type;
-			g = find_group_by_buddy(b);
-			serv_remove_buddy(b->account->gc, b->name, g->name);
-			remove_buddy(b);
-			gaim_blist_save();
-		} else if (*type == EDIT_GROUP) {
-			remove_group((struct group *)type);
-			gaim_blist_save();
-		}
-
-	} else {
-		/* Nothing selected. */
-	}
-}
-
-
-void import_callback(GtkWidget *widget, void *null)
-{
-	show_import_dialog();
-}
-
-void add_buddy_callback(GtkWidget *widget, void *dummy)
-{
-	char *grp = NULL;
-	GtkCTreeNode *node;
-	GList *i;
-	struct gaim_connection *gc = NULL;
-	int *type;
-
-	i = GTK_CLIST(edittree)->selection;
-	if (i) {
-		node = i->data;
-		type = (int *)gtk_ctree_node_get_row_data(GTK_CTREE(edittree), node);
-
-		if (*type == EDIT_BUDDY) {
-			struct buddy *b = (struct buddy *)type;
-			struct group *g = find_group_by_buddy(b);
-			grp = g->name;
-			gc = b->account->gc;
-		} else if (*type == EDIT_GROUP) {
-			struct group *g = (struct group *)type;
-			grp = g->name;
-			if(g->members)
-				gc = ((struct buddy *)g->members->data)->account->gc;
-			else
-				gc = connections->data;
-		} else {
-			gc = (struct gaim_connection *)type;
-		}
-	}
-	show_add_buddy(gc, NULL, grp, NULL);
+	debug_printf("This doesn't work because GTK is broken\n");
 
 }
 
-void add_group_callback(GtkWidget *widget, void *dummy)
-{
-	GtkCTreeNode *node;
-	GList *i;
-	struct gaim_connection *gc = NULL;
-	int *type;
+/* This is called 10 seconds after the buddy logs in.  It removes the "logged in" icon and replaces it with
+ * the normal status icon */
 
-	i = GTK_CLIST(edittree)->selection;
-	if (i) {
-		node = i->data;
-		type = (int *)gtk_ctree_node_get_row_data(GTK_CTREE(edittree), node);
-		if (*type == EDIT_BUDDY)
-			gc = ((struct buddy *)type)->account->gc;
-		else if (*type == EDIT_GROUP)
-			gc = connections->data;
-		else
-			gc = (struct gaim_connection *)type;
-	}
-	show_add_group(gc);
+static gboolean gaim_reset_present_icon(GaimBlistNode *b)
+{
+	((struct buddy*)b)->present = 1;
+	gaim_gtk_blist_update(NULL, b);
+	return FALSE;
 }
 
-static void im_callback(GtkWidget *widget, GtkTree *tree)
+static void gaim_gtk_blist_add_buddy_cb()
 {
-	GList *i;
-	struct buddy_show *b = NULL;
-	struct gaim_conversation *c;
-	struct gaim_account *account;
-
-	i = GTK_TREE_SELECTION_OLD(tree);
-	if (i) {
-		b = gtk_object_get_user_data(GTK_OBJECT(i->data));
-	}
-	if (!i || !b) {
-		show_im_dialog();
-		return;
-	}
-	if (!b->name)
-		return;
-
-	account = ((struct gaim_connection *)b->connlist->data)->account;
-
-	c = gaim_find_conversation(b->name);
+	GtkTreeSelection *sel = gtk_tree_view_get_selection(gtkblist->treeview);
+	GtkTreeIter iter;
+	GaimBlistNode *node;
+	GValue val;
 
-	if (c == NULL)
-		c = gaim_conversation_new(GAIM_CONV_IM, account, b->name);
-	else {
-		gaim_conversation_set_account(c, account);
-		gaim_window_raise(gaim_conversation_get_window(c));
-	}
-}
-
-static void info_callback(GtkWidget *widget, GtkTree *tree)
-{
-	GList *i;
-	struct buddy_show *b = NULL;
-	i = GTK_TREE_SELECTION_OLD(tree);
-	if (i) {
-		b = gtk_object_get_user_data(GTK_OBJECT(i->data));
-	}
-	if (!i || !b) {
-		show_info_dialog();
-		return;
-	}
-	if (!b->name)
-		return;
-	if (b->connlist)
-		serv_get_info(b->connlist->data, b->name);
+	gtk_tree_selection_get_selected(sel, NULL, &iter);
+	gtk_tree_model_get_value (GTK_TREE_MODEL(gtkblist->treemodel), &iter, NODE_COLUMN, &val);
+	node = g_value_get_pointer(&val);
+	
+	if (GAIM_BLIST_NODE_IS_BUDDY(node)) 
+		show_add_buddy(NULL, NULL, ((struct group*)node->parent)->name, NULL);
+	else if (GAIM_BLIST_NODE_IS_GROUP(node))
+		show_add_buddy(NULL, NULL, ((struct group*)node)->name, NULL);
+	
 }
 
 
-void chat_callback(GtkWidget *widget, GtkTree *tree)
-{
-	join_chat();
-}
-
-static void away_callback(GtkWidget *widget, GtkTree *tree)
+/***************************************************
+ *            Crap                                 *
+ ***************************************************/
+static GtkItemFactoryEntry blist_menu[] =
 {
-	GSList *awy = away_messages;
-	static GtkWidget *menu = NULL;
-	GtkWidget *menuitem;
-
-	if (!awy)
-		return;
+	/* Buddies menu */
+	{ N_("/_Buddies"), NULL, NULL, 0, "<Branch>" },
+	{ N_("/Buddies/_Add A Buddy..."), "<CTL>B", gaim_gtk_blist_add_buddy_cb, 0,
+	  "<StockItem>", GTK_STOCK_ADD },
+	{ N_("/Buddies/New _Instant Message..."), "<CTL>I", show_im_dialog, 0,
+	  "<StockItem>", GAIM_STOCK_IM },
+	{ N_("/Buddies/Join a _Chat..."), "<CTL>C", join_chat, 0, 
+	  "<StockItem>", GAIM_STOCK_CHAT },
+	{ N_("/Buddies/sep1"), NULL, NULL, 0, "<Separator>" },
+	{ N_("/Buddies/Get _User Info..."), "<CTL>J", show_info_dialog, 0,
+	  "<StockItem>", GAIM_STOCK_INFO },
+	{ N_("/Buddies/sep2"), NULL, NULL, 0, "<Separator>" },
+	{ N_("/Buddies/_Signoff"), "<CTL>D", signoff_all, 0, NULL },
+	{ N_("/Buddies/_Quit"), "<CTL>Q", do_quit, 0,
+	  "<StockItem>", GTK_STOCK_QUIT },
 
-	/*
-	 * If a menu already exists, destroy it before creating a new one,
-	 * thus freeing-up the memory it occupied.
-	 */
-	if(menu)
-		gtk_widget_destroy(menu);
+	/* Tools */ 
+	{ N_("/_Tools"), NULL, NULL, 0, "<Branch>" },
+	{ N_("/Tools/_Away"), NULL, NULL, 0, "<Branch>" },
+	{ N_("/Tools/Buddy _Pounce"), NULL, NULL, 0, "<Branch>" },
+	{ N_("/Tools/sep1"), NULL, NULL, 0, "<Separator>" },
+	{ N_("/Tools/A_ccounts"), "<CTL>A", account_editor, 0, NULL },
+	{ N_("/Tools/Preferences"), "<CTL>P", show_prefs, 0, 
+	  "<StockItem>", GTK_STOCK_PREFERENCES },
+	{ N_("/Tools/_File Transfers"), NULL, NULL, 0,
+	  "<StockItem>", GTK_STOCK_REVERT_TO_SAVED },
+	{ N_("/Tools/sep2"), NULL, NULL, 0, "<Separator>" },
+	{ N_("/Tools/P_rotocol Actions"), NULL, NULL, 0, "<Branch>" },
+	{ N_("/Tools/Pr_ivacy"), NULL, show_privacy_options, 0, NULL },
+	{ N_("/Tools/View System _Log"), NULL, NULL, 0, NULL },
 
-	menu = gtk_menu_new();
+	/* Help */
+	{ N_("/_Help"), NULL, NULL, 0, "<Branch>" },
+	{ N_("/Help/Online _Help"), "F1", NULL, 0,
+	  "<StockItem>", GTK_STOCK_HELP },
+	{ N_("/Help/_Debug Window"), NULL, NULL, 0, NULL },
+	{ N_("/Help/_About"), NULL, show_about, 0, NULL },
+
+};
 
-	while (awy) {
-		struct away_message *a = awy->data;
+/*********************************************************
+ * Private Utility functions                             *
+ *********************************************************/
+
+static GdkPixbuf *gaim_gtk_blist_get_status_icon(struct buddy *b) 
+{
+	GdkPixbuf *status = NULL;
+	GdkPixbuf *scale = NULL;
+	GdkPixbuf *emblem = NULL;
+	gchar *filename = NULL;	
+	const char *protoname = NULL;
 
-		menuitem = gtk_menu_item_new_with_label(a->name);
-		gtk_menu_append(GTK_MENU(menu), menuitem);
-		g_signal_connect(GTK_OBJECT(menuitem), "activate",
-				   G_CALLBACK(do_away_message), a);
-		gtk_widget_show(menuitem);
-		awy = awy->next;
+	char *se,*sw,*nw,*ne;
+	
+	int scalesize = 30;
+
+	struct prpl* prpl = find_prpl(b->account->protocol);
+	if (prpl->list_icon)
+		protoname = prpl->list_icon(b->account, b);
+	if (prpl->list_emblems)
+		prpl->list_emblems(b, &se, &sw, &nw, &ne);
+	
+	if (!(blist_options & OPT_BLIST_SHOW_ICONS)) {
+		scalesize = 15;
+		sw = nw = ne = NULL; /* So that only the se icon will composite */
 	}
 
-	gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 1, GDK_CURRENT_TIME );
-}
+		
+	if (b->present == 2) {
+		/* If b->present is 2, that means this buddy has just signed on.  We use the "login" icon for the
+		 * status, and we set a timeout to change it to a normal icon after 10 seconds. */
+		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", "login.png", NULL);
+		status = gdk_pixbuf_new_from_file(filename,NULL);
+		g_free(filename);
+		g_timeout_add(10000, (GSourceFunc)gaim_reset_present_icon, b);
+		
+		/* "Hey, what's all this crap?" you ask.  Status icons will be themeable too, and 
+		   then it will look up protoname from the theme */
+	} else {
+		char *image = g_strdup_printf("%s.png", protoname);
+		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", image, NULL);
+		status = gdk_pixbuf_new_from_file(filename,NULL);
+		g_free(image);
+		g_free(filename);
 
-void rem_bp(GtkWidget *w, struct buddy_pounce *b)
-{
-	buddy_pounces = g_list_remove(buddy_pounces, b);
-	do_bp_menu();
-	save_prefs();
+	}
+	
+	if (!status)
+		return NULL;
+	
+	scale =  gdk_pixbuf_scale_simple(status, scalesize, scalesize, GDK_INTERP_BILINEAR);
+	
+	/* Emblems */
+	
+	/* Each protocol can specify up to four "emblems" to composite over the base icon.  "away", "busy", "mobile user"
+	 * are all examples of states represented by emblems.  I'm not even really sure I like this yet. */
+	
+	/* XXX Clean this crap up, yo. */
+	if (se) {
+		char *image = g_strdup_printf("%s.png", se);
+		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", image, NULL);
+		g_free(image);
+		emblem = gdk_pixbuf_new_from_file(filename,NULL);
+		g_free(filename);
+		if (emblem) {
+			if (blist_options & OPT_BLIST_SHOW_ICONS)
+				gdk_pixbuf_composite (emblem,
+						      scale, 15, 15,
+						      15, 15,
+						      15, 15,
+						      1, 1,
+						      GDK_INTERP_BILINEAR,
+						      255);
+			else
+					gdk_pixbuf_composite (emblem,
+						      scale, 0, 0,
+						      15, 15,
+						      0, 0,
+						      1, 1,
+						      GDK_INTERP_BILINEAR,
+						      255);
+		}
+	}
+	if (sw) {
+		char *image = g_strdup_printf("%s.png", sw);
+		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", image, NULL);
+		g_free(image);
+		emblem = gdk_pixbuf_new_from_file(filename,NULL);
+		g_free(filename);
+		if (emblem) {
+				gdk_pixbuf_composite (emblem,
+						      scale, 0, 15,
+						      15, 15,
+						      0, 15,
+						      1, 1,
+						      GDK_INTERP_BILINEAR,
+						      255);
+		}
+	}
+	if (nw) {
+		char *image = g_strdup_printf("%s.png", nw);
+		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", image, NULL);
+		g_free(image);
+		emblem = gdk_pixbuf_new_from_file(filename,NULL);
+		g_free(filename);
+		if (emblem) {
+			gdk_pixbuf_composite (emblem,
+					      scale, 0, 0,
+					      15, 15,
+					      0, 0,
+					      1, 1,
+					      GDK_INTERP_BILINEAR,
+					      255);
+		}
+	}
+	if (ne) {
+		char *image = g_strdup_printf("%s.png", ne);
+		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", image, NULL);
+		g_free(image);
+		emblem = gdk_pixbuf_new_from_file(filename,NULL);
+		g_free(filename);
+		if (emblem) {
+			gdk_pixbuf_composite (emblem,
+					      scale, 15, 0,
+					      15, 15,
+					      15, 0,
+					      1, 1,
+					      GDK_INTERP_BILINEAR,
+					      255);
+		}
+	}		
+
+	
+	/* Idle gray buddies affects the whole row.  This converts the status icon to greyscale. */
+	if (b->idle) 
+		gdk_pixbuf_saturate_and_pixelate(scale, scale, 0, FALSE);
+	return scale;
 }
 
-void do_pounce(struct gaim_connection *gc, char *name, int when)
+static GdkPixbuf *gaim_gtk_blist_get_buddy_icon(struct buddy *b) 
 {
-	char *who;
-
-	struct buddy_pounce *b;
-	struct gaim_conversation *c;
-	struct gaim_account *account;
-
-	GList *bp = buddy_pounces;
-
-	who = g_strdup(normalize (name));
-
-	while (bp) {
-		b = (struct buddy_pounce *)bp->data;
-		bp = bp->next;	/* increment the list here because rem_bp can make our handle bad */
-
-		if (!(b->options & when))
-			continue;
-
-		account = gaim_account_find(b->pouncer, b->protocol);	/* find our user */
-		if (account == NULL)
-			continue;
-
-		/* check and see if we're signed on as the pouncer */
-		if (account->gc != gc)
-			continue;
-
-		if (!g_strcasecmp(who, normalize (b->name))) {	/* find someone to pounce */
-			if (b->options & OPT_POUNCE_POPUP) {
-				c = gaim_find_conversation(name);
-
-				if (c == NULL)
-					c = gaim_conversation_new(GAIM_CONV_IM, account, name);
-				else
-					gaim_conversation_set_account(c, account);
-			}
-			if (b->options & OPT_POUNCE_NOTIFY) {
-				char tmp[1024];
-
-				/* I know the line below is really ugly. I only did it this way
-				 * because I thought it'd be funny :-) */
-
-				g_snprintf(tmp, sizeof(tmp), 
-					   (when & OPT_POUNCE_TYPING) ? _("%s has started typing to you") :
-					   (when & OPT_POUNCE_SIGNON) ? _("%s has signed on") : 
-					   (when & OPT_POUNCE_UNIDLE) ? _("%s has returned from being idle") : 
-					   _("%s has returned from being away"), name);
-				
-				do_error_dialog(tmp, NULL, GAIM_INFO);
-			}
-			if (b->options & OPT_POUNCE_SEND_IM) {
-				if (strlen(b->message) > 0) {
-					c = gaim_find_conversation(name);
-
-					if (c == NULL)
-						c = gaim_conversation_new(GAIM_CONV_IM, account, name);
-					else
-						gaim_conversation_set_account(c, account);
-
-					gaim_conversation_write(c, NULL, b->message, -1,
-											WFLAG_SEND, time(NULL));
-
-					serv_send_im(account->gc, name, b->message, -1, 0);
-				}
-			}
-			if (b->options & OPT_POUNCE_COMMAND) {
-#ifndef _WIN32
-				int pid = fork();
-
-				if (pid == 0) {
-					char *args[4];
-					args[0] = "sh";
-					args[1] = "-c";
-					args[2] = b->command;
-					args[3] = NULL;
-					execvp(args[0], args);
-					_exit(0);
-				}
-#else
-				STARTUPINFO si;
-				PROCESS_INFORMATION pi;
-
-				ZeroMemory( &si, sizeof(si) );
-				si.cb = sizeof(si);
-				ZeroMemory( &pi, sizeof(pi) );
-
-				CreateProcess( NULL, b->command, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi );
-				CloseHandle( pi.hProcess );
-				CloseHandle( pi.hThread );
-#endif /*_WIN32*/
-			}
-			if (b->options & OPT_POUNCE_SOUND) {
-				if (strlen(b->sound))
-					gaim_sound_play_file(b->sound);
-				else
-					gaim_sound_play_event(GAIM_SOUND_POUNCE_DEFAULT);
-			}
-
-			if (!(b->options & OPT_POUNCE_SAVE))
-				rem_bp(NULL, b);
-
+	/* This just opens a file from ~/.gaim/icons/screenname.  This needs to change to be more gooder. */
+	char *file = g_build_filename(gaim_user_dir(), "icons", normalize(b->name), NULL);
+	GdkPixbuf *buf = gdk_pixbuf_new_from_file(file, NULL);
+	
+	if (!(blist_options & OPT_BLIST_SHOW_ICONS))
+		return NULL;
+	
+	if (buf) {
+		if (b->idle) {
+			gdk_pixbuf_saturate_and_pixelate(buf, buf, 0, FALSE);
 		}
+		return gdk_pixbuf_scale_simple(buf,30,30, GDK_INTERP_BILINEAR);
 	}
-	g_free(who);
-}
-
-static void new_bp_callback(GtkWidget *w, struct buddy *b)
-{
-	if (b)
-		show_new_bp(b->name, b->account->gc, b->idle, b->uc & UC_UNAVAILABLE, NULL);
-	else
-		show_new_bp(NULL, NULL, 0, 0, NULL);
-}
-
-static void edit_bp_callback(GtkWidget *w, struct buddy_pounce *b)
-{
-  show_new_bp(NULL, NULL, 0, 0, b);
+	return NULL;
 }
 
-static GtkTooltips *bp_tooltip = NULL;
-void do_bp_menu()
+static gchar *gaim_gtk_blist_get_name_markup(struct buddy *b) 
 {
-	GtkWidget *menuitem, *mess, *messmenu;
-	static GtkWidget *remmenu;
-	GtkWidget *remitem;
-	GtkWidget *sep;
-	GList *l;
-	struct buddy_pounce *b;
-	GList *bp = buddy_pounces;
+	char *name = gaim_get_buddy_alias(b);
+	char *esc = g_markup_escape_text(name, strlen(name)), *text = NULL;
+	/* XXX Clean up this crap */
+	
+	int ihrs, imin;
+	char *idletime = "";
+	char *warning = idletime;
+       	time_t t;
 
-	/* Tooltip for editing bp's */
-	if(!bp_tooltip)
-		bp_tooltip = gtk_tooltips_new();
-
-	l = gtk_container_children(GTK_CONTAINER(bpmenu));
-
-	while (l) {
-		gtk_widget_destroy(GTK_WIDGET(l->data));
-		l = l->next;
+	if (!(blist_options & OPT_BLIST_SHOW_ICONS)) {
+		if (b->idle > 0) {
+			text =  g_strdup_printf("<span color='gray'>%s</span>",
+						esc);	
+			g_free(esc);
+			return text;
+		} else {
+			return esc;
+		}
 	}
 
-	remmenu = gtk_menu_new();
+	time(&t);
+	ihrs = (t - b->idle) / 3600;
+	imin = ((t - b->idle) / 60) % 60;
+	
+	if (b->idle) {
+		if (ihrs)
+			idletime = g_strdup_printf(_("Idle (%dh%02dm)"), ihrs, imin);
+		else
+			idletime = g_strdup_printf(_("Idle (%dm)"), imin);
+	}
+	
+	if (b->evil > 0)
+		warning = g_strdup_printf(_("Warned (%d%%)"), b->evil);
+	
+	if (b->idle) 
+		text =  g_strdup_printf("<span color='grey'>%s</span>\n<span color='gray' size='smaller'>%s %s</span>",
+					esc,
+					idletime, warning);
+	else
+		text = g_strdup_printf("%s\n<span color='gray' size='smaller'>%s</span>", esc, warning);
+
+	if (idletime[0])
+		g_free(idletime);
+	if (warning[0])
+		g_free(warning);
+	
+	return text;
+}
 
-	menuitem = gtk_menu_item_new_with_label(_("New Buddy Pounce"));
-	gtk_menu_append(GTK_MENU(bpmenu), menuitem);
-	gtk_widget_show(menuitem);
-	g_signal_connect(GTK_OBJECT(menuitem), "activate", G_CALLBACK(new_bp_callback), NULL);
+/**********************************************************************************
+ * Public API Functions                                                           *
+ **********************************************************************************/
+static void gaim_gtk_blist_show(struct gaim_buddy_list *list)
+{
+	GtkItemFactory *ift;
+	GtkCellRenderer *rend;
+	GtkTreeViewColumn *column;
+	GtkWidget *sw;
+	GtkWidget *button;
+	GValue *val;
+	GtkTreeIter iter;
+	
+	if (gtkblist) {
+		gtk_widget_show(gtkblist->window);
+		return;
+	}
+		
+	gtkblist = g_new0(struct gaim_gtk_buddy_list , 1);
+	gtkblist->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+	gtk_window_set_title(GTK_WINDOW(gtkblist->window), _("Buddy List"));
+	
+	gtkblist->vbox = gtk_vbox_new(FALSE, 6);
+	gtk_container_add(GTK_CONTAINER(gtkblist->window), gtkblist->vbox);
 
-
-	while (bp) {
+	/******************************* Menu bar *************************************/
+	ift = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<GaimMain>", NULL);
+	gtk_item_factory_create_items(ift, sizeof(blist_menu) / sizeof(*blist_menu),
+				      blist_menu, NULL);
+	gtk_box_pack_start(GTK_BOX(gtkblist->vbox), gtk_item_factory_get_widget(ift, "<GaimMain>"), FALSE, FALSE, 0);
 
-		b = (struct buddy_pounce *)bp->data;
-		remitem = gtk_menu_item_new_with_label(b->name);
-		gtk_menu_append(GTK_MENU(remmenu), remitem);
-		gtk_widget_show(remitem);
-		g_signal_connect(GTK_OBJECT(remitem), "activate", G_CALLBACK(rem_bp), b);
+	/****************************** GtkTreeView **********************************/
+	sw = gtk_scrolled_window_new(NULL,NULL);
+	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_IN);
+	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+	gtk_widget_set_usize(sw, 200, 200);
+
+	gtkblist->treemodel = gtk_tree_store_new(BLIST_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, 
+						 G_TYPE_STRING, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_POINTER);
+	/* This is broken because GTK is broken
+ 	g_signal_connect(G_OBJECT(gtkblist->treemodel), "row-reordered", gaim_gtk_blist_reordered_cb, NULL); */
+ 
+	gtkblist->treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(gtkblist->treemodel));
+
+	gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(gtkblist->treeview), FALSE);
 
-		bp = bp->next;
+	rend = gtk_cell_renderer_pixbuf_new();
+	column = gtk_tree_view_column_new_with_attributes("Status", rend, "pixbuf", STATUS_ICON_COLUMN, NULL);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(gtkblist->treeview), column);
+	
+	rend = gtk_cell_renderer_text_new();
+	column = gtk_tree_view_column_new_with_attributes("Name", rend, "markup", NAME_COLUMN, NULL);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(gtkblist->treeview), column);
+	
+	rend = gtk_cell_renderer_text_new();
+	column = gtk_tree_view_column_new_with_attributes("Warning", rend, "text", WARNING_COLUMN, NULL);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(gtkblist->treeview), column);
+
+	rend = gtk_cell_renderer_text_new();
+	column = gtk_tree_view_column_new_with_attributes("Idle", rend, "text", IDLE_COLUMN, NULL);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(gtkblist->treeview), column);
 
-	}
+	rend = gtk_cell_renderer_pixbuf_new();
+	column = gtk_tree_view_column_new_with_attributes("Buddy Icon", rend, "pixbuf", BUDDY_ICON_COLUMN, NULL);
+	g_object_set(rend, "xalign", 1.0, NULL);
+	gtk_tree_view_append_column(GTK_TREE_VIEW(gtkblist->treeview), column);
+	
+	g_signal_connect(G_OBJECT(gtkblist->treeview), "row-activated", G_CALLBACK(gtk_blist_row_activated_cb), NULL);
+	g_signal_connect(G_OBJECT(gtkblist->treeview), "button-press-event", G_CALLBACK(gtk_blist_button_press_cb), NULL);
 
-	menuitem = gtk_menu_item_new_with_label(_("Remove Buddy Pounce"));
-	gtk_menu_append(GTK_MENU(bpmenu), menuitem);
-	gtk_widget_show(menuitem);
-	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), remmenu);
-	gtk_widget_show(remmenu);
+	gtk_box_pack_start(GTK_BOX(gtkblist->vbox), sw, TRUE, TRUE, 0);
+	gtk_container_add(GTK_CONTAINER(sw), gtkblist->treeview);
+	
+	/**************************** Button Box **************************************/
+	gtkblist->bbox = gtk_hbox_new(TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(gtkblist->vbox), gtkblist->bbox, FALSE, FALSE, 0);
+	button = gaim_pixbuf_button_from_stock(_("IM"), GAIM_STOCK_IM, GAIM_BUTTON_VERTICAL);
+	gtk_box_pack_start(GTK_BOX(gtkblist->bbox), button, FALSE, FALSE, 0);
+	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+	button = gaim_pixbuf_button_from_stock(_("Get Info"), GAIM_STOCK_INFO, GAIM_BUTTON_VERTICAL);
+	gtk_box_pack_start(GTK_BOX(gtkblist->bbox), button, FALSE, FALSE, 0);
+	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+	button = gaim_pixbuf_button_from_stock(_("Chat"), GAIM_STOCK_CHAT, GAIM_BUTTON_VERTICAL);
+	gtk_box_pack_start(GTK_BOX(gtkblist->bbox), button, FALSE, FALSE, 0);
+	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+	button = gaim_pixbuf_button_from_stock(_("Away"), GAIM_STOCK_AWAY, GAIM_BUTTON_VERTICAL);
+	gtk_box_pack_start(GTK_BOX(gtkblist->bbox), button, FALSE, FALSE, 0);
+	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+
+	/* OK... let's show this bad boy. */
+	gaim_gtk_blist_refresh(list);
+	gtk_widget_show_all(gtkblist->window);
+}
 
-	sep = gtk_hseparator_new();
-	menuitem = gtk_menu_item_new();
-	gtk_menu_append(GTK_MENU(bpmenu), menuitem);
-	gtk_container_add(GTK_CONTAINER(menuitem), sep);
-	gtk_widget_set_sensitive(menuitem, FALSE);
-	gtk_widget_show(menuitem);
-	gtk_widget_show(sep);
+void gaim_gtk_blist_refresh(struct gaim_buddy_list *list)
+{
+	GaimBlistNode *group = list->root;
+	GaimBlistNode *buddy;
+	
+	while (group) {
+		gaim_gtk_blist_update(list, group);
+		buddy = group->child;
+		while (buddy) {
+			gaim_gtk_blist_update(list, buddy);		
+			buddy = buddy->next;
+		}
+		group = group->next;
+	}
+}
 
-	bp = buddy_pounces;
+static void gaim_gtk_blist_update(struct gaim_buddy_list *list, GaimBlistNode *node)
+{
+	GtkTreeIter *iter = node->ui_data;
+	GtkTreePath *path;
+	GdkPixbuf *buf = NULL;
+	gboolean expand = FALSE;
 
-	while (bp) {
-
-		b = (struct buddy_pounce *)bp->data;
+	if (!gtkblist)
+		return;
+				
+	if (!iter) { /* This is a newly added node */
+		if (GAIM_BLIST_NODE_IS_BUDDY(node)) {
+			if (((struct buddy*)node)->present) {
+				if(node->parent && node->parent && !node->parent->ui_data) {
+					
+					/* This buddy's group has not yet been added.  We do that here */
+					
+					char *mark = g_strdup_printf("<span weight='bold'>%s</span>",  ((struct group*)node->parent)->name);
+					GtkTreeIter *iter2 = g_new0(GtkTreeIter, 1);
+					GaimBlistNode *insertat = node->parent->prev;
+					GtkTreeIter *insertatiter = NULL;
 
-		menuitem = gtk_menu_item_new_with_label(b->name);
-		gtk_menu_append(GTK_MENU(bpmenu), menuitem);
-		messmenu = gtk_menu_new();
-		gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), messmenu);
-		gtk_widget_show(menuitem);
+					/* We traverse backwards through the buddy list to find the node in the tree to insert it after */
+					while (insertat && !insertat->ui_data)
+						insertat = insertat->prev;
+					if (insertat)
+						insertatiter = insertat->ui_data;
+					
+					/* This is where we create the node and add it. */
+					gtk_tree_store_insert_after(gtkblist->treemodel, iter2, 
+								    node->parent->parent ? node->parent->parent->ui_data : NULL, insertatiter);
+					gtk_tree_store_set(gtkblist->treemodel, iter2, 
+							   STATUS_ICON_COLUMN, gtk_widget_render_icon
+							   (gtkblist->treeview,GTK_STOCK_OPEN,GTK_ICON_SIZE_LARGE_TOOLBAR,NULL),
+							   NAME_COLUMN, mark,
+							   NODE_COLUMN, node->parent,
+							   -1);
+					node->parent->ui_data = iter2;
+					expand = TRUE;
+				}
+				iter = g_new0(GtkTreeIter, 1);
+				node->ui_data = iter;
+				
+				gtk_tree_store_insert_after (gtkblist->treemodel, iter, node->parent  ? node->parent->ui_data : NULL,
+							     node->prev ? node->prev->ui_data : NULL);
+			
+							   
+				if (expand) {       /* expand was set to true if this is the first element added to a group.  In such case
+						     * we expand the group node */
+					GtkTreePath *path = gtk_tree_model_get_path(GTK_TREE_MODEL(gtkblist->treemodel), node->parent->ui_data);
+					gtk_tree_view_expand_row(GTK_TREE_VIEW(gtkblist->treeview), path, TRUE);	
+				}
+				node->ui_data = iter;
+			}
+		} 
+	}
+	
+	if (GAIM_BLIST_NODE_IS_BUDDY(node) && ((struct buddy*)node)->present) {
+		GdkPixbuf *status, *avatar;
+		char *mark;
+		
+		status = gaim_gtk_blist_get_status_icon((struct buddy*)node);
+		avatar = gaim_gtk_blist_get_buddy_icon((struct buddy*)node);
+		mark   = gaim_gtk_blist_get_name_markup((struct buddy*)node);
+		
+		gtk_tree_store_set(gtkblist->treemodel, iter, 
+				   STATUS_ICON_COLUMN, status,
+				   NAME_COLUMN, mark,
+				   WARNING_COLUMN, "",
+				   IDLE_COLUMN, "",
+				   BUDDY_ICON_COLUMN, avatar, 
+				   NODE_COLUMN, node,
+				   -1);
+			
+		g_free(mark);
+		g_object_unref(status);
+		if (avatar) {
+				g_object_unref(avatar);
+		}
+	} else if (GAIM_BLIST_NODE_IS_BUDDY(node) && node->ui_data){
+		gtk_tree_store_remove(GTK_TREE_STORE(gtkblist->treemodel), (GtkTreeIter*)(node->ui_data));
+		g_free(node->ui_data);
+		node->ui_data = NULL;
+	}
+	
+}
 
-		if (strlen(b->message))
-			mess = gtk_menu_item_new_with_label(b->message);
-		else
-			mess = gtk_menu_item_new_with_label(_("[no message]"));
-		gtk_menu_append(GTK_MENU(messmenu), mess);
-		gtk_tooltips_set_tip(bp_tooltip, GTK_WIDGET(mess), _("[Click to edit]"), NULL);
-		gtk_widget_show(mess);
-		g_signal_connect(GTK_OBJECT(mess), "activate", G_CALLBACK(edit_bp_callback), b);
-		bp = bp->next;
+static void gaim_gtk_blist_remove(struct gaim_buddy_list *list, GaimBlistNode *node)
+{
+	if (!node->ui_data)
+		return;
+	gtk_tree_store_remove(gtkblist->treemodel, (GtkTreeIter*)(node->ui_data));
+}
+
+static void gaim_gtk_blist_destroy(struct gaim_buddy_list *list)
+{
+	gtk_widget_destroy(gtkblist->window);
+}
 
-	}
+static void gaim_gtk_blist_set_visible(struct gaim_buddy_list *list, gboolean show)
+{
+	if (show)
+		gtk_widget_show(gtkblist->window);
+	else
+		gtk_widget_hide(gtkblist->window);
+}
 
-}
+static struct gaim_blist_ui_ops blist_ui_ops =
+{
+	gaim_gtk_blist_show,
+	gaim_gtk_blist_update,
+	gaim_gtk_blist_remove,
+	gaim_gtk_blist_destroy,
+	gaim_gtk_blist_set_visible
+};
 
 
-static struct group_show *find_group_show(char *group)
-{
-	GSList *m = shows;
-	struct group_show *g = NULL;
-	char *who = g_strdup(normalize (group));
-
-	while (m) {
-		g = (struct group_show *)m->data;
-		if (!g_strcasecmp(normalize (g->name), who))
-			 break;
-		g = NULL;
-		m = m->next;
-	}
-	g_free(who);
-
-	return g;
-}
-
-static struct buddy_show *find_buddy_show(struct group_show *gs, char *name)
-{
-	GSList *m = gs->members;
-	struct buddy_show *b = NULL;
-	char *who = g_strdup(normalize (name));
-
-	while (m) {
-		b = (struct buddy_show *)m->data;
-		if (!g_strcasecmp(normalize (b->name), who))
-			 break;
-		b = NULL;
-		m = m->next;
-	}
-	g_free(who);
-
-	return b;
-}
-
-static int group_number(char *group)
+struct gaim_blist_ui_ops *gaim_get_gtk_blist_ui_ops()
 {
-	GSList *m;
-	struct group *p;
-	int pos = 0;
-
-	m = groups;
-	while (m) {
-		p = (struct group *)m->data;
-		if (!strcmp(p->name, group))
-			return pos;
-		if (find_group_show(p->name))
-			pos++;
-		m = m->next;
-	}
-	/* um..... we'll never get here */
-	return -1;
-}
-
-static int buddy_number(char *group, char *buddy)
-{
-	struct group *p;
-	GSList *z;
-	struct buddy *b;
-	int pos = 0;
-	char *tmp1 = g_strdup(normalize (buddy));
-	struct group_show *gs = find_group_show(group);
-	struct buddy_show *bs;
-	GSList *seen = NULL;
-
-	p = find_group(group);
-	if(p) {
-		z = p->members;
-		while (z) {
-			b = (struct buddy *)z->data;
-			if (!strcmp(tmp1, normalize (b->name))) {
-				g_free(tmp1);
-				g_slist_free(seen);
-				return pos;
-			}
-			if ((bs = find_buddy_show(gs, b->name))) {
-				if(!g_slist_find(seen, bs)) {
-					seen = g_slist_append(seen, bs);
-					pos++;
-				}
-			}
-			z = z->next;
-		}
-	}
-	/* we shouldn't ever get here */
-	debug_printf("got to bad place in buddy_number\n");
-	g_free(tmp1);
-	g_slist_free(seen);
-	return -1;
+	return &blist_ui_ops;
 }
 
 
 
-static struct group_show *new_group_show(char *group)
-{
-	struct group_show *g = g_new0(struct group_show, 1);
-	int pos = group_number(group);
-	GdkPixmap *pm;
-	GdkBitmap *bm;
-	GtkStyle *style;
-	GtkStyle *style2;
-
-	g->name = g_strdup(group);
-
-	g->item = gtk_tree_item_new();
-
-	g_signal_connect(GTK_OBJECT(g->item), "button_press_event",
-			   G_CALLBACK(handle_click_group), g);
-
-	gtk_tree_insert(GTK_TREE(buddies), g->item, pos);
-
-	gtk_widget_show(g->item);
-
-	g->label = gtk_label_new(group);
-	gtk_misc_set_alignment(GTK_MISC(g->label), 0.0, 0.5);
-	gtk_widget_show(g->label);
-
-	gtk_container_add(GTK_CONTAINER(g->item), g->label);
-
-	shows = g_slist_insert(shows, g, pos);
-
-	/* Rob does drugs - this is still evil, damn you becausse I SAID SO! */
-
-	pm = gdk_pixmap_create_from_xpm_d(g->item->window, 
-		&bm, NULL, arrow_down_xpm);
-
-	gtk_pixmap_set(GTK_PIXMAP(GTK_TREE_ITEM(g->item)->minus_pix_widget), 
-		pm, bm);
-
-	gdk_pixmap_unref(pm);
-	gdk_bitmap_unref(bm);
-
-	pm = gdk_pixmap_create_from_xpm_d(buddies->window, 
-		&bm, NULL, arrow_right_xpm);
-
-	gtk_pixmap_set(GTK_PIXMAP(GTK_TREE_ITEM(g->item)->plus_pix_widget), 
-		pm, bm);
-
-	gdk_pixmap_unref(pm);
-	gdk_bitmap_unref(bm);
-
-//	style = gtk_widget_get_style(GTK_TREE_ITEM(g->item)->pixmaps_box);
-	style2 = gtk_style_copy(gtk_widget_get_style(g->item));
-	style = gtk_style_copy(gtk_widget_get_style(GTK_WIDGET(g->label)));
-
-	style->bg[0] = style2->base[0];
-	gtk_widget_set_style(GTK_TREE_ITEM(g->item)->pixmaps_box, style);
-
-	gtk_style_unref(style);
-	gtk_style_unref(style2);
-
-	/* bad drugs */
-
-	update_num_group(g);
-	
-	return g;
-}
-
-static struct buddy_show *new_buddy_show(struct group_show *gs, struct buddy *buddy, char **xpm)
-{
-	struct buddy_show *b = g_new0(struct buddy_show, 1);
-	GtkWidget *box;
-	GdkPixmap *pm;
-	GdkBitmap *bm;
-	int pos = buddy_number(gs->name, buddy->name);
-	b->sound = 0;
-
-	if (gs->members == NULL) {
-		gs->tree = gtk_tree_new();
-		gtk_tree_item_set_subtree(GTK_TREE_ITEM(gs->item), gs->tree);
-		gtk_tree_item_expand(GTK_TREE_ITEM(gs->item));
-		gtk_widget_show(gs->tree);
-	}
-
-	b->name = g_strdup(buddy->name);
-
-	b->item = gtk_tree_item_new();
-	gtk_tree_insert(GTK_TREE(gs->tree), b->item, pos);
-	gtk_object_set_user_data(GTK_OBJECT(b->item), b);
-	g_signal_connect(GTK_OBJECT(b->item), "button_press_event",
-			   G_CALLBACK(handle_click_buddy), b);
-	gtk_widget_show(b->item);
-
-	box = gtk_hbox_new(FALSE, 1);
-	gtk_container_add(GTK_CONTAINER(b->item), box);
-	gtk_widget_show(box);
-
-	pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm, NULL, xpm ? xpm : no_icon_xpm);
-	b->pix = gtk_pixmap_new(pm, bm);
-	gtk_box_pack_start(GTK_BOX(box), b->pix, FALSE, FALSE, 1);
-	gtk_widget_show(b->pix);
-	if (!(blist_options & OPT_BLIST_SHOW_PIXMAPS))
-		gtk_widget_hide(b->pix);
-	gdk_pixmap_unref(pm);
-	gdk_bitmap_unref(bm);
-
-	b->label = gtk_label_new(get_buddy_alias(buddy));
-	gtk_misc_set_alignment(GTK_MISC(b->label), 0.0, 0.5);
-	gtk_box_pack_start(GTK_BOX(box), b->label, FALSE, FALSE, 1);
-	gtk_widget_show(b->label);
-
-	b->warn = gtk_label_new("");
-	gtk_box_pack_start(GTK_BOX(box), b->warn, FALSE, FALSE, 1);
-	gtk_widget_show(b->warn);
-
-	b->idle = gtk_label_new("");
-	gtk_box_pack_end(GTK_BOX(box), b->idle, FALSE, FALSE, 1);
-	gtk_widget_show(b->idle);
-
-	gs->members = g_slist_insert(gs->members, b, pos);
-	update_num_group(gs);
-	return b;
-}
-
-static void remove_buddy_show(struct group_show *gs, struct buddy_show *bs)
-{
-	/* the name of this function may be misleading, but don't let it fool you. the point
-	 * of this is to remove bs->item from gs->tree, and make sure gs->tree still exists
-	 * and is a valid tree afterwards. Otherwise, Bad Things will happen. */
-	gtk_tree_remove_item(GTK_TREE(gs->tree), bs->item);
-	bs->item = NULL;
-}
-
-static struct group_show *find_gs_by_bs(struct buddy_show *b)
-{
-	GSList *m, *n;
-	struct group_show *g = NULL;
-	struct buddy_show *h;
-
-	m = shows;
-	while (m) {
-		g = (struct group_show *)m->data;
-		n = g->members;
-		while (n) {
-			h = (struct buddy_show *)n->data;
-			if (h == b)
-				return g;
-			n = n->next;
-		}
-		g = NULL;
-		m = m->next;
-	}
-
-	return g;
-}
-
-/* used by this file, and by iconaway.so */
-void hide_buddy_list() {
-	if (blist) {
-		if (!connections || docklet_count) {
-#ifdef _WIN32
-			/* minimize to systray with effects */
-			wgaim_systray_minimize(blist);
-#endif
-			gtk_widget_hide(blist);
-		} else {
-			gtk_window_iconify(GTK_WINDOW(blist));
-		}
-	}
-}
-
-/* mostly used by code in this file */
-void unhide_buddy_list() {
-	if (blist) {
-		if (!GTK_WIDGET_VISIBLE(blist) && blist_options & OPT_BLIST_SAVED_WINDOWS &&
-		      blist_pos.width != 0) {
-			/* don't move it off screen */
-			if (blist_pos.x >= gdk_screen_width()) {
-				blist_pos.x = gdk_screen_width() - 100;
-			} else if (blist_pos.x < 0) {
-				blist_pos.x = 100;
-			}
-
-			if (blist_pos.y >= gdk_screen_height()) {
-				blist_pos.y = gdk_screen_height() - 100;
-			} else if (blist_pos.y < 0) {
-				blist_pos.y = 100;
-			}
-
-			gtk_window_move(GTK_WINDOW(blist), blist_pos.x, blist_pos.y);
-			gtk_window_resize(GTK_WINDOW(blist), blist_pos.width, blist_pos.height);
-		}
-
-		gtk_window_present(GTK_WINDOW(blist));
-	}
-}
-
-/* for the delete_event handler */
-static void close_buddy_list() {
-	if (docklet_count) {
-		hide_buddy_list();
-	} else {
-		do_quit();
-	}
-}
-
-void docklet_add() {
-	docklet_count++;
-	debug_printf("docklet_count: %d\n",docklet_count);
-}
-
-void docklet_remove() {
-	docklet_count--;
-	debug_printf("docklet_count: %d\n",docklet_count);
-	if (!docklet_count) {
-		if (connections) {
-			unhide_buddy_list();
-		} else {
-			gtk_window_present(GTK_WINDOW(mainwindow));
-		}
-	}
-}
-
-void docklet_toggle() {
-	/* Useful for the docklet plugin and also for the win32 tray icon*/
-	/* This is called when one of those is clicked--it will show/hide the 
-	   buddy list/login window--depending on which is active */
-	if (connections && blist) {
-		if (GTK_WIDGET_VISIBLE(blist)) {
-			if (GAIM_WINDOW_ICONIFIED(blist) || obscured) {
-				unhide_buddy_list();
-			} else {
-				hide_buddy_list();
-			}
-		} else {
-#if _WIN32
-			wgaim_systray_maximize(blist);
-#endif
-			unhide_buddy_list();
-		}
-	} else if (connections) {
-		/* we're logging in or something... do nothing */
-		debug_printf("docklet_toggle called with connections but no blist!\n");
-	} else {
-		if (GTK_WIDGET_VISIBLE(mainwindow)) {
-			if (GAIM_WINDOW_ICONIFIED(mainwindow)) {
-				gtk_window_present(GTK_WINDOW(mainwindow));
-			} else {
-#if _WIN32
-				wgaim_systray_minimize(mainwindow);
-#endif
-				gtk_widget_hide(mainwindow);
-			}
-		} else {
-#if _WIN32
-			wgaim_systray_maximize(mainwindow);
-#endif
-			gtk_window_present(GTK_WINDOW(mainwindow));
-		}
-	}
-}
-
-static gboolean log_timeout(gpointer data)
-{
-	struct buddy_show *b = data;
-	/* this part is really just a bad hack because of a bug I can't find */
-	GSList *s = shows;
-	while (s) {
-		struct group_show *gs = s->data;
-		GSList *m = gs->members;
-		while (m) {
-			if (b == m->data)
-				break;
-			m = m->next;
-		}
-		if (m != NULL)
-			break;
-		s = s->next;
-	}
-	if (!s)
-		return FALSE;
-
-	/* this is the real part. */
-	if (!b->connlist) {
-		struct group_show *g = find_gs_by_bs(b);
-		g->members = g_slist_remove(g->members, b);
-		if (blist)
-			remove_buddy_show(g, b);
-		else
-			debug_printf("log_timeout but buddy list not available\n");
-		if ((g->members == NULL) && (blist_options & OPT_BLIST_NO_MT_GRP)) {
-			shows = g_slist_remove(shows, g);
-			if (blist)
-				gtk_tree_remove_item(GTK_TREE(buddies), g->item);
-			g_free(g->name);
-			g_free(g);
-		}
-		g_source_remove(b->log_timer);
-		b->log_timer = 0;
-		g_free(b->name);
-		g_free(b);
-	} else {
-		/* um.... what do we have to do here? just update the pixmap? */
-		GdkPixmap *pm;
-		GdkBitmap *bm;
-		gchar **xpm = NULL;
-		struct gaim_connection *gc = b->connlist->data;
-		struct buddy *light = find_buddy(gc->account, b->name);
-		if (gc->prpl->list_icon)
-			xpm = gc->prpl->list_icon(light->uc);
-		if (xpm == NULL)
-			xpm = (char **)no_icon_xpm;
-		pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm, NULL, xpm);
-		gtk_widget_hide(b->pix);
-		gtk_pixmap_set(GTK_PIXMAP(b->pix), pm, bm);
-		gtk_widget_show(b->pix);
-		if (!(blist_options & OPT_BLIST_SHOW_PIXMAPS))
-			gtk_widget_hide(b->pix);
-		gdk_pixmap_unref(pm);
-		gdk_bitmap_unref(bm);
-		g_source_remove(b->log_timer);
-		b->log_timer = 0;
-		b->sound = 0;
-	}
-	return FALSE;
-}
-
-static char *caps_string(guint caps)
-{
-	static char buf[256], *tmp;
-	int count = 0, i = 0;
-	guint bit = 1;
-	while (bit <= 0x10000) {
-		if (bit & caps) {
-			switch (bit) {
-			case 0x1:
-				tmp = _("Buddy Icon");
-				break;
-			case 0x2:
-				tmp = _("Voice");
-				break;
-			case 0x4:
-				tmp = _("IM Image");
-				break;
-			case 0x8:
-				tmp = _("Chat");
-				break;
-			case 0x10:
-				tmp = _("Get File");
-				break;
-			case 0x20:
-				tmp = _("Send File");
-				break;
-			case 0x40:
-			case 0x200:
-				tmp = _("Games");
-				break;
-			case 0x80:
-				tmp = _("Stocks");
-				break;
-			case 0x100:
-				tmp = _("Send Buddy List");
-				break;
-			case 0x400:
-				tmp = _("EveryBuddy Bug");
-				break;
-			case 0x800:
-				tmp = _("AP User");
-				break;
-			case 0x1000:
-				tmp = _("ICQ RTF");
-				break;
-			case 0x2000:
-				tmp = _("Nihilist");
-				break;
-			case 0x4000:
-				tmp = _("ICQ Server Relay");
-				break;
-			case 0x8000:
-				tmp = _("ICQ Unknown");
-				break;
-			case 0x10000:
-				tmp = _("Trillian Encryption");
-				break;
-			default:
-				tmp = NULL;
-				break;
-			}
-			if (tmp)
-				i += g_snprintf(buf + i, sizeof(buf) - i, "%s%s", (count ? ", " : ""),
-						tmp);
-			count++;
-		}
-		bit <<= 1;
-	}
-	return buf;
-}
-
-/* for this we're just going to assume the first connection that registered the buddy.
- * if it's not the one you were hoping for then you're shit out of luck */
-static void update_idle_time(struct buddy_show *bs)
-{
-	/* this also updates the tooltip since that has idle time in it */
-	char idlet[16], warnl[16];
-	time_t t;
-	int ihrs, imin;
-	struct buddy *b;
-	GtkStyle *style;
-
-	char infotip[2048];
-	char warn[256];
-	char caps[256];
-	char alias[512];
-	char serv_alias[512];
-	char *sotime = NULL, *itime;
-
-	struct gaim_connection *gc;
-
-	int i;
-
-	time(&t);
-	if (!bs->connlist)
-		return;
-	gc = bs->connlist->data;
-	b = find_buddy(gc->account, bs->name);
-	if (!b)
-		return;
-	ihrs = (t - b->idle) / 3600;
-	imin = ((t - b->idle) / 60) % 60;
-
-	if (ihrs)
-		g_snprintf(idlet, sizeof idlet, "(%d:%02d)", ihrs, imin);
-	else
-		g_snprintf(idlet, sizeof idlet, "(%d)", imin);
-
-	gtk_widget_hide(bs->idle);
-	if (b->idle)
-		gtk_label_set(GTK_LABEL(bs->idle), idlet);
-	else
-		gtk_label_set(GTK_LABEL(bs->idle), "");
-	if (blist_options & OPT_BLIST_SHOW_IDLETIME)
-		gtk_widget_show(bs->idle);
-
-	style = gtk_style_new();
-	gtk_style_set_font(style, gdk_font_ref(gtk_style_get_font(bs->label->style)));
-	for (i = 0; i < 5; i++)
-		style->fg[i] = bs->idle->style->fg[i];
-	if ((blist_options & OPT_BLIST_GREY_IDLERS) && (b->idle)) {
-		style->fg[GTK_STATE_NORMAL].red =
-		  (style->fg[GTK_STATE_NORMAL].red / 2) + (style->base[GTK_STATE_NORMAL].red / 2);
-		style->fg[GTK_STATE_NORMAL].green = 
-		  (style->fg[GTK_STATE_NORMAL].green / 2) + (style->base[GTK_STATE_NORMAL].green / 2);
-		style->fg[GTK_STATE_NORMAL].blue = 
-		  (style->fg[GTK_STATE_NORMAL].blue / 2) + (style->base[GTK_STATE_NORMAL].blue / 2);
-	}
-	gtk_widget_set_style(bs->label, style);
-	gtk_style_unref(style);
-
-	/* now we do the tooltip */
-	if (b->signon) {
-		char *stime = sec_to_text(t - b->signon +
-					  ((struct gaim_connection *)bs->connlist->data)->
-					  correction_time);
-		sotime = g_strdup_printf(_("Logged in: %s\n"), stime);
-		g_free(stime);
-	}
-
-	if (b->idle)
-		itime = sec_to_text(t - b->idle);
-	else {
-		itime = g_malloc(1);
-		itime[0] = 0;
-	}
-
-	if (b->evil) {
-		g_snprintf(warn, sizeof warn, _("Warnings: %d%%\n"), b->evil);
-		g_snprintf(warnl, sizeof warnl, "(%d%%)", b->evil);
-	} else {
-		warn[0] = '\0';
-		warnl[0] = '\0';
-	}
-	gtk_widget_hide(bs->warn);
-	gtk_label_set(GTK_LABEL(bs->warn), warnl);
-	if (blist_options & OPT_BLIST_SHOW_WARN)
-		gtk_widget_show(bs->warn);
-
-	if (b->caps)
-		g_snprintf(caps, sizeof caps, _("Capabilities: %s\n"), caps_string(b->caps));
-	else
-		caps[0] = '\0';
-
-	if (b->alias[0])
-		g_snprintf(alias, sizeof alias, _("Alias: %s\n"), b->alias);
-	else
-		alias[0] = '\0';
-
-	if (b->server_alias[0])
-		g_snprintf(serv_alias, sizeof serv_alias, _("Nickname: %s\n"),
-				b->server_alias);
-	else
-		serv_alias[0] = '\0';
-
-	g_snprintf(infotip, sizeof infotip, _("%s%sScreen Name: %s\n%s%s%s%s%s%s"),
-		   alias, serv_alias, b->name, (b->signon ? sotime : ""), warn,
-		   (b->idle ? _("Idle: ") : ""), itime, (b->idle ? "\n" : ""), caps);
-
-	gtk_tooltips_set_tip(tips, GTK_WIDGET(bs->item), infotip, "");
-
-	if (b->signon)
-		g_free(sotime);
-	g_free(itime);
-}
-
-void update_idle_times()
-{
-	GSList *grp = shows;
-	GSList *mem;
-	struct buddy_show *b;
-	struct group_show *g;
+/*********************************************************************
+ * Public utility functions                                          *
+ *********************************************************************/
 
-	while (grp) {
-		g = (struct group_show *)grp->data;
-		mem = g->members;
-		while (mem) {
-			b = (struct buddy_show *)mem->data;
-			update_idle_time(b);
-			mem = mem->next;
-		}
-		grp = grp->next;
-	}
-}
-
-void set_buddy(struct gaim_connection *gc, struct buddy *b)
-{
-	struct group *g = find_group_by_buddy(b);
-	struct group_show *gs;
-	struct buddy_show *bs;
-	GdkPixmap *pm;
-	GdkBitmap *bm;
-	char **xpm = NULL;
-
-	if (!blist)
-		return;
-
-	if (b->present) {
-		if ((gs = find_group_show(g->name)) == NULL)
-			gs = new_group_show(g->name);
-		if ((bs = find_buddy_show(gs, b->name)) == NULL)
-			bs = new_buddy_show(gs, b, (char **)login_icon_xpm);
-		if (!g_slist_find(bs->connlist, gc)) {
-			bs->connlist = g_slist_append(bs->connlist, gc);
-			update_num_group(gs);
-		}
-		if (b->present == 1) {
-			if (bs->sound != 2)
-				gaim_sound_play_event(GAIM_SOUND_BUDDY_ARRIVE);
-			if (blist_options & OPT_BLIST_POPUP)
-				gdk_window_show(blist->window);
-			pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm,
-							  NULL, (char **)login_icon_xpm);
-			gtk_widget_hide(bs->pix);
-			gtk_pixmap_set(GTK_PIXMAP(bs->pix), pm, bm);
-			gtk_widget_show(bs->pix);
-			gdk_pixmap_unref(pm);
-			gdk_bitmap_unref(bm);
-			b->present = 2;
-			if (bs->log_timer > 0)
-				g_source_remove(bs->log_timer);
-			bs->log_timer = g_timeout_add(10000, log_timeout, bs);
-			if ((bs->sound != 2) && (im_options & OPT_IM_LOGON)) {
-				struct gaim_conversation *c = gaim_find_conversation(b->name);
-				if (c) {
-					char tmp[1024];
-					g_snprintf(tmp, sizeof(tmp), _("%s logged in."),
-							   get_buddy_alias(b));
-					gaim_conversation_write(c, NULL, tmp, -1,
-											WFLAG_SYSTEM, time(NULL));
-				} else if (awayqueue && find_queue_total_by_name(b->name)) {
-					struct queued_message *qm = g_new0(struct queued_message, 1);
-					g_snprintf(qm->name, sizeof(qm->name), "%s", b->name);
-					qm->message = g_strdup_printf(_("%s logged in."),
-							get_buddy_alias(b));
-					qm->account = gc->account;
-					qm->tm = time(NULL);
-					qm->flags = WFLAG_SYSTEM;
-					qm->len = -1;
-					message_queue = g_slist_append(message_queue, qm);
-				}
-			}
-			bs->sound = 2;
-		} else if (bs->log_timer == 0) {
-			if (gc->prpl->list_icon)
-				xpm = gc->prpl->list_icon(b->uc);
-			if (xpm == NULL)
-				xpm = (char **)no_icon_xpm;
-			pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm, NULL, xpm);
-			gtk_widget_hide(bs->pix);
-			gtk_pixmap_set(GTK_PIXMAP(bs->pix), pm, bm);
-			gtk_widget_show(bs->pix);
-			if (!(blist_options & OPT_BLIST_SHOW_PIXMAPS))
-				gtk_widget_hide(bs->pix);
-			gdk_pixmap_unref(pm);
-			gdk_bitmap_unref(bm);
-		}
-		update_idle_time(bs);
-	} else {
-		gs = find_group_show(g->name);
-		if (!gs)
-			return;
-		bs = find_buddy_show(gs, b->name);
-		if (!bs)
-			return;
-		if (!bs->connlist)
-			return;	/* we won't do signoff updates for
-				   buddies that have already signed
-				   off */
-		if (bs->sound != 1)
-			gaim_sound_play_event(GAIM_SOUND_BUDDY_LEAVE);
-		if (blist_options & OPT_BLIST_POPUP)
-			gdk_window_show(blist->window);
-		bs->connlist = g_slist_remove(bs->connlist, gc);
-		update_num_group(gs);
-		if (bs->log_timer > 0)
-			g_source_remove(bs->log_timer);
-		bs->log_timer = g_timeout_add(10000, log_timeout, bs);
-		pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm, NULL, logout_icon_xpm);
-		gtk_widget_hide(bs->pix);
-		gtk_pixmap_set(GTK_PIXMAP(bs->pix), pm, bm);
-		gtk_widget_show(bs->pix);
-		gdk_pixmap_unref(pm);
-		gdk_bitmap_unref(bm);
-		if ((bs->sound != 1) && (im_options & OPT_IM_LOGON)) {
-			struct gaim_conversation *c = gaim_find_conversation(b->name);
-			if (c) {
-				char tmp[1024];
-				g_snprintf(tmp, sizeof(tmp), _("%s logged out."),
-						   get_buddy_alias(b));
-				gaim_conversation_write(c, NULL, tmp, -1,
-										WFLAG_SYSTEM, time(NULL));
-			} else if (awayqueue && find_queue_total_by_name(b->name)) {
-				struct queued_message *qm = g_new0(struct queued_message, 1);
-				g_snprintf(qm->name, sizeof(qm->name), "%s",
-						get_buddy_alias(b));
-				qm->message = g_strdup_printf(_("%s logged out."),
-						get_buddy_alias(b));
-				qm->account = gc->account;
-				qm->tm = time(NULL);
-				qm->flags = WFLAG_SYSTEM;
-				qm->len = -1;
-				message_queue = g_slist_append(message_queue, qm);
-			}
-		}
-
-		bs->sound = 1;
-	}
-}
-
-static gboolean delayed_save_prefs(gpointer data) {
-	save_prefs();
-	return FALSE;
-}
-
-static gboolean configure_blist_window(GtkWidget *w, GdkEventConfigure *event, gpointer data) {
-	/* unfortunately GdkEventConfigure ignores the window gravity, but  *
-	 * the only way we have of setting the position doesn't. we have to *
-	 * call get_position and get_size because they do pay attention to  *
-	 * the gravity. this is inefficient and I agree it sucks, but it's  *
-	 * more likely to work correctly.                        - Robot101 */
-	gint x, y;
-
-	/* check for visibility because when we aren't visible, this will   *
-	 *  give us bogus (0,0) coordinates.                     - xOr      */
-	if (GTK_WIDGET_VISIBLE(blist)) {
-	  gtk_window_get_position(GTK_WINDOW(blist), &x, &y);
-
-	  if (x != blist_pos.x ||
-	      y != blist_pos.y ||
-	      event->width != blist_pos.width ||
-	      event->height != blist_pos.height) {
-	    blist_pos.x = x;
-	    blist_pos.y = y;
-	    blist_pos.width = event->width;
-	    blist_pos.height = event->height;
-
-	    if (!g_main_context_find_source_by_user_data(NULL, &delayed_save_prefs)) {
-	      debug_printf("queueing save of blist prefs\n");
-	      g_timeout_add(5000, delayed_save_prefs, &delayed_save_prefs);
-	    }
-	  }
-	}
-
-	return FALSE;
-}
-
-static void visibility_blist_window(GtkWidget *w, GdkEventVisibility *event, void *data) {
-	if (event->state == GDK_VISIBILITY_FULLY_OBSCURED) {
-		obscured = TRUE;
-	} else {
-		obscured = FALSE;
-	}
-}
-
-/*******************************************************************
- *
- * Helper funs for making the menu
- *
- *******************************************************************/
-
-void gaim_separator(GtkWidget *menu)
-{
-	GtkWidget *menuitem;
-
-	menuitem = gtk_separator_menu_item_new();
-	gtk_widget_show(menuitem);
-	gtk_menu_append(GTK_MENU(menu), menuitem);
-}
-
-
-void build_imchat_box(gboolean on)
-{
-	if (on) {
-		if (imchatbox)
-			return;
-
-		imbutton = gtk_button_new_with_label(_("IM"));
-		infobutton = gtk_button_new_with_label(_("Info"));
-		chatbutton = gtk_button_new_with_label(_("Chat"));
-		awaybutton = gtk_button_new_with_label(_("Away"));
-
-		imchatbox = gtk_hbox_new(TRUE, 10);
-
-		gtk_button_set_relief(GTK_BUTTON(imbutton), GTK_RELIEF_NONE);
-		gtk_button_set_relief(GTK_BUTTON(infobutton), GTK_RELIEF_NONE);
-		gtk_button_set_relief(GTK_BUTTON(chatbutton), GTK_RELIEF_NONE);
-		gtk_button_set_relief(GTK_BUTTON(awaybutton), GTK_RELIEF_NONE);
-
-		/* Put the buttons in the hbox */
-		gtk_widget_show(imbutton);
-		gtk_widget_show(infobutton);
-		gtk_widget_show(chatbutton);
-		gtk_widget_show(awaybutton);
-
-		gtk_box_pack_start(GTK_BOX(imchatbox), imbutton, TRUE, TRUE, 0);
-		gtk_box_pack_start(GTK_BOX(imchatbox), infobutton, TRUE, TRUE, 0);
-		gtk_box_pack_start(GTK_BOX(imchatbox), chatbutton, TRUE, TRUE, 0);
-		gtk_box_pack_start(GTK_BOX(imchatbox), awaybutton, TRUE, TRUE, 0);
-		gtk_container_border_width(GTK_CONTAINER(imchatbox), 5);
-
-		g_signal_connect(GTK_OBJECT(imbutton), "clicked", G_CALLBACK(im_callback),
-				   buddies);
-		g_signal_connect(GTK_OBJECT(infobutton), "clicked", G_CALLBACK(info_callback),
-				   buddies);
-		g_signal_connect(GTK_OBJECT(chatbutton), "clicked", G_CALLBACK(chat_callback),
-				   buddies);
-		g_signal_connect(GTK_OBJECT(awaybutton), "clicked", G_CALLBACK(away_callback),
-				   buddies);
-
-		gtk_tooltips_set_tip(tips, infobutton, _("Information on selected Buddy"), "Penguin");
-		gtk_tooltips_set_tip(tips, imbutton, _("Send Instant Message"), "Penguin");
-		gtk_tooltips_set_tip(tips, chatbutton, _("Start/join a Buddy Chat"), "Penguin");
-		gtk_tooltips_set_tip(tips, awaybutton, _("Activate Away Message"), "Penguin");
-
-		gtk_box_pack_start(GTK_BOX(buddypane), imchatbox, FALSE, FALSE, 0);
-
-		gtk_widget_show(imchatbox);
-	} else {
-		if (imchatbox)
-			gtk_widget_destroy(imchatbox);
-		imchatbox = NULL;
-	}
-}
-
-extern GtkWidget *debugbutton;
-void clicked_debug (GtkWidget *widg, gpointer pntr)
-{	
-	if (debugbutton)
-		gtk_button_clicked(GTK_BUTTON(debugbutton));
-	else {
-		misc_options ^= OPT_MISC_DEBUG;
-		show_debug();
-	}
-}
-
-void
-show_xfer_dialog(GtkMenuItem *item, gpointer user_data)
+GdkPixbuf *
+create_prpl_icon(struct gaim_account *account)
 {
-	struct gaim_gtkxfer_dialog *dialog;
-
-	dialog = gaim_get_gtkxfer_dialog();
-
-	if (dialog == NULL) {
-		dialog = gaim_gtkxfer_dialog_new();
-
-		gaim_set_gtkxfer_dialog(dialog);
-	}
-
-	gaim_gtkxfer_dialog_show(dialog);
-}
-
-void make_buddy_list()
-{
-
-	/* Build the buddy list, based on *config */
-
-	GtkWidget *sw;
-	GtkWidget *menu;
-#ifdef NO_MULTI
-	GtkWidget *setmenu;
-	GtkWidget *findmenu;
-#endif
-	GtkWidget *menubar;
-	GtkWidget *vbox;
-	GtkWidget *menuitem;
-	GtkWidget *notebook;
-	GtkWidget *label;
-	GtkWidget *bbox;
-	GtkWidget *tbox;
-
-	if (blist) {
-		return;
+	struct prpl *prpl = find_prpl(account->protocol);
+	GdkPixbuf *status = NULL;
+	char *filename = NULL;
+	const char *protoname = prpl->list_icon(account, NULL);
+	/* "Hey, what's all this crap?" you ask.  Status icons will be themeable too, and 
+	   then it will look up protoname from the theme */
+	if (!strcmp(protoname, "aim")) {
+		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", "aim.png", NULL);
+		status = gdk_pixbuf_new_from_file(filename,NULL);
+		g_free(filename);
+	} else if (!strcmp(protoname, "yahoo")) {
+		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", "yahoo.png", NULL);
+		status = gdk_pixbuf_new_from_file(filename,NULL);
+		g_free(filename);
+	} else if (!strcmp(protoname, "msn")) {
+		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", "msn.png", NULL);
+		status = gdk_pixbuf_new_from_file(filename,NULL);
+		g_free(filename);
+	} else if (!strcmp(protoname, "jabber")) {
+		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", "jabber.png", NULL);
+		status = gdk_pixbuf_new_from_file(filename,NULL);
+		g_free(filename);
+	} else if (!strcmp(protoname, "icq")) {
+		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", "icq.png", NULL);
+		status = gdk_pixbuf_new_from_file(filename,NULL);
+		g_free(filename);
+	} else if (!strcmp(protoname, "gadu-gadu")) {
+		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", "gadugadu.png", NULL);
+		status = gdk_pixbuf_new_from_file(filename,NULL);
+		g_free(filename);
+	} else if (!strcmp(protoname, "napster")) {
+		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", "napster.png", NULL);
+		status = gdk_pixbuf_new_from_file(filename,NULL);
+		g_free(filename);
+	} else if (!strcmp(protoname, "irc")) {
+		filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", "irc.png", NULL);
+		status = gdk_pixbuf_new_from_file(filename,NULL);
+		g_free(filename);
 	}
-
-	blist = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-
-	gtk_window_set_gravity(GTK_WINDOW(blist), GDK_GRAVITY_NORTH_WEST);
-	gtk_window_set_policy(GTK_WINDOW(blist), TRUE, TRUE, TRUE);
-	gtk_window_set_title(GTK_WINDOW(blist), _("Gaim - Buddy List"));
-	gtk_window_set_role(GTK_WINDOW(blist), "buddy_list");
-
-	gtk_widget_realize(blist);
-
-	accel = gtk_accel_group_new();
-	gtk_window_add_accel_group(GTK_WINDOW(blist), accel);
-
-	menubar = gtk_menu_bar_new();
-
-	menu = gtk_menu_new();
-	gtk_menu_set_accel_group(GTK_MENU(menu), accel);
-
-	menuitem = gaim_new_item(NULL, _("File"));
-	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu);
-	gtk_menu_bar_append(GTK_MENU_BAR(menubar), menuitem);
-
-	gaim_new_item_from_stock(menu, _("_Add A Buddy"), GTK_STOCK_ADD,
-				  G_CALLBACK(add_buddy_callback), NULL,  'b', GDK_CONTROL_MASK, "Ctl+B");
-	gaim_new_item_from_stock(menu, _("_Join A Chat"), GTK_STOCK_JUMP_TO,
-				  G_CALLBACK(chat_callback), NULL, 'c', GDK_CONTROL_MASK, "Ctl+C");
-	gaim_new_item_from_stock(menu, _("_New Message"), GTK_STOCK_CONVERT,
-				  G_CALLBACK(show_im_dialog), NULL, 'i', GDK_CONTROL_MASK, "Ctl+I");
-	gaim_new_item_from_stock(menu, _("_Get User Info"), GTK_STOCK_FIND,
-				  G_CALLBACK(show_info_dialog), NULL, 'j', GDK_CONTROL_MASK, "Ctl+J");
-
-	gaim_separator(menu);
-
-	gaim_new_item_from_pixbuf(menu, _("Import Buddy List"), "import-menu.png",
-				  G_CALLBACK(import_callback), NULL, 0, 0, 0);
-
-	gaim_separator(menu);
-
-	gaim_new_item_from_stock(menu, _("Signoff"), NULL,
-				  G_CALLBACK(signoff_all), (void*)1, 'd', GDK_CONTROL_MASK, "Ctl+D");
-	gaim_new_item_from_stock(menu, _("Hide"), NULL,
-				  G_CALLBACK(hide_buddy_list), NULL, 'h', GDK_CONTROL_MASK, "Ctl+H");
-	gaim_new_item_from_stock(menu, _("Quit"), GTK_STOCK_QUIT,
-				  G_CALLBACK(do_quit), NULL, 'q', GDK_CONTROL_MASK, "Ctl+Q");
-
-	menu = gtk_menu_new();
-
-	menuitem = gaim_new_item(NULL, _("Tools"));
-	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu);
-	gtk_menu_bar_append(GTK_MENU_BAR(menubar), menuitem);
-
-	awaymenu = gtk_menu_new();
-	menuitem = gaim_new_item_from_stock(menu, _("Away"), NULL, NULL, NULL, 0, 0, 0);
-	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), awaymenu);
-	do_away_menu();
-
-	bpmenu = gtk_menu_new();
-	menuitem = gaim_new_item_from_stock(menu, _("Buddy Pounce"), NULL, NULL, NULL, 0, 0, 0);
-	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), bpmenu);
-	do_bp_menu();
-
-	gaim_separator(menu);
-
-#ifndef NO_MULTI
-	gaim_new_item_from_pixbuf(menu, _("_Accounts..."), "accounts-menu.png",
-				  G_CALLBACK(account_editor), NULL, 'a', GDK_CONTROL_MASK, "Ctl+A");
-#endif
-	gaim_new_item_from_stock(menu, _("_Preferences..."), GTK_STOCK_PREFERENCES,
-				  G_CALLBACK(show_prefs), NULL, 'p', GDK_CONTROL_MASK, "Ctl+P");
-
-	gaim_new_item_from_stock(menu, _("_File Transfers..."), GTK_STOCK_REVERT_TO_SAVED,
-				G_CALLBACK(show_xfer_dialog), NULL, 0, 0, NULL);
-
-	gaim_separator(menu);
-
-	protomenu = gtk_menu_new();
-	menuitem = gaim_new_item_from_stock(menu, _("Protocol Actions"), NULL, NULL, NULL, 0, 0, 0);
-	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), protomenu);
-	do_proto_menu();
-
-	gaim_new_item_from_stock(menu, _("Pr_ivacy..."), NULL,
-				  G_CALLBACK(show_privacy_options), NULL, 0, 0, 0);
-
-	gaim_new_item_from_stock(menu, _("_View System Log..."), NULL,
-				  G_CALLBACK(show_syslog), NULL, 0, 0, 0);
-
-	menu = gtk_menu_new();
-
-	menuitem = gaim_new_item(NULL, _("Help"));
-	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu);
-	gtk_menu_bar_append(GTK_MENU_BAR(menubar), menuitem);
-
-	gaim_new_item_from_stock(menu, _("Online Help"), GTK_STOCK_HELP, G_CALLBACK(open_url), WEBSITE"documentation.php", GDK_F1, 0, NULL);
-	gaim_new_item_from_stock(menu, _("Debug Window"), NULL, G_CALLBACK(clicked_debug), NULL, 0, 0, NULL);
-	
-	gaim_separator(menu);
-
-	gaim_new_item_from_pixbuf(menu, _("About Gaim"), "about_menu.png", G_CALLBACK(show_about), NULL, GDK_F1, GDK_CONTROL_MASK, NULL);
-	
-	gtk_widget_show(menubar);
-
-	vbox = gtk_vbox_new(FALSE, 0);
-
-	notebook = gtk_notebook_new();
-
-	/* Do buddy list stuff */
-	/* FIXME: spacing on both panes is ad hoc */
-	buddypane = gtk_vbox_new(FALSE, 1);
-
-	buddies = gtk_tree_new();
-	gtk_tree_set_view_lines(GTK_TREE(buddies), FALSE);
-	sw = gtk_scrolled_window_new(NULL, NULL);
-
-	tips = gtk_tooltips_new();
-	gtk_object_set_data(GTK_OBJECT(blist), _("Buddy List"), tips);
-
-	/* Now the buddy list */
-	gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(sw), buddies);
-	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw),
-				       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-	gtk_widget_set_usize(sw, 200, 200);
-	gtk_widget_show(buddies);
-	gtk_widget_show(sw);
-
-	gtk_box_pack_start(GTK_BOX(buddypane), sw, TRUE, TRUE, 0);
-	gtk_widget_show(buddypane);
-
-	if (!(blist_options & OPT_BLIST_NO_BUTTONS))
-		build_imchat_box(TRUE);
-
-	/* Swing the edit buddy */
-	editpane = gtk_vbox_new(FALSE, 1);
-
-	edittree = gtk_ctree_new(1, 0);
-	gtk_ctree_set_line_style(GTK_CTREE(edittree), GTK_CTREE_LINES_SOLID);;
-	gtk_ctree_set_expander_style(GTK_CTREE(edittree), GTK_CTREE_EXPANDER_SQUARE);
-	gtk_clist_set_reorderable(GTK_CLIST(edittree), TRUE);
-	g_signal_connect(GTK_OBJECT(edittree), "button_press_event",
-			   G_CALLBACK(click_edit_tree), NULL);
-
-	gtk_ctree_set_drag_compare_func(GTK_CTREE(edittree),
-					(GtkCTreeCompareDragFunc) edit_drag_compare_func);
-
-
-	g_signal_connect_after(GTK_OBJECT(edittree), "tree_move",
-				 G_CALLBACK(edit_tree_move), NULL);
-
-
-	bbox = gtk_hbox_new(TRUE, 5);
-	gtk_container_set_border_width(GTK_CONTAINER(bbox), 5);
-	tbox = gtk_scrolled_window_new(NULL, NULL);
-
-	/* buttons */
-	addbutton = gtk_button_new_with_label(_("Add"));
-	groupbutton = gtk_button_new_with_label(_("Group"));
-	rembutton = gtk_button_new_with_label(_("Remove"));
-
-	gtk_button_set_relief(GTK_BUTTON(addbutton), GTK_RELIEF_NONE);
-	gtk_button_set_relief(GTK_BUTTON(groupbutton), GTK_RELIEF_NONE);
-	gtk_button_set_relief(GTK_BUTTON(rembutton), GTK_RELIEF_NONE);
-
-	gtk_box_pack_start(GTK_BOX(bbox), addbutton, TRUE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(bbox), groupbutton, TRUE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(bbox), rembutton, TRUE, TRUE, 0);
-
-	gtk_tooltips_set_tip(tips, addbutton, _("Add a new Buddy"), "Penguin");
-	gtk_tooltips_set_tip(tips, groupbutton, _("Add a new Group"), "Penguin");
-	gtk_tooltips_set_tip(tips, rembutton, _("Remove selected Buddy/Group"), "Penguin");
-
-	g_signal_connect(G_OBJECT(rembutton), "clicked", G_CALLBACK(do_del_buddy), edittree);
-	g_signal_connect(G_OBJECT(addbutton), "clicked", G_CALLBACK(add_buddy_callback), NULL);
-	g_signal_connect(G_OBJECT(groupbutton), "clicked", G_CALLBACK(add_group_callback), NULL);
-
-	/* And the boxes in the box */
-	gtk_box_pack_start(GTK_BOX(editpane), tbox, TRUE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(editpane), bbox, FALSE, FALSE, 0);
-
-	/* Finish up */
-	gtk_widget_show(addbutton);
-	gtk_widget_show(groupbutton);
-	gtk_widget_show(rembutton);
-	gtk_widget_show(edittree);
-	gtk_widget_show(tbox);
-	gtk_widget_show(bbox);
-	gtk_widget_show(editpane);
-
-	update_button_pix();
-
-	label = gtk_label_new(_("Online"));
-	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), buddypane, label);
-	label = gtk_label_new(_("Edit Buddies"));
-	gtk_notebook_append_page(GTK_NOTEBOOK(notebook), editpane, label);
-
-	if(blist_options & OPT_BLIST_BOTTOM_TAB)
-		gtk_notebook_set_tab_pos(GTK_NOTEBOOK(notebook), GTK_POS_BOTTOM);
-	
-	gtk_widget_show_all(notebook);
-
-	/* Pack things in the vbox */
-	gtk_widget_show(vbox);
-	gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
-	gtk_container_add(GTK_CONTAINER(blist), vbox);
-
-	g_signal_connect(G_OBJECT(blist), "delete_event", G_CALLBACK(close_buddy_list), NULL);
-	g_signal_connect(G_OBJECT(blist), "configure_event", G_CALLBACK(configure_blist_window), NULL);
-	g_signal_connect(G_OBJECT(blist), "visibility_notify_event", G_CALLBACK(visibility_blist_window), NULL);
-
-	gtk_widget_add_events(blist, GDK_VISIBILITY_NOTIFY_MASK);
-
-	/* The edit tree */
-	gtk_container_add(GTK_CONTAINER(tbox), edittree);
-	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(tbox),
-				       GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-
-#ifdef _WIN32
-	/* Register newly created window with systray module */
-	wgaim_created_blistwin(GTK_WIDGET(blist));
-#endif
-
-	/* Houston, we are go for launch. */
-	unhide_buddy_list();
+	return status;
 }
-
-void show_buddy_list()
-{
-	make_buddy_list();
-	build_edit_tree();
-	update_button_pix();
-}