Pidgin

Update of /cvsroot/gaim/gaim/src/protocols/irc
In directory sc8-pr-cvs1:/tmp/cvs-serv4730/src/protocols/irc

Modified Files:
	irc.c 
Log Message:
Paco-Paco did some more i18n-inating, and fixed IRC topic stuff


Index: irc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.c,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -d -r1.152 -r1.153
--- irc.c	26 Apr 2003 20:42:29 -0000	1.152
+++ irc.c	1 May 2003 06:06:51 -0000	1.153
@@ -1744,7 +1744,7 @@
                 char *word[], char *word_eol[])
 {
 	struct gaim_conversation *c = irc_find_chat(gc, word[3]);
-	char *topic = *word_eol[4] == ':' ? word_eol[4] + 1 : word_eol[4];
+	char *topic = irc_recv_convert(gc, *word_eol[4] == ':' ? word_eol[4] + 1 : word_eol[4]);
 	char buf[IRC_BUF_LEN];
 
 	if (c) {
@@ -1754,6 +1754,7 @@
 
 		gaim_conversation_write(c, NULL, buf, -1, WFLAG_SYSTEM, time(NULL));
 	}
+	g_free(topic);
 }
 
 static gboolean

Update of /cvsroot/gaim/gaim/src/protocols/jabber
In directory sc8-pr-cvs1:/tmp/cvs-serv2309/src/protocols/jabber

Modified Files:
	jabber.c 
Log Message:
paco-paco pointed out that jabber could potentially strcmp() with a NULL
variable.  This inspired me to clean up the crap code that surrounded that
strcmp().


Index: jabber.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- jabber.c	26 Apr 2003 20:42:30 -0000	1.135
+++ jabber.c	1 May 2003 05:54:54 -0000	1.136
@@ -1778,35 +1778,30 @@
 			gaim_blist_add_buddy(b, g, NULL);
 			gaim_blist_save();
 		} else {
+			gboolean save = FALSE;
 			struct group *c_grp = gaim_find_buddys_group(b);
 
 			/*
 			 * If the buddy's in a new group or his/her alias is changed...
 			 */
 			if(groupname && c_grp && strcmp(c_grp->name, groupname)) {
-				int present = b->present;	/* save presence state */
-				int uc = b->uc;			/* and away state (?) */
-				int idle = b->idle;
-				int signon = b->signon;
-
-				/*
-				 * FIXME: this ugly hack is no longer needed
-				 * seems rude, but it seems to be the only way...
-				 */
-				gaim_blist_remove_buddy(b);
-				b = gaim_buddy_new(GJ_GC(gjc)->account, buddyname, name);
-				gaim_blist_add_buddy(b, gaim_find_group(groupname), NULL);
-				gaim_blist_save();
-				if(present > 0) {
-					serv_got_update(GJ_GC(gjc), buddyname, 1, 0, signon, idle,
-							uc);
+				struct group *g = gaim_find_group(groupname);
+				if(!g) {
+					g = gaim_group_new(groupname);
+					gaim_blist_add_group(g, NULL);
 				}
-			} else if(name != NULL && strcmp(b->alias, name)) {
-				g_free(b->alias);
-				b->alias = g_strdup(name);
-				gaim_blist_rename_buddy(b, buddyname);
-				gaim_blist_save();
+
+				gaim_blist_add_buddy(b, g, NULL);
+				save = TRUE;
 			}
+
+			if(name && (!b->alias || strcmp(b->alias, name))) {
+				gaim_blist_alias_buddy(b, name);
+				save = TRUE;
+			}
+
+			if(save)
+				gaim_blist_save();
 		}
 	}  else if (BUD_USUB_TO_PEND(sub, ask) || BUD_USUBD_TO(sub, ask) || !strcasecmp(sub, "remove")) {
 		jabber_remove_gaim_buddy(GJ_GC(gjc), buddyname);

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv16887/src

Modified Files:
	gtkblist.c 
Log Message:
(15:53:01) Paco-Paco: It does not seem safe to remove ui_data on gaim_gtk_blist_remove, this patch disables that until I can figure out what I should _really_ be doing


Index: gtkblist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- gtkblist.c	29 Apr 2003 01:50:57 -0000	1.7
+++ gtkblist.c	30 Apr 2003 19:54:19 -0000	1.8
@@ -1495,7 +1495,17 @@
 	struct _gaim_gtk_blist_node *gtknode = (struct _gaim_gtk_blist_node *)node->ui_data;
 	GtkTreePath *path;
 
-	if (!gtkblist || !gtknode->row)
+	if (!gtknode) {
+		gaim_debug(GAIM_DEBUG_ERROR, "gtkblist", "buddy %s has no ui_data\n", ((struct buddy *)node)->name);
+		return FALSE;
+	}
+
+	if (!gtkblist) {
+		gaim_debug(GAIM_DEBUG_ERROR, "gtkblist", "get_iter_from_node was called, but we don't seem to have a blist\n");
+		return FALSE;
+	}
+
+	if (!gtknode->row)
 		return FALSE;
 
 	if ((path = gtk_tree_row_reference_get_path(gtknode->row)) == NULL)
@@ -1550,8 +1560,9 @@
 {
 	gaim_gtk_blist_hide_node(list, node);
 
-	g_free(node->ui_data);
-	node->ui_data = NULL;
+	/* There's something I don't understand here */
+	/* g_free(node->ui_data);
+	node->ui_data = NULL; */
 }
 
 static gboolean do_selection_changed(GaimBlistNode *new_selection)

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv25951/src

Modified Files:
	conversation.c 
Log Message:
Jose' M^(a) Pe'rez Ca'ncer (jm_pc) writes:
" Closing a IM window for which the connection has been
lost causes a segfault. The problem is that gaim tries
to perform operations on a connection that has been
closed and subsequently crashes. This patch avoids
doing those operations when the connection has been closed. "


Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.511
retrieving revision 1.512
diff -u -d -r1.511 -r1.512
--- conversation.c	26 Apr 2003 07:15:59 -0000	1.511
+++ conversation.c	30 Apr 2003 04:49:09 -0000	1.512
@@ -950,37 +950,40 @@
 	gc   = gaim_conversation_get_gc(conv);
 	name = gaim_conversation_get_name(conv);
 
-	prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
+	if (gc) {
+		/* Still connected */
+		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
 
-	if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) {
-		if (!(misc_options & OPT_MISC_STEALTH_TYPING))
-			serv_send_typing(gc, (char *)name, NOT_TYPING);
+		if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) {
+			if (!(misc_options & OPT_MISC_STEALTH_TYPING))
+				serv_send_typing(gc, (char *)name, NOT_TYPING);
 
-		if (gc && prpl_info->convo_closed != NULL)
-			prpl_info->convo_closed(gc, (char *)name);
-	}
-	else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) {
-		/*
-		 * This is unfortunately necessary, because calling serv_chat_leave()
-		 * calls this gaim_conversation_destroy(), which leads to two calls
-		 * here.. We can't just return after this, because then it'll return
-		 * on the next pass. So, since serv_got_chat_left(), which is
-		 * eventually called from the prpl that serv_chat_leave() calls,
-		 * removes this conversation from the gc's buddy_chats list, we're
-		 * going to check to see if this exists in the list. If so, we want
-		 * to return after calling this, because it'll be called again. If not,
-		 * fall through, because it'll have already been removed, and we'd
-		 * be on the 2nd pass.
-		 *
-		 * Long paragraph. <-- Short sentence.
-		 *
-		 *   -- ChipX86
-		 */
+			if (gc && prpl_info->convo_closed != NULL)
+				prpl_info->convo_closed(gc, (char *)name);
+		}
+		else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) {
+			/*
+			 * This is unfortunately necessary, because calling serv_chat_leave()
+			 * calls this gaim_conversation_destroy(), which leads to two calls
+			 * here.. We can't just return after this, because then it'll return
+			 * on the next pass. So, since serv_got_chat_left(), which is
+			 * eventually called from the prpl that serv_chat_leave() calls,
+			 * removes this conversation from the gc's buddy_chats list, we're
+			 * going to check to see if this exists in the list. If so, we want
+			 * to return after calling this, because it'll be called again. If not,
+			 * fall through, because it'll have already been removed, and we'd
+			 * be on the 2nd pass.
+			 *
+			 * Long paragraph. <-- Short sentence.
+			 *
+			 *   -- ChipX86
+			 */
 
-		if (gc && g_slist_find(gc->buddy_chats, conv) != NULL) {
-			serv_chat_leave(gc, gaim_chat_get_id(GAIM_CHAT(conv)));
+			if (gc && g_slist_find(gc->buddy_chats, conv) != NULL) {
+				serv_chat_leave(gc, gaim_chat_get_id(GAIM_CHAT(conv)));
 
-			return;
+				return;
+			}
 		}
 	}

Update of /cvsroot/gaim/gaim/po
In directory sc8-pr-cvs1:/tmp/cvs-serv9299

Modified Files:
	ca.po 
Log Message:
Fixes the b0rked wrong charset problem. Thanks Oskuro!


Index: ca.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/ca.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ca.po	9 Apr 2003 00:28:54 -0000	1.1
+++ ca.po	29 Apr 2003 14:45:46 -0000	1.2
@@ -1,7 +1,7 @@
 # Catalan translation of Gaim
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gaim package.
-# JM Pérez Cáncer <jm@...>, April 2003
+# JM Pérez Cáncer <jm@...>, 2003.
 #
 msgid ""
 msgstr ""
@@ -9,9 +9,9 @@
 "POT-Creation-Date: 2003-04-08 14:06+0200\n"
 "PO-Revision-Date: 2003-04-08 23:59--100\n"
 "Last-Translator: JM Pérez Cáncer <jm@..."
-"Language-Team:  <ca@..."
+"Language-Team:  Catalan <ca@..."
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv31670/src

Modified Files:
	gtkblist.c 
Log Message:
(21:50:08) Paco-Paco: LSchiere2: oops
(21:50:09) Paco-Paco: 
(21:50:15) Paco-Paco: not really
(21:50:27) Paco-Paco: separates visual removal of a buddy from literal removal


Index: gtkblist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gtkblist.c	28 Apr 2003 22:53:53 -0000	1.6
+++ gtkblist.c	29 Apr 2003 01:50:57 -0000	1.7
@@ -1225,6 +1225,28 @@
 	return TRUE;
 }
 
+static void gaim_gtk_blist_hide_node(struct gaim_buddy_list *list, GaimBlistNode *node)
+{
+	struct _gaim_gtk_blist_node *gtknode = (struct _gaim_gtk_blist_node *)node->ui_data;
+	GtkTreeIter iter;
+
+	if (!gtknode || !gtknode->row || !gtkblist)
+		return;
+
+	if(gtkblist->selected_node == node)
+		gtkblist->selected_node = NULL;
+
+	if (get_iter_from_node(node, &iter)) {
+		gtk_tree_store_remove(gtkblist->treemodel, &iter);
+		if(GAIM_BLIST_NODE_IS_BUDDY(node) || GAIM_BLIST_NODE_IS_CHAT(node)) {
+			gaim_gtk_blist_update(list, node->parent);
+		}
+	}
+	gtk_tree_row_reference_free(gtknode->row);
+	gtknode->row = NULL;
+}
+
+
 /**********************************************************************************
  * Public API Functions                                                           *
  **********************************************************************************/
@@ -1526,28 +1548,10 @@
 
 static void gaim_gtk_blist_remove(struct gaim_buddy_list *list, GaimBlistNode *node)
 {
-	struct _gaim_gtk_blist_node *gtknode;
-	GtkTreeIter iter;
-
-	gtknode = (struct _gaim_gtk_blist_node *)node->ui_data;
-	if (!gtknode || !gtknode->row)
-		return;
-
-	/* For some reason, we're called before we have a buddy list sometimes */
-	if(!gtkblist)
-		return;
-
-	if(gtkblist->selected_node == node)
-		gtkblist->selected_node = NULL;
+	gaim_gtk_blist_hide_node(list, node);
 
-	if (get_iter_from_node(node, &iter)) {
-		gtk_tree_store_remove(gtkblist->treemodel, &iter);
-		if(GAIM_BLIST_NODE_IS_BUDDY(node) || GAIM_BLIST_NODE_IS_CHAT(node)) {
-			gaim_gtk_blist_update(list, node->parent);
-		}
-	}
-	gtk_tree_row_reference_free(gtknode->row);
-	gtknode->row = NULL;
+	g_free(node->ui_data);
+	node->ui_data = NULL;
 }
 
 static gboolean do_selection_changed(GaimBlistNode *new_selection)
@@ -1754,7 +1758,7 @@
 		if (status != NULL)
 			g_object_unref(status);
 	} else if(GAIM_BLIST_NODE_IS_CHAT(node) && !((struct chat *)node)->account->gc) {
-		gaim_gtk_blist_remove(list, node);
+		gaim_gtk_blist_hide_node(list, node);
 	} else if (GAIM_BLIST_NODE_IS_BUDDY(node) && (((struct buddy*)node)->present != GAIM_BUDDY_OFFLINE || ((blist_options & OPT_BLIST_SHOW_OFFLINE) && ((struct buddy*)node)->account->gc))) {
 		GdkPixbuf *status, *avatar;
 		char *mark;
@@ -1830,7 +1834,7 @@
 			g_object_unref(avatar);
 
 	} else if (GAIM_BLIST_NODE_IS_BUDDY(node) && !new_entry) {
-		gaim_gtk_blist_remove(list, node);
+		gaim_gtk_blist_hide_node(list, node);
 	}
 
 	gtk_tree_view_columns_autosize(GTK_TREE_VIEW(gtkblist->treeview));

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv1739/src

Modified Files:
	gtkblist.c 
Log Message:
(18:53:21) Oh-One-inator: Keeps track of the GtkTreeStore node in which a struct buddy lives when in the gtkblist, providing for O(1) updates to that node



Index: gtkblist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gtkblist.c	28 Apr 2003 16:21:03 -0000	1.5
+++ gtkblist.c	28 Apr 2003 22:53:53 -0000	1.6
@@ -66,6 +66,10 @@
 static char *gaim_get_tooltip_text(GaimBlistNode *node);
 static char *item_factory_translate_func (const char *path, gpointer func_data);
 
+struct _gaim_gtk_blist_node {
+	GtkTreeRowReference *row;
+};
+
 /***************************************************
  *              Callbacks                          *
  ***************************************************/
@@ -1229,6 +1233,11 @@
 	blist->ui_data = g_new0(struct gaim_gtk_buddy_list, 1);
 }
 
+static void gaim_gtk_blist_new_node(GaimBlistNode *node)
+{
+	node->ui_data = g_new0(struct _gaim_gtk_blist_node, 1);
+}
+
 void gaim_gtk_blist_update_columns()
 {
 	if(!gtkblist)
@@ -1460,37 +1469,21 @@
 	}
 }
 
-static gboolean get_iter_from_node_helper(GaimBlistNode *node, GtkTreeIter *iter, GtkTreeIter *root) {
-
-	do {
-		GaimBlistNode *n;
-		GtkTreeIter child;
-
-		gtk_tree_model_get(GTK_TREE_MODEL(gtkblist->treemodel), root, NODE_COLUMN, &n, -1);
-		if(n == node) {
-			*iter = *root;
-			return TRUE;
-		}
-
-		if(gtk_tree_model_iter_children(GTK_TREE_MODEL(gtkblist->treemodel), &child, root)) {
-			if(get_iter_from_node_helper(node,iter,&child))
-				return TRUE;
-		}
-	} while(gtk_tree_model_iter_next(GTK_TREE_MODEL(gtkblist->treemodel), root));
-
-	return FALSE;
-}
-
 static gboolean get_iter_from_node(GaimBlistNode *node, GtkTreeIter *iter) {
-	GtkTreeIter root;
+	struct _gaim_gtk_blist_node *gtknode = (struct _gaim_gtk_blist_node *)node->ui_data;
+	GtkTreePath *path;
 
-	if (!gtkblist)
+	if (!gtkblist || !gtknode->row)
 		return FALSE;
 
-	if(!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(gtkblist->treemodel), &root))
+	if ((path = gtk_tree_row_reference_get_path(gtknode->row)) == NULL)
 		return FALSE;
-
-	return get_iter_from_node_helper(node, iter, &root);
+	if (!gtk_tree_model_get_iter(GTK_TREE_MODEL(gtkblist->treemodel), iter, path)) {
+		gtk_tree_path_free(path);
+		return FALSE;
+	}
+	gtk_tree_path_free(path);
+	return TRUE;
 }
 
 /*
@@ -1533,8 +1526,13 @@
 
 static void gaim_gtk_blist_remove(struct gaim_buddy_list *list, GaimBlistNode *node)
 {
+	struct _gaim_gtk_blist_node *gtknode;
 	GtkTreeIter iter;
 
+	gtknode = (struct _gaim_gtk_blist_node *)node->ui_data;
+	if (!gtknode || !gtknode->row)
+		return;
+
 	/* For some reason, we're called before we have a buddy list sometimes */
 	if(!gtkblist)
 		return;
@@ -1548,6 +1546,8 @@
 			gaim_gtk_blist_update(list, node->parent);
 		}
 	}
+	gtk_tree_row_reference_free(gtknode->row);
+	gtknode->row = NULL;
 }
 
 static gboolean do_selection_changed(GaimBlistNode *new_selection)
@@ -1584,7 +1584,9 @@
 static void make_a_group(GaimBlistNode *node, GtkTreeIter *iter) {
 	GaimBlistNode *sibling;
 	GtkTreeIter siblingiter;
+	GtkTreePath *newpath;
 	struct group *group = (struct group *)node;
+	struct _gaim_gtk_blist_node *gtknode = (struct _gaim_gtk_blist_node *)node->ui_data;
 	char *esc = g_markup_escape_text(group->name, -1);
 	char *mark;
 
@@ -1602,6 +1604,10 @@
 
 	gtk_tree_store_insert_after(gtkblist->treemodel, iter, NULL,
 			sibling ? &siblingiter : NULL);
+	newpath = gtk_tree_model_get_path(GTK_TREE_MODEL(gtkblist->treemodel), iter);
+	gtknode->row = gtk_tree_row_reference_new(GTK_TREE_MODEL(gtkblist->treemodel), newpath);
+	gtk_tree_path_free(newpath);
+
 	gtk_tree_store_set(gtkblist->treemodel, iter,
 			STATUS_ICON_COLUMN, NULL,
 			STATUS_ICON_VISIBLE_COLUMN, FALSE,
@@ -1615,13 +1621,14 @@
 static void gaim_gtk_blist_update(struct gaim_buddy_list *list, GaimBlistNode *node)
 {
 	GtkTreeIter iter;
-	GtkTreePath *expand = NULL;
+	GtkTreePath *expand = NULL, *newpath = NULL;
+	struct _gaim_gtk_blist_node *gtknode = (struct _gaim_gtk_blist_node *)node->ui_data;
 	gboolean new_entry = FALSE;
 
-	if (!gtkblist)
+	if (!gtkblist || !gtknode)
 		return;
 
-	if (!get_iter_from_node(node, &iter)) { /* This is a newly added node */
+	if (!get_iter_from_node(node, &iter)) {
 		new_entry = TRUE;
 		if (GAIM_BLIST_NODE_IS_BUDDY(node)) {
 			if (((struct buddy*)node)->present != GAIM_BUDDY_OFFLINE || ((blist_options & OPT_BLIST_SHOW_OFFLINE) && ((struct buddy*)node)->account->gc)) {
@@ -1647,6 +1654,9 @@
 				}
 
 				gtk_tree_store_insert_after(gtkblist->treemodel, &iter, &groupiter, oldersibling ? &oldersiblingiter : NULL);
+				newpath = gtk_tree_model_get_path(GTK_TREE_MODEL(gtkblist->treemodel), &iter);
+				gtknode->row = gtk_tree_row_reference_new(GTK_TREE_MODEL(gtkblist->treemodel), newpath);
+				gtk_tree_path_free(newpath);
 
 				if (blist_options & OPT_BLIST_POPUP) {
 					gtk_widget_show(gtkblist->window);
@@ -1679,6 +1689,9 @@
 			}
 
 			gtk_tree_store_insert_after(gtkblist->treemodel, &iter, &groupiter, oldersibling ? &oldersiblingiter : NULL);
+			newpath = gtk_tree_model_get_path(GTK_TREE_MODEL(gtkblist->treemodel), &iter);
+			gtknode->row = gtk_tree_row_reference_new(GTK_TREE_MODEL(gtkblist->treemodel), newpath);
+			gtk_tree_path_free(newpath);
 
 		} else if (GAIM_BLIST_NODE_IS_GROUP(node) &&
 					((blist_options & OPT_BLIST_SHOW_OFFLINE) ||
@@ -1940,7 +1953,7 @@
 static struct gaim_blist_ui_ops blist_ui_ops =
 {
 	gaim_gtk_blist_new_list,
-	NULL,
+	gaim_gtk_blist_new_node,
 	gaim_gtk_blist_show,
 	gaim_gtk_blist_update,
 	gaim_gtk_blist_remove,

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv1914/src

Modified Files:
	blist.c blist.h 
Log Message:
i didn't mean to commit that



Index: blist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/blist.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- blist.c	29 Apr 2003 00:15:21 -0000	1.5
+++ blist.c	29 Apr 2003 00:23:19 -0000	1.6
@@ -172,12 +172,10 @@
 		buddy->present = GAIM_BUDDY_SIGNING_ON;
 		gaim_event_broadcast(event_buddy_signon, buddy->account->gc, buddy->name);
 		do_timer = TRUE;
-		((struct group *)((GaimBlistNode *)buddy)->parent)->online++;
 	} else if(GAIM_BUDDY_IS_ONLINE(buddy) && !presence) {
 		buddy->present = GAIM_BUDDY_SIGNING_OFF;
 		gaim_event_broadcast(event_buddy_signoff, buddy->account->gc, buddy->name);
 		do_timer = TRUE;
-		((struct group *)((GaimBlistNode *)buddy)->parent)->online--;
 	}
 
 	if(do_timer) {
@@ -332,9 +330,6 @@
 		/* This chat was already in the list and is
 		 * being moved.
 		 */
-		((struct group *)cnode->parent)->totalsize--;
-		if (chat->account->gc)
-			((struct group *)cnode->parent)->currentsize--;
 		if(cnode->next)
 			cnode->next->prev = cnode->prev;
 		if(cnode->prev)
@@ -354,16 +349,10 @@
 		cnode->prev = n;
 		cnode->parent = n->parent;
 		n->next = cnode;
-		((struct group *)n->parent)->totalsize++;
-		if (chat->account->gc)
-			((struct group *)n->parent)->currentsize++;
 	} else {
 		((GaimBlistNode*)g)->child = cnode;
 		cnode->next = cnode->prev = NULL;
 		cnode->parent = (GaimBlistNode*)g;
-		g->totalsize++;
-		if (chat->account->gc)
-			g->currentsize++;
 	}
 
 	if (ops)
@@ -398,10 +387,6 @@
 		/* This buddy was already in the list and is
 		 * being moved.
 		 */
-		((struct group *)bnode->parent)->totalsize--;
-		if (buddy->account->gc)
-			((struct group *)bnode->parent)->currentsize--;
-
 		if(bnode->next)
 			bnode->next->prev = bnode->prev;
 		if(bnode->prev)
@@ -411,9 +396,8 @@
 
 		ops->remove(gaimbuddylist, bnode);
 
-		if (bnode->parent != ((GaimBlistNode*)g)) {
+		if (bnode->parent != ((GaimBlistNode*)g))
 			serv_move_buddy(buddy, (struct group*)bnode->parent, g);
-		}
 		save = TRUE;
 	}
 
@@ -424,17 +408,11 @@
 		((GaimBlistNode*)buddy)->prev = n;
 		((GaimBlistNode*)buddy)->parent = n->parent;
 		n->next = (GaimBlistNode*)buddy;
-		((struct group *)n->parent)->totalsize++;
-		if (buddy->account->gc)
-			((struct group *)n->parent)->currentsize++;
 	} else {
 		((GaimBlistNode*)g)->child = (GaimBlistNode*)buddy;
 		((GaimBlistNode*)buddy)->next = NULL;
 		((GaimBlistNode*)buddy)->prev = NULL;
 		((GaimBlistNode*)buddy)->parent = (GaimBlistNode*)g;
-		g->totalsize++;
-		if (buddy->account->gc)
-			g->currentsize++;
 	}
 
 	hb = g_malloc(sizeof(struct _gaim_hbuddy));
@@ -463,9 +441,6 @@
 		struct gaim_blist_ui_ops *ops;
 		g= g_new0(struct group, 1);
 		g->name = g_strdup(name);
-		g->totalsize = 0;
-		g->currentsize = 0;
-		g->online = 0;
 		g->settings = g_hash_table_new_full(g_str_hash, g_str_equal,
 				g_free, g_free);
 		((GaimBlistNode*)g)->type = GAIM_BLIST_GROUP_NODE;
@@ -549,9 +524,6 @@
 		node->prev->next = node->next;
 	if (node->next)
 		node->next->prev = node->prev;
-	group->totalsize--;
-	if (buddy->account->gc)
-		group->currentsize--;
 
 	hb.name = normalize(buddy->name);
 	hb.account = buddy->account;
@@ -584,9 +556,6 @@
 		node->prev->next = node->next;
 	if (node->next)
 		node->next->prev = node->prev;
-	group->totalsize--;
-	if (chat->account->gc)
-		group->currentsize--;
 
 	ops->remove(gaimbuddylist, node);
 	g_hash_table_destroy(chat->components);
@@ -711,13 +680,11 @@
 		for(buddy = group->child; buddy; buddy = buddy->next) {
 			if(GAIM_BLIST_NODE_IS_BUDDY(buddy)) {
 				if (account == ((struct buddy*)buddy)->account) {
-					((struct group *)group)->currentsize++;
 					if(ops)
 						ops->update(gaimbuddylist, buddy);
 				}
 			} else if(GAIM_BLIST_NODE_IS_CHAT(buddy)) {
 				if (account == ((struct chat*)buddy)->account) {
-					((struct group *)group)->currentsize++;
 					if(ops)
 						ops->update(gaimbuddylist, buddy);
 				}
@@ -740,17 +707,12 @@
 		for(buddy = group->child; buddy; buddy = buddy->next) {
 			if(GAIM_BLIST_NODE_IS_BUDDY(buddy)) {
 				if (account == ((struct buddy*)buddy)->account) {
-					if (((struct buddy *)buddy)->present)
-						((struct group *)group)->online--;
 					((struct buddy*)buddy)->present = GAIM_BUDDY_OFFLINE;
-					((struct group *)group)->currentsize--;
 					if(ops)
 						ops->remove(gaimbuddylist, buddy);
 				}
 			} else if(GAIM_BLIST_NODE_IS_CHAT(buddy)) {
 				if (account == ((struct chat*)buddy)->account) {
-					((struct group *)group)->online--;
-					((struct group *)group)->currentsize--;
 					if(ops)
 						ops->remove(gaimbuddylist, buddy);
 				}
@@ -1825,17 +1787,45 @@
 }
 
 int gaim_blist_get_group_size(struct group *group, gboolean offline) {
+	GaimBlistNode *node;
+	int count = 0;
+
 	if(!group)
 		return 0;
 
-	return offline ? group->totalsize : group->currentsize;
+	for(node = group->node.child; node; node = node->next) {
+		if(GAIM_BLIST_NODE_IS_BUDDY(node)) {
+			struct buddy *b = (struct buddy *)node;
+			if(b->account->gc || offline)
+				count++;
+		} else if(GAIM_BLIST_NODE_IS_CHAT(node)) {
+			struct chat *chat = (struct chat *)node;
+			if(chat->account->gc || offline)
+				count++;
+		}
+	}
+
+	return count;
 }
 
 int gaim_blist_get_group_online_count(struct group *group) {
+	GaimBlistNode *node;
+	int count = 0;
+
 	if(!group)
 		return 0;
 
-	return group->online;
+	for(node = group->node.child; node; node = node->next) {
+		if(GAIM_BLIST_NODE_IS_BUDDY(node)) {
+			struct buddy *b = (struct buddy *)node;
+			if(GAIM_BUDDY_IS_ONLINE(b))
+				count++;
+		} else if(GAIM_BLIST_NODE_IS_CHAT(node)) {
+			count++;
+		}
+	}
+
+	return count;
 }
 
 

Index: blist.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/blist.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- blist.h	29 Apr 2003 00:15:21 -0000	1.4
+++ blist.h	29 Apr 2003 00:23:19 -0000	1.5
@@ -96,9 +96,6 @@
 struct group {
 	GaimBlistNode node;                    /**< The node that this group inherits from */
 	char *name;                            /**< The name of this group. */
-	int totalsize;			       /**< The number of buddies in this group */
-	int currentsize;		       /**< The number of buddies in this group corresponding to online accounts */
-	int online;			       /**< The number of buddies in this group who are currently online */
 	GHashTable *settings;                  /**< per-group settings from the XML buddy list, set by plugins and the likes. */
 };

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv31765/src

Modified Files:
	blist.c blist.h 
Log Message:
our 0(1)-ness is changeloged


Index: blist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/blist.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- blist.c	28 Apr 2003 02:41:00 -0000	1.4
+++ blist.c	29 Apr 2003 00:15:21 -0000	1.5
@@ -172,10 +172,12 @@
 		buddy->present = GAIM_BUDDY_SIGNING_ON;
 		gaim_event_broadcast(event_buddy_signon, buddy->account->gc, buddy->name);
 		do_timer = TRUE;
+		((struct group *)((GaimBlistNode *)buddy)->parent)->online++;
 	} else if(GAIM_BUDDY_IS_ONLINE(buddy) && !presence) {
 		buddy->present = GAIM_BUDDY_SIGNING_OFF;
 		gaim_event_broadcast(event_buddy_signoff, buddy->account->gc, buddy->name);
 		do_timer = TRUE;
+		((struct group *)((GaimBlistNode *)buddy)->parent)->online--;
 	}
 
 	if(do_timer) {
@@ -330,6 +332,9 @@
 		/* This chat was already in the list and is
 		 * being moved.
 		 */
+		((struct group *)cnode->parent)->totalsize--;
+		if (chat->account->gc)
+			((struct group *)cnode->parent)->currentsize--;
 		if(cnode->next)
 			cnode->next->prev = cnode->prev;
 		if(cnode->prev)
@@ -349,10 +354,16 @@
 		cnode->prev = n;
 		cnode->parent = n->parent;
 		n->next = cnode;
+		((struct group *)n->parent)->totalsize++;
+		if (chat->account->gc)
+			((struct group *)n->parent)->currentsize++;
 	} else {
 		((GaimBlistNode*)g)->child = cnode;
 		cnode->next = cnode->prev = NULL;
 		cnode->parent = (GaimBlistNode*)g;
+		g->totalsize++;
+		if (chat->account->gc)
+			g->currentsize++;
 	}
 
 	if (ops)
@@ -387,6 +398,10 @@
 		/* This buddy was already in the list and is
 		 * being moved.
 		 */
+		((struct group *)bnode->parent)->totalsize--;
+		if (buddy->account->gc)
+			((struct group *)bnode->parent)->currentsize--;
+
 		if(bnode->next)
 			bnode->next->prev = bnode->prev;
 		if(bnode->prev)
@@ -396,8 +411,9 @@
 
 		ops->remove(gaimbuddylist, bnode);
 
-		if (bnode->parent != ((GaimBlistNode*)g))
+		if (bnode->parent != ((GaimBlistNode*)g)) {
 			serv_move_buddy(buddy, (struct group*)bnode->parent, g);
+		}
 		save = TRUE;
 	}
 
@@ -408,11 +424,17 @@
 		((GaimBlistNode*)buddy)->prev = n;
 		((GaimBlistNode*)buddy)->parent = n->parent;
 		n->next = (GaimBlistNode*)buddy;
+		((struct group *)n->parent)->totalsize++;
+		if (buddy->account->gc)
+			((struct group *)n->parent)->currentsize++;
 	} else {
 		((GaimBlistNode*)g)->child = (GaimBlistNode*)buddy;
 		((GaimBlistNode*)buddy)->next = NULL;
 		((GaimBlistNode*)buddy)->prev = NULL;
 		((GaimBlistNode*)buddy)->parent = (GaimBlistNode*)g;
+		g->totalsize++;
+		if (buddy->account->gc)
+			g->currentsize++;
 	}
 
 	hb = g_malloc(sizeof(struct _gaim_hbuddy));
@@ -441,6 +463,9 @@
 		struct gaim_blist_ui_ops *ops;
 		g= g_new0(struct group, 1);
 		g->name = g_strdup(name);
+		g->totalsize = 0;
+		g->currentsize = 0;
+		g->online = 0;
 		g->settings = g_hash_table_new_full(g_str_hash, g_str_equal,
 				g_free, g_free);
 		((GaimBlistNode*)g)->type = GAIM_BLIST_GROUP_NODE;
@@ -524,6 +549,9 @@
 		node->prev->next = node->next;
 	if (node->next)
 		node->next->prev = node->prev;
+	group->totalsize--;
+	if (buddy->account->gc)
+		group->currentsize--;
 
 	hb.name = normalize(buddy->name);
 	hb.account = buddy->account;
@@ -556,6 +584,9 @@
 		node->prev->next = node->next;
 	if (node->next)
 		node->next->prev = node->prev;
+	group->totalsize--;
+	if (chat->account->gc)
+		group->currentsize--;
 
 	ops->remove(gaimbuddylist, node);
 	g_hash_table_destroy(chat->components);
@@ -680,11 +711,13 @@
 		for(buddy = group->child; buddy; buddy = buddy->next) {
 			if(GAIM_BLIST_NODE_IS_BUDDY(buddy)) {
 				if (account == ((struct buddy*)buddy)->account) {
+					((struct group *)group)->currentsize++;
 					if(ops)
 						ops->update(gaimbuddylist, buddy);
 				}
 			} else if(GAIM_BLIST_NODE_IS_CHAT(buddy)) {
 				if (account == ((struct chat*)buddy)->account) {
+					((struct group *)group)->currentsize++;
 					if(ops)
 						ops->update(gaimbuddylist, buddy);
 				}
@@ -707,12 +740,17 @@
 		for(buddy = group->child; buddy; buddy = buddy->next) {
 			if(GAIM_BLIST_NODE_IS_BUDDY(buddy)) {
 				if (account == ((struct buddy*)buddy)->account) {
+					if (((struct buddy *)buddy)->present)
+						((struct group *)group)->online--;
 					((struct buddy*)buddy)->present = GAIM_BUDDY_OFFLINE;
+					((struct group *)group)->currentsize--;
 					if(ops)
 						ops->remove(gaimbuddylist, buddy);
 				}
 			} else if(GAIM_BLIST_NODE_IS_CHAT(buddy)) {
 				if (account == ((struct chat*)buddy)->account) {
+					((struct group *)group)->online--;
+					((struct group *)group)->currentsize--;
 					if(ops)
 						ops->remove(gaimbuddylist, buddy);
 				}
@@ -1787,45 +1825,17 @@
 }
 
 int gaim_blist_get_group_size(struct group *group, gboolean offline) {
-	GaimBlistNode *node;
-	int count = 0;
-
 	if(!group)
 		return 0;
 
-	for(node = group->node.child; node; node = node->next) {
-		if(GAIM_BLIST_NODE_IS_BUDDY(node)) {
-			struct buddy *b = (struct buddy *)node;
-			if(b->account->gc || offline)
-				count++;
-		} else if(GAIM_BLIST_NODE_IS_CHAT(node)) {
-			struct chat *chat = (struct chat *)node;
-			if(chat->account->gc || offline)
-				count++;
-		}
-	}
-
-	return count;
+	return offline ? group->totalsize : group->currentsize;
 }
 
 int gaim_blist_get_group_online_count(struct group *group) {
-	GaimBlistNode *node;
-	int count = 0;
-
 	if(!group)
 		return 0;
 
-	for(node = group->node.child; node; node = node->next) {
-		if(GAIM_BLIST_NODE_IS_BUDDY(node)) {
-			struct buddy *b = (struct buddy *)node;
-			if(GAIM_BUDDY_IS_ONLINE(b))
-				count++;
-		} else if(GAIM_BLIST_NODE_IS_CHAT(node)) {
-			count++;
-		}
-	}
-
-	return count;
+	return group->online;
 }
 
 

Index: blist.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/blist.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- blist.h	28 Apr 2003 02:41:00 -0000	1.3
+++ blist.h	29 Apr 2003 00:15:21 -0000	1.4
@@ -96,6 +96,9 @@
 struct group {
 	GaimBlistNode node;                    /**< The node that this group inherits from */
 	char *name;                            /**< The name of this group. */
+	int totalsize;			       /**< The number of buddies in this group */
+	int currentsize;		       /**< The number of buddies in this group corresponding to online accounts */
+	int online;			       /**< The number of buddies in this group who are currently online */
 	GHashTable *settings;                  /**< per-group settings from the XML buddy list, set by plugins and the likes. */
 };

Update of /cvsroot/gaim/gaim
In directory sc8-pr-cvs1:/tmp/cvs-serv31765

Modified Files:
	ChangeLog 
Log Message:
our 0(1)-ness is changeloged


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.625
retrieving revision 1.626
diff -u -d -r1.625 -r1.626
--- ChangeLog	27 Apr 2003 22:45:09 -0000	1.625
+++ ChangeLog	29 Apr 2003 00:15:19 -0000	1.626
@@ -8,6 +8,7 @@
 	  debug levels and categories.
 	* Support for adding chats to your buddy list.
 	* Thanks to all the various people who submitted translation updates
+	* Speed enhancements (Thanks Ethan Blanton).
 
 version 0.62 (04/23/2003):
 	* Keyboard shortcuts in the buddy list work again (Thanks Joe

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv32327/src

Modified Files:
	dialogs.c 
Log Message:
Jose' M^(a) Pe'rez Ca'ncer (jm_pc) writes:
" When you are logged in with just protocols that don't
allow chats, selecting Buddies/Add a Chat crashes the app.

This patch will present an error dialog whenever it is
not possible to add a chat because the user is not
connected to any protocol that allows chats.
It will also only allow to select accounts with chat
capabilities in the "Add a Chat" dialog. "


Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.465
retrieving revision 1.466
diff -u -d -r1.465 -r1.466
--- dialogs.c	28 Apr 2003 06:23:42 -0000	1.465
+++ dialogs.c	29 Apr 2003 00:17:36 -0000	1.466
@@ -1340,26 +1340,28 @@
 
 	while (g) {
 		c = (struct gaim_connection *)g->data;
-		g_snprintf(buf, sizeof(buf), "%s (%s)", 
-				c->username, c->prpl->info->name);
-		opt = gtk_menu_item_new_with_label(buf);
-		g_object_set_data(G_OBJECT(opt), "addchat", ac);
-		g_signal_connect(GTK_OBJECT(opt), "activate",
-				G_CALLBACK(addchat_select_account),
-				c);
-		gtk_widget_show(opt);
-		gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt);
+		if (GAIM_PLUGIN_PROTOCOL_INFO(c->prpl)->join_chat) {
+			g_snprintf(buf, sizeof(buf), "%s (%s)", 
+					c->username, c->prpl->info->name);
+			opt = gtk_menu_item_new_with_label(buf);
+			g_object_set_data(G_OBJECT(opt), "addchat", ac);
+			g_signal_connect(GTK_OBJECT(opt), "activate",
+					G_CALLBACK(addchat_select_account),
+					c);
+			gtk_widget_show(opt);
+			gtk_menu_shell_append(GTK_MENU_SHELL(menu), opt);
 
-		/* Now check to see if it's our current menu */
-		if (c->account == ac->account) {
-			place = count;
-			gtk_menu_item_activate(GTK_MENU_ITEM(opt));
-			gtk_option_menu_set_history(GTK_OPTION_MENU(ac->account_menu), count);
+			/* Now check to see if it's our current menu */
+			if (c->account == ac->account) {
+				place = count;
+				gtk_menu_item_activate(GTK_MENU_ITEM(opt));
+				gtk_option_menu_set_history(GTK_OPTION_MENU(ac->account_menu), count);
 
-			/* Do the cha cha cha */
-		}
+				/* Do the cha cha cha */
+			}
 
-		count++;
+			count++;
+		}
 
 		g = g->next;
 	}
@@ -1372,6 +1374,8 @@
 void show_add_chat(struct gaim_account *account, struct group *group) {
     struct addchat *ac = g_new0(struct addchat, 1);
     struct gaim_gtk_buddy_list *gtkblist;
+    GSList *c;
+    struct gaim_connection *gc;
 
 	GtkWidget *label;
 	GtkWidget *rowbox;
@@ -1382,8 +1386,26 @@
 
     gtkblist = GAIM_GTK_BLIST(gaim_get_blist());
 
-    ac->account = account ? account :
-		((struct gaim_connection *)connections->data)->account;
+    if (account) {
+	ac->account = account;
+    } else {
+	/* Select an account with chat capabilities */
+	for (c = connections; c != NULL; c = c->next) {
+	    gc = c->data;
+
+	    if (GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl)->join_chat) {
+		ac->account = gc->account;
+		break;
+	    }
+	}
+    }
+
+    if (!ac->account) {
+	do_error_dialog(
+		_("You are not currently signed on with any protocols "
+		"that have the ability to chat."), NULL, GAIM_ERROR); 
+	return;
+    }
 
 	ac->sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);

Update of /cvsroot/gaim/gaim/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv7293/plugins

Modified Files:
	events.c filectl.c gaiminc.c mailchk.c 
Log Message:
Paul A (darkrain) writes:
" This patch updates the events.c, filectl.c, gaiminc.c,
and mailchk.c plugins to the new api as well as
updating mailchk.c to the new buddy list code.

events.so, gaiminc.so, and mailchk.so all load and
function properly on my computer.

filectl doesn't even compile, but then, it has been a
while since it did actually compile. I didn't even bother
to update a few of the other plugins, since they're
completely out of date. Perhaps one of the developers
needs to go through and prune out a bunch of the
plugins that are not kept up to date.

Out of date plugins:

chatlist.c - superceded by faceprint's recent commit to
cvs.
filectl.c - doesn't support multiple accounts for IMs and
away messages.
raw.c - does anyone use this? it doesn't compile, but it
looks like an easy fix. "




Index: events.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/events.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- events.c	25 Apr 2003 06:47:14 -0000	1.9
+++ events.c	28 Apr 2003 18:45:34 -0000	1.10
@@ -1,4 +1,4 @@
-/* tester.c
+/* events.c
  *
  * test every callback, print to stdout
  *
@@ -8,7 +8,7 @@
  *
  */
 
-#define GAIM_PLUGINS
+#define EVENTTEST_PLUGIN_ID "core-eventtest"
 #include "gaim.h"
 
 static void evt_signon(struct gaim_connection *gc, void *data)
@@ -148,7 +148,7 @@
 
 static void evt_im_displayed_rcvd(struct gaim_connection *gc, char *who, char *what, guint32 flags, time_t time, void *data)
 {
-	printf("event_im_displayed_rcvd: %s %s %s %s\n", who, what, flags, time);
+	printf("event_im_displayed_rcvd: %s %s %u %u\n", who, what, flags, time);
 }
 
 static void evt_chat_send_invite(struct gaim_connection *gc, int id, char *who, char **msg, void *data)
@@ -161,7 +161,7 @@
 	printf("event_got_typing: %s\n", who);
 }
 
-static evt_del_conversation(struct conversation *c, void *data)
+static evt_del_conversation(struct gaim_conversation *c, void *data)
 {
 	printf("event_del_conversation\n");
 }
@@ -171,57 +171,77 @@
 	printf("event_connecting\n");
 }
 
-char *gaim_plugin_init(GModule *h)
+
+/*
+ *  EXPORTED FUNCTIONS
+ */
+
+static gboolean
+plugin_load(GaimPlugin *plugin)
 {
-	gaim_signal_connect(h, event_signon,			evt_signon, NULL);
-	gaim_signal_connect(h, event_signoff,			evt_signoff, NULL);
-	gaim_signal_connect(h, event_away,				evt_away, NULL);
-	gaim_signal_connect(h, event_back,				evt_back, NULL);
-	gaim_signal_connect(h, event_im_recv,			evt_im_recv, NULL);
-	gaim_signal_connect(h, event_im_send,			evt_im_send, NULL);
-	gaim_signal_connect(h, event_buddy_signon,		evt_buddy_signon, NULL);
-	gaim_signal_connect(h, event_buddy_signoff,		evt_buddy_signoff, NULL);
-	gaim_signal_connect(h, event_buddy_away,		evt_buddy_away, NULL);
-	gaim_signal_connect(h, event_buddy_back,		evt_buddy_back, NULL);
-	gaim_signal_connect(h, event_chat_invited,		evt_chat_invited, NULL);
-	gaim_signal_connect(h, event_chat_join,			evt_chat_join, NULL);
-	gaim_signal_connect(h, event_chat_leave,		evt_chat_leave, NULL);
-	gaim_signal_connect(h, event_chat_buddy_join,	evt_chat_buddy_join, NULL);
-	gaim_signal_connect(h, event_chat_buddy_leave,	evt_chat_buddy_leave, NULL);
-	gaim_signal_connect(h, event_chat_recv,			evt_chat_recv, NULL);
-	gaim_signal_connect(h, event_chat_send,			evt_chat_send, NULL);
-	gaim_signal_connect(h, event_warned,			evt_warned, NULL);
-	gaim_signal_connect(h, event_error,				evt_error, NULL);
-	gaim_signal_connect(h, event_quit,				evt_quit, NULL);
-	gaim_signal_connect(h, event_new_conversation,	evt_new_conversation, NULL);
-	gaim_signal_connect(h, event_set_info,			evt_set_info, NULL);
-	gaim_signal_connect(h, event_draw_menu,			evt_draw_menu, NULL);
-	gaim_signal_connect(h, event_im_displayed_sent,	evt_im_displayed_sent, NULL);
-	gaim_signal_connect(h, event_im_displayed_rcvd, evt_im_displayed_rcvd, NULL);
-	gaim_signal_connect(h, event_chat_send_invite,	evt_chat_send_invite, NULL);
-	gaim_signal_connect(h, event_got_typing, 		evt_got_typing, NULL);
-	gaim_signal_connect(h, event_del_conversation,	evt_del_conversation, NULL);
-	gaim_signal_connect(h, event_connecting,		evt_connecting, NULL);
-	return NULL;
-}
+	gaim_signal_connect(plugin, event_signon,		evt_signon, NULL);
+	gaim_signal_connect(plugin, event_signoff,		evt_signoff, NULL);
+	gaim_signal_connect(plugin, event_away,		evt_away, NULL);
+	gaim_signal_connect(plugin, event_back,		evt_back, NULL);
+	gaim_signal_connect(plugin, event_im_recv,		evt_im_recv, NULL);
+	gaim_signal_connect(plugin, event_im_send,		evt_im_send, NULL);
+	gaim_signal_connect(plugin, event_buddy_signon,	evt_buddy_signon, NULL);
+	gaim_signal_connect(plugin, event_buddy_signoff,	evt_buddy_signoff, NULL);
+	gaim_signal_connect(plugin, event_buddy_away,	evt_buddy_away, NULL);
+	gaim_signal_connect(plugin, event_buddy_back,	evt_buddy_back, NULL);
+	gaim_signal_connect(plugin, event_chat_invited,	evt_chat_invited, NULL);
+	gaim_signal_connect(plugin, event_chat_join,		evt_chat_join, NULL);
+	gaim_signal_connect(plugin, event_chat_leave,	evt_chat_leave, NULL);
+	gaim_signal_connect(plugin, event_chat_buddy_join,	evt_chat_buddy_join, NULL);
+	gaim_signal_connect(plugin, event_chat_buddy_leave,	evt_chat_buddy_leave, NULL);
+	gaim_signal_connect(plugin, event_chat_recv,		evt_chat_recv, NULL);
+	gaim_signal_connect(plugin, event_chat_send,		evt_chat_send, NULL);
+	gaim_signal_connect(plugin, event_warned,		evt_warned, NULL);
+	gaim_signal_connect(plugin, event_error,		evt_error, NULL);
+	gaim_signal_connect(plugin, event_quit,		evt_quit, NULL);
+	gaim_signal_connect(plugin, event_new_conversation,	evt_new_conversation, NULL);
+	gaim_signal_connect(plugin, event_set_info,		evt_set_info, NULL);
+	gaim_signal_connect(plugin, event_draw_menu,		evt_draw_menu, NULL);
+	gaim_signal_connect(plugin, event_im_displayed_sent,	evt_im_displayed_sent, NULL);
+	gaim_signal_connect(plugin, event_im_displayed_rcvd, evt_im_displayed_rcvd, NULL);
+	gaim_signal_connect(plugin, event_chat_send_invite,	evt_chat_send_invite, NULL);
+	gaim_signal_connect(plugin, event_got_typing, 	evt_got_typing, NULL);
+	gaim_signal_connect(plugin, event_del_conversation,	evt_del_conversation, NULL);
+	gaim_signal_connect(plugin, event_connecting,	evt_connecting, NULL);
 
-struct gaim_plugin_description desc; 
-struct gaim_plugin_description *gaim_plugin_desc() {
-	desc.api_version = GAIM_PLUGIN_API_VERSION;
-	desc.name = g_strdup("Event Tester");
-	desc.version = g_strdup(VERSION);
-	desc.description = g_strdup("Test to see that all plugin events are working properly.");
-	desc.authors = g_strdup("Eric Warmehoven <eric@...>");
-	desc.url = g_strdup(WEBSITE);
-	return &desc;
+	return TRUE;
 }
 
-char *name()
+static GaimPluginInfo info =
 {
-	return "Event Test";
-}
+	2,                                                /**< api_version    */
+	GAIM_PLUGIN_STANDARD,                             /**< type           */
+	NULL,                                             /**< ui_requirement */
+	0,                                                /**< flags          */
+	NULL,                                             /**< dependencies   */
+	GAIM_PRIORITY_DEFAULT,                            /**< priority       */
 
-char *description()
+	EVENTTEST_PLUGIN_ID,                              /**< id             */
+	N_("Event Test"),                                 /**< name           */
+	VERSION,                                          /**< version        */
+	                                                  /**  summary        */
+	N_("Test to see that all events are working properly."),
+	                                                  /**  description    */
+	N_("Test to see that all events are working properly."),
+	"Eric Warmenhoven <eric@...>",        /**< author         */
+	WEBSITE,                                          /**< homepage       */
+
+	plugin_load,                                      /**< load           */
+	NULL,                                             /**< unload         */
+	NULL,                                             /**< destroy        */
+
+	NULL,                                             /**< ui_info        */
+	NULL                                              /**< extra_info     */
+};
+
+static void
+__init_plugin(GaimPlugin *plugin)
 {
-	return "Test to see that all events are working properly.";
 }
+
+GAIM_INIT_PLUGIN(eventtester, __init_plugin, info);

Index: filectl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/filectl.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- filectl.c	26 Apr 2003 17:36:51 -0000	1.17
+++ filectl.c	28 Apr 2003 18:45:36 -0000	1.18
@@ -9,7 +9,7 @@
 #include <string.h>
 #include <ctype.h>
 
-static void *handle;
+#define FILECTL_PLUGIN_ID "core-filectl"
 static int check;
 static time_t mtime;
 
@@ -107,36 +107,6 @@
 	mtime = finfo.st_mtime;
 }
 
-char *gaim_plugin_init(GModule *h) {
-	handle = h;
-	init_file();
-	check = g_timeout_add(5000, check_file, NULL);
-	return NULL;
-}
-
-void gaim_plugin_remove() {
-	g_source_remove(check);
-}
-
-struct gaim_plugin_description desc; 
-struct gaim_plugin_description *gaim_plugin_desc() {
-	desc.api_version = GAIM_PLUGIN_API_VERSION;
-	desc.name = g_strdup("Gaim File Control");
-	desc.version = g_strdup(VERSION);
-	desc.description = g_strdup("Allows you to control Gaim by entering commands in aa file.");
-	desc.authors = g_strdup("Eric Warmehoven &lt;eric@...>");
-	desc.url = g_strdup(WEBSITE);
-	return &desc;
-}
- 
-char *name() {
-	return "Gaim File Control";
-}
-
-char *description() {
-	return "Allows you to control gaim by entering commands in a file.";
-}
-
 /* check to see if the size of the file is > 0. if so, run commands */
 void init_file() {
 	/* most of this was taken from Bash v2.04 by the FSF */
@@ -199,3 +169,57 @@
 	free(arr);
 	return val;
 }
+/*
+ *  EXPORTED FUNCTIONS
+ */
+
+static gboolean
+plugin_load(GaimPlugin *plugin)
+{
+	init_file();
+	check = g_timeout_add(5000, check_file, NULL);
+
+	return TRUE;
+}
+
+static gboolean
+plugin_unload(GaimPlugin *plugin)
+{
+	g_source_remove(check);
+
+	return TRUE;
+}
+
+static GaimPluginInfo info =
+{
+	2,                                                /**< api_version    */
+	GAIM_PLUGIN_STANDARD,                             /**< type           */
+	NULL,                                             /**< ui_requirement */
+	0,                                                /**< flags          */
+	NULL,                                             /**< dependencies   */
+	GAIM_PRIORITY_DEFAULT,                            /**< priority       */
+
+	FILECTL_PLUGIN_ID,                                /**< id             */
+	N_("Gaim File Control"),                          /**< name           */
+	VERSION,                                          /**< version        */
+	                                                  /**  summary        */
+	N_("Allows you to control Gaim by entering commands in a file."),
+	                                                  /**  description    */
+	N_("Allows you to control Gaim by entering commands in a file."),
+	"Eric Warmenhoven <eric@...>",        /**< author         */
+	WEBSITE,                                          /**< homepage       */
+
+	plugin_load,                                      /**< load           */
+	plugin_unload,                                    /**< unload         */
+	NULL,                                             /**< destroy        */
+
+	NULL,                                             /**< ui_info        */
+	NULL                                              /**< extra_info     */
+};
+
+static void
+__init_plugin(GaimPlugin *plugin)
+{
+}
+
+GAIM_INIT_PLUGIN(filectl, __init_plugin, info);

Index: gaiminc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/gaiminc.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gaiminc.c	25 Apr 2003 06:47:16 -0000	1.8
+++ gaiminc.c	28 Apr 2003 18:45:36 -0000	1.9
@@ -1,12 +1,12 @@
-#define GAIM_PLUGINS
-
-#include <gtk/gtk.h>
+//#include <gtk/gtk.h>
 #include <time.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <string.h>
 #include "gaim.h"
 
+#define GAIMINC_PLUGIN_ID "core-gaiminc"
+
 void echo_hi(void *m) {
 	/* this doesn't do much, just lets you know who we are :) */
 	show_about(NULL, NULL);
@@ -37,47 +37,62 @@
 void bud(struct gaim_connection *gc, char *who, void *m) {
 	/* whenever someone comes online, it sends them a message. if i
 	 * cared more, i'd make it so it popped up on your screen too */
-	serv_send_im(gc, who, "Hello!", 0);
+	serv_send_im(gc, who, "Hello!", -1, 0);
 }
 
-char *gaim_plugin_init(GModule *handle) {
+/*
+ *  EXPORTED FUNCTIONS
+ */
+
+static gboolean
+plugin_load(GaimPlugin *plugin)
+{
 	/* this is for doing something fun when we sign on */
-	gaim_signal_connect(handle, event_signon, echo_hi, NULL);
+	gaim_signal_connect(plugin, event_signon, echo_hi, NULL);
 
 	/* this is for doing something fun when we get a message */
-	gaim_signal_connect(handle, event_im_recv, reverse, NULL);
+	gaim_signal_connect(plugin, event_im_recv, reverse, NULL);
 
 	/* this is for doing something fun when a buddy comes online */
-	gaim_signal_connect(handle, event_buddy_signon, bud, NULL);
+	gaim_signal_connect(plugin, event_buddy_signon, bud, NULL);
 
-	return NULL;
+	return TRUE;
 }
 
-struct gaim_plugin_description desc; 
-struct gaim_plugin_description *gaim_plugin_desc() {
-	desc.api_version = GAIM_PLUGIN_API_VERSION;
-	desc.name = g_strdup("Demonstration");
-	desc.version = g_strdup(VERSION);
-	desc.description = g_strdup(
-                "This is a really cool plugin that does a lot of stuff:\n"
-		"- It tells you who wrote the program when you log in\n"
-		"- It reverses all incoming text\n"
-		"- It sends a message to people on your list immediately"
-		" when they sign on";);
-	desc.authors = g_strdup("Eric Warmehoven &lt;eric@...>");
-	desc.url = g_strdup(WEBSITE);
-	return &desc;
-}
+static GaimPluginInfo info =
+{
+	2,                                                /**< api_version    */
+	GAIM_PLUGIN_STANDARD,                             /**< type           */
+	NULL,                                             /**< ui_requirement */
+	0,                                                /**< flags          */
+	NULL,                                             /**< dependencies   */
+	GAIM_PRIORITY_DEFAULT,                            /**< priority       */
 
+	GAIMINC_PLUGIN_ID,                                /**< id             */
+	N_("Gaim Demonstration Plugin"),                  /**< name           */
+	VERSION,                                          /**< version        */
+	                                                  /**  summary        */
+	N_("An example plugin that does stuff - see the description."),
+	                                                  /**  description    */
+	N_("This is a really cool plugin that does a lot of stuff:\n"
+	   "- It tells you who wrote the program when you log in\n"
+	   "- It reverses all incoming text\n"
+	   "- It sends a message to people on your list immediately"
+	   " when they sign on"),
+	"Eric Warmenhoven <eric@...>",        /**< author         */
+	WEBSITE,                                          /**< homepage       */
 
-char *name() {
-	return "Gaim Demonstration Plugin";
-}
+	plugin_load,                                      /**< load           */
+	NULL,                                    /**< unload         */
+	NULL,                                             /**< destroy        */
 
-char *description() {
-	return "This is a really cool plugin that does a lot of stuff:\n"
-		"- It tells you who wrote the program when you log in\n"
-		"- It reverses all incoming text\n"
-		"- It sends a message to people on your list immediately"
-		" when they sign on";
+	NULL,                                             /**< ui_info        */
+	NULL                                              /**< extra_info     */
+};
+
+static void
+__init_plugin(GaimPlugin *plugin)
+{
 }
+
+GAIM_INIT_PLUGIN(gaiminc, __init_plugin, info);

Index: mailchk.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/mailchk.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- mailchk.c	25 Apr 2003 06:47:16 -0000	1.13
+++ mailchk.c	28 Apr 2003 18:45:38 -0000	1.14
@@ -1,10 +1,13 @@
 #include "gaim.h"
+#include "gtkplugin.h"
+#include "blist.h"
+#include "gtkblist.h"
 #include "sound.h"
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 
-#define MAILCHK_PLUGIN_ID "core-mailchk"
+#define MAILCHK_PLUGIN_ID "gtk-mailchk"
 
 #define ANY_MAIL    0x01
 #define UNREAD_MAIL 0x02
@@ -41,7 +44,7 @@
 	return ret;
 }
 
-static void maildes()
+static void destroy_cb()
 {
 	mail = NULL;
 }
@@ -49,22 +52,23 @@
 static gboolean check_timeout(gpointer data)
 {
 	gint count = check_mail();
-
+	struct gaim_buddy_list *list = gaim_get_blist();
 	if (count == -1)
 		return FALSE;
 
-	if (!blist)
+	if (!list || !GAIM_GTK_BLIST(list))
 		return TRUE;
 
 	if (!mail) {
 		/* guess we better build it then :P */
-		GList *tmp = gtk_container_get_children(GTK_CONTAINER(blist));
-		GtkWidget *vbox2 = (GtkWidget *)tmp->data;
+		//GList *tmp = gtk_container_get_children(GTK_CONTAINER(GAIM_GTK_BLIST(list)));
+		//GtkWidget *vbox2 = (GtkWidget *)tmp->data;
+		GtkWidget *vbox = (GtkWidget *)(GAIM_GTK_BLIST(list)->vbox);
 
 		mail = gtk_label_new("No mail messages.");
-		gtk_box_pack_start(GTK_BOX(vbox2), mail, FALSE, FALSE, 0);
-		gtk_box_reorder_child(GTK_BOX(vbox2), mail, 1);
-		g_signal_connect(GTK_OBJECT(mail), "destroy", G_CALLBACK(maildes), NULL);
+		gtk_box_pack_start(GTK_BOX(vbox), mail, FALSE, FALSE, 0);
+		gtk_box_reorder_child(GTK_BOX(vbox), mail, 1);
+		g_signal_connect(GTK_OBJECT(mail), "destroy", G_CALLBACK(destroy_cb), NULL);
 		gtk_widget_show(mail);
 	}
 
@@ -81,32 +85,46 @@
 	return TRUE;
 }
 
-static void mail_signon(struct gaim_connection *gc)
+static void signon_cb(struct gaim_connection *gc)
 {
-	if (blist && !timer)
+	struct gaim_buddy_list *list = gaim_get_blist();
+	if (list && GAIM_GTK_BLIST(list) && !timer)
 		timer = g_timeout_add(2000, check_timeout, NULL);
 }
 
-static void mail_signoff(struct gaim_connection *gc)
+static void signoff_cb(struct gaim_connection *gc)
 {
-	if (!blist && timer) {
+	struct gaim_buddy_list *list = gaim_get_blist();
+	if ((!list || !GAIM_GTK_BLIST(list)) && timer) {
 		g_source_remove(timer);
 		timer = 0;
 	}
 }
 
-char *gaim_plugin_init(GModule *m)
+/*
+ *  EXPORTED FUNCTIONS
+ */
+
+static gboolean
+plugin_load(GaimPlugin *plugin)
 {
-	if (!check_timeout(NULL))
-		return "Could not read $MAIL or /var/spool/mail/$USER";
-	if (blist)
+	struct gaim_buddy_list *list = gaim_get_blist();
+	if (!check_timeout(NULL)) {
+		gaim_debug(GAIM_DEBUG_WARNING, "mailchk", "Could not read $MAIL or /var/spool/mail/$USER");
+		return FALSE;
+	}
+
+	if (list && GAIM_GTK_BLIST(list))
 		timer = g_timeout_add(2000, check_timeout, NULL);
-	gaim_signal_connect(m, event_signon, mail_signon, NULL);
-	gaim_signal_connect(m, event_signoff, mail_signoff, NULL);
-	return NULL;
+
+	gaim_signal_connect(plugin, event_signon, signon_cb, NULL);
+	gaim_signal_connect(plugin, event_signoff, signoff_cb, NULL);
+
+	return TRUE;
 }
 
-void gaim_plugin_remove()
+static gboolean
+plugin_unload(GaimPlugin *plugin)
 {
 	if (timer)
 		g_source_remove(timer);
@@ -114,25 +132,40 @@
 	if (mail)
 		gtk_widget_destroy(mail);
 	mail = NULL;
-}
 
-struct gaim_plugin_description desc; 
-struct gaim_plugin_description *gaim_plugin_desc() {
-	desc.api_version = GAIM_PLUGIN_API_VERSION;
-	desc.name = g_strdup("Mail Checker");
-	desc.version = g_strdup(VERSION);
-	desc.description = g_strdup("Checks for new local mail.");
-	desc.authors = g_strdup("Eric Warmehoven &lt;eric@...>");
-	desc.url = g_strdup(WEBSITE);
-	return &desc;
+	return TRUE;
 }
 
-char *name()
+static GaimPluginInfo info =
 {
-	return "Mail Check";
-}
+	2,                                                /**< api_version    */
+	GAIM_PLUGIN_STANDARD,                             /**< type           */
+	GAIM_GTK_PLUGIN_TYPE,                             /**< ui_requirement */
+	0,                                                /**< flags          */
+	NULL,                                             /**< dependencies   */
+	GAIM_PRIORITY_DEFAULT,                            /**< priority       */
 
-char *description()
+	MAILCHK_PLUGIN_ID,                                /**< id             */
+	N_("Mail Checker"),                               /**< name           */
+	VERSION,                                          /**< version        */
+	                                                  /**  summary        */
+	N_("Checks for new local mail."),
+	                                                  /**  description    */
+	N_("Checks for new local mail."),
+	"Eric Warmenhoven <eric@...>",        /**< author         */
+	WEBSITE,                                          /**< homepage       */
+
+	plugin_load,                                      /**< load           */
+	plugin_unload,                                    /**< unload         */
+	NULL,                                             /**< destroy        */
+
+	NULL,                                             /**< ui_info        */
+	NULL                                              /**< extra_info     */
+};
+
+static void
+__init_plugin(GaimPlugin *plugin)
 {
-	return "Checks for new local mail";
 }
+
+GAIM_INIT_PLUGIN(mailchk, __init_plugin, info);

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv3009/src

Modified Files:
	gtkblist.c 
Log Message:
(11:59:54) Robot101: found & fixed a crash at signoff...
(12:17:48) faceprint|laptop: "if you can't figure out what this is, you shouldn't be using CVS"


Index: gtkblist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gtkblist.c	27 Apr 2003 17:33:10 -0000	1.4
+++ gtkblist.c	28 Apr 2003 16:21:03 -0000	1.5
@@ -1552,9 +1552,11 @@
 
 static gboolean do_selection_changed(GaimBlistNode *new_selection)
 {
-	GaimBlistNode *old_selection = gtkblist->selected_node;
+	GaimBlistNode *old_selection = NULL;
 
-	if(new_selection != gtkblist->selected_node) {
+	/* test for gtkblist because crazy timeout means we can be called after the blist is gone */
+	if (gtkblist && new_selection != gtkblist->selected_node) {
+		old_selection = gtkblist->selected_node;
 		gtkblist->selected_node = new_selection;
 		if(new_selection)
 			gaim_gtk_blist_update(NULL, new_selection);
@@ -1574,6 +1576,7 @@
 		gtk_tree_model_get(GTK_TREE_MODEL(gtkblist->treemodel), &iter,
 				NODE_COLUMN, &new_selection, -1);
 	}
+
 	/* we set this up as a timeout, otherwise the blist flickers */
 	g_timeout_add(0, (GSourceFunc)do_selection_changed, new_selection);
 }

Update of /cvsroot/gaim/gaim
In directory sc8-pr-cvs1:/tmp/cvs-serv29460

Modified Files:
	Makefile.am 
Log Message:
pixmaps?!


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/Makefile.am,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- Makefile.am	9 Feb 2003 19:52:14 -0000	1.39
+++ Makefile.am	28 Apr 2003 07:50:44 -0000	1.40
@@ -7,8 +7,8 @@
 dist-hook: gaim.spec
 	cp gaim.spec $(distdir)
 
-pixmapdir = $(datadir)/applications
-pixmap_DATA = gaim.desktop
+appsdir = $(datadir)/applications
+apps_DATA = gaim.desktop
 
 SUBDIRS = sounds plugins pixmaps doc po intl src

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv18272/src

Modified Files:
	gaimrc.c 
Log Message:
"Shouldn't this give an error to the user so they know their stuff isn't
being saved?"  -Rob McQueen

I'm not doing so well tonight.


Index: gaimrc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaimrc.c,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -d -r1.162 -r1.163
--- gaimrc.c	28 Apr 2003 07:09:52 -0000	1.162
+++ gaimrc.c	28 Apr 2003 07:21:19 -0000	1.163
@@ -1593,8 +1593,7 @@
 					   "Error renaming %s to %s\n", filename_temp, filename);
 		} else {
 			fclose(f);
-			gaim_debug(GAIM_DEBUG_ERROR, "gaimrc",
-				   "Unable to create new .gaimrc file.  Preferences not updated.");
+			do_error_dialog(_("Unable to Save Preferences"), _("Gaim was unable to save your preferences.  Please verify that you have enough free space."), GAIM_ERROR);
 		}
 		is_saving_prefs = 0;
 	} else

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv14512/src

Modified Files:
	gaimrc.c 
Log Message:
<javabsp> KingAnt: Err, shouldn't you rename after you close the file?


Index: gaimrc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaimrc.c,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -d -r1.161 -r1.162
--- gaimrc.c	28 Apr 2003 06:49:07 -0000	1.161
+++ gaimrc.c	28 Apr 2003 07:09:52 -0000	1.162
@@ -1587,13 +1587,15 @@
 
 		gaimrc_write_proxy(f);
 		if (fprintf(f, "\n") == 1) {
+			fclose(f);
 			if (rename(filename_temp, filename) < 0)
 				gaim_debug(GAIM_DEBUG_ERROR, "gaimrc", 
 					   "Error renaming %s to %s\n", filename_temp, filename);
-		} else
+		} else {
+			fclose(f);
 			gaim_debug(GAIM_DEBUG_ERROR, "gaimrc",
 				   "Unable to create new .gaimrc file.  Preferences not updated.");
-		fclose(f);
+		}
 		is_saving_prefs = 0;
 	} else
 		gaim_debug(GAIM_DEBUG_ERROR, "gaimrc",

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv6719/src

Modified Files:
	gaimrc.c 
Log Message:
If your partition was full when saving preferences, .gaimrc.save could 
get created or half created, and then that file would get renamed to 
.gaimrc, which is bad, because the new rc file would be corrupt or 
whatever.  So I just added an ugly little check for "if I can add a 
newline on to the end of ~/.gaimrc.save, then it probably got written 
ok."

I'm not really a big fan of .gaimrc.  Someone with some skills might 
want to rewrite it?  Or maybe we should use xml or something?  I 
dunno.

Hooverphonic is cool


Index: gaimrc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaimrc.c,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -d -r1.160 -r1.161
--- gaimrc.c	28 Apr 2003 06:11:48 -0000	1.160
+++ gaimrc.c	28 Apr 2003 06:49:07 -0000	1.161
@@ -1586,10 +1586,14 @@
 			gaimrc_write_plugins(f);
 
 		gaimrc_write_proxy(f);
-		fclose(f);
-		if (rename(filename_temp, filename) < 0)
-			gaim_debug(GAIM_DEBUG_ERROR, "gaimrc",
+		if (fprintf(f, "\n") == 1) {
+			if (rename(filename_temp, filename) < 0)
+				gaim_debug(GAIM_DEBUG_ERROR, "gaimrc", 
 					   "Error renaming %s to %s\n", filename_temp, filename);
+		} else
+			gaim_debug(GAIM_DEBUG_ERROR, "gaimrc",
+				   "Unable to create new .gaimrc file.  Preferences not updated.");
+		fclose(f);
 		is_saving_prefs = 0;
 	} else
 		gaim_debug(GAIM_DEBUG_ERROR, "gaimrc",

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv31860/src

Modified Files:
	dialogs.c 
Log Message:
This bug report made me laugh a little.  It's kind of silly.


Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.464
retrieving revision 1.465
diff -u -d -r1.464 -r1.465
--- dialogs.c	27 Apr 2003 17:33:09 -0000	1.464
+++ dialogs.c	28 Apr 2003 06:23:42 -0000	1.465
@@ -3287,7 +3287,7 @@
 	if ((strlen(gtk_entry_get_text(GTK_ENTRY(ca->entry))) == 0) && (type == 1)) {
 		/* We shouldn't allow a blank title */
 		do_error_dialog(_("You cannot save an away message with a blank title"), 
-				_("Please give the message a title, or choose \"Make Away\" to use "
+				_("Please give the message a title, or choose \"Use\" to use "
 				  "without saving."), GAIM_ERROR);
 		return 0;
 	}

Update of /cvsroot/gaim/gaim/plugins/win32/transparency
In directory sc8-pr-cvs1:/tmp/cvs-serv28297/plugins/win32/transparency

Modified Files:
	win2ktrans.c 
Log Message:
Just cleaning up some loose ends.  This should fix compilation on Windows 
oxen.  How do you peeps feel about the TOMBSTONE thing?  I just like 
using that word.  "TOBMSTONE."


Index: win2ktrans.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/win32/transparency/win2ktrans.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- win2ktrans.c	26 Apr 2003 14:53:45 -0000	1.11
+++ win2ktrans.c	28 Apr 2003 06:11:47 -0000	1.12
@@ -24,7 +24,7 @@
 #include <gmodule.h>
 #include "gaim.h"
 #include "gtkplugin.h"
-#include "gtklist.h"
+#include "gtkblist.h"
 #include "win32dep.h"
 
 /*

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv28297/src

Modified Files:
	Makefile.mingw gaim.h gaimrc.c gtkblist.h prefs.c server.c 
Log Message:
Just cleaning up some loose ends.  This should fix compilation on Windows 
oxen.  How do you peeps feel about the TOMBSTONE thing?  I just like 
using that word.  "TOBMSTONE."


Index: Makefile.mingw
===================================================================
RCS file: /cvsroot/gaim/gaim/src/Makefile.mingw,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- Makefile.mingw	26 Apr 2003 14:55:40 -0000	1.28
+++ Makefile.mingw	28 Apr 2003 06:11:47 -0000	1.29
@@ -76,8 +76,8 @@
 
 DLL_C_SRC =		about.c \
 			away.c \
+			blist.c \
 			browser.c \
-			buddy.c \
 			buddy_chat.c \
 			conversation.c \
 			core.c \
@@ -88,6 +88,7 @@
 			ft.c \
 			gaim-disclosure.c \
 			gaimrc.c \
+			gtkblist.c \
 			gtkconv.c \
 			gtkcellrendererprogress.c \
 			gtkdebug.c \
@@ -98,7 +99,6 @@
 			gtkutils.c \
 			html.c \
 			idle.c \
-			list.c \
 			log.c \
 			main.c \
 			md5.c \

Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.391
retrieving revision 1.392
diff -u -d -r1.391 -r1.392
--- gaim.h	26 Apr 2003 20:30:31 -0000	1.391
+++ gaim.h	28 Apr 2003 06:11:48 -0000	1.392
@@ -183,9 +183,6 @@
 
 #define OPT_POUNCE_NOTIFY	0x200
 
-#define CONVERSATION_TITLE "%s - Gaim"
-#define LOG_CONVERSATION_TITLE "%s - Gaim (logged)"
-
 /* These should all be runtime selectable */
 
 #define MSG_LEN 2048
@@ -195,7 +192,7 @@
 #define BUF_LEN MSG_LEN
 #define BUF_LONG BUF_LEN * 2
 
-/* Globals in aim.c */
+/* Globals in main.c */
 extern int opt_away;
 extern char *opt_away_arg;
 extern char *opt_rcfile_arg;
@@ -204,9 +201,9 @@
 extern guint misc_options;
 #define OPT_MISC_DEBUG			0x00000001
 #define OPT_MISC_BROWSER_POPUP		0x00000002
-#define OPT_MISC_BUDDY_TICKER           0x00000004
-#define OPT_MISC_STEALTH_TYPING         0x00000010
-#define OPT_MISC_USE_SERVER_ALIAS		0x00000020
+#define OPT_MISC_BUDDY_TICKER		0x00000004
+#define OPT_MISC_STEALTH_TYPING		0x00000010
+#define OPT_MISC_USE_SERVER_ALIAS	0x00000020
 
 extern guint logging_options;
 #define OPT_LOG_CONVOS			0x00000001
@@ -313,7 +310,7 @@
 
 extern guint away_options;
 #define OPT_AWAY_BACK_ON_IM		0x00000002
-/* #define OPT_AWAY_TIK_HACK		0x00000004 */
+/* #define OPT_AWAY_TOMBSTONE		0x00000004 */
 #define OPT_AWAY_AUTO			0x00000008
 #define OPT_AWAY_NO_AUTO_RESP		0x00000010
 #define OPT_AWAY_QUEUE			0x00000020
@@ -332,10 +329,10 @@
 extern struct save_pos blist_pos;
 extern struct window_size conv_size, buddy_chat_size;
 
-/* Functions in aim.c */
+/* Functions in main.c */
 extern void do_quit();
 
-/* Functions in buddy.c */
+/* Functions in gtkblist.c */
 extern void signoff(struct gaim_connection *);
 
 /* Functions in buddy_chat.c */

Index: gaimrc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaimrc.c,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -d -r1.159 -r1.160
--- gaimrc.c	26 Apr 2003 06:46:07 -0000	1.159
+++ gaimrc.c	28 Apr 2003 06:11:48 -0000	1.160
@@ -839,7 +839,7 @@
 { /* OPT_GEN_BACK_ON_IM */		0x00020000,  &away_options, OPT_AWAY_BACK_ON_IM },
 { /* OPT_GEN_CTL_CHARS */		0x00080000, &convo_options, OPT_CONVO_CTL_CHARS },
 #if 0
-{ /* OPT_GEN_TIK_HACK */		0x00100000,  &away_options, OPT_AWAY_TIK_HACK },
+{ /* OPT_GEN_TOMBSTONE */		0x00100000,  &away_options, OPT_AWAY_TOMBSTONE },
 #endif
 { /* OPT_GEN_CTL_SMILEYS */		0x00200000, &convo_options, OPT_CONVO_CTL_SMILEYS },
 { /* OPT_GEN_AUTO_AWAY */		0x00800000,  &away_options, OPT_AWAY_AUTO },

Index: gtkblist.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkblist.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gtkblist.h	26 Apr 2003 20:30:31 -0000	1.2
+++ gtkblist.h	28 Apr 2003 06:11:48 -0000	1.3
@@ -1,5 +1,5 @@
 /**
- * @file gtklist.h GTK+ Buddy List API
+ * @file gtkblist.h GTK+ Buddy List API
  * @ingroup gtkui
  *
  * gaim

Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -d -r1.368 -r1.369
--- prefs.c	26 Apr 2003 17:56:22 -0000	1.368
+++ prefs.c	28 Apr 2003 06:11:48 -0000	1.369
@@ -540,7 +540,6 @@
 	gaim_button(_("Ignore c_olors"), &convo_options, OPT_CONVO_IGNORE_COLOUR, vbox);
 	gaim_button(_("Ignore font _faces"), &convo_options, OPT_CONVO_IGNORE_FONTS, vbox);
 	gaim_button(_("Ignore font si_zes"), &convo_options, OPT_CONVO_IGNORE_SIZES, vbox);
-/*	gaim_button(_("Ignore Ti_K Automated Messages"), &away_options, OPT_AWAY_TIK_HACK, vbox); */
 
 	gtk_widget_show_all(ret);
 	return ret;

Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -d -r1.302 -r1.303
--- server.c	27 Apr 2003 17:10:02 -0000	1.302
+++ server.c	28 Apr 2003 06:11:49 -0000	1.303
@@ -793,26 +793,6 @@
 		message = g_memdup(msg, len);
 	}
 
-#if 0
-	/*
-	 * TiK, using TOC, sends an automated message in order to get your
-	 * away message. Now, this is one of the biggest hacks I think I've
-	 * seen. But, in order to be nice to TiK, we're going to give users
-	 * the option to ignore it.
-	 */
-	if ((away_options & OPT_AWAY_TIK_HACK) && gc->away &&
-		strlen(gc->away) && (len < 0) &&
-
-	    !strcmp(message, ">>>Automated Message: Getting Away Message<<<")) {
-		char *tmpmsg = stylize(awaymessage->message, MSG_LEN);
-		serv_send_im(gc, name, tmpmsg, -1, IM_FLAG_AWAY);
-		g_free(tmpmsg);
-		g_free(name);
-		g_free(message);
-		return;
-	}
-#endif
-
 	/*
 	 * If you can't figure this out, stop reading right now.
 	 * "We're not worthy! We're not worthy!"

Update of /cvsroot/gaim/gaim/src/win32
In directory sc8-pr-cvs1:/tmp/cvs-serv28297/src/win32

Modified Files:
	systray.c 
Log Message:
Just cleaning up some loose ends.  This should fix compilation on Windows 
oxen.  How do you peeps feel about the TOMBSTONE thing?  I just like 
using that word.  "TOBMSTONE."


Index: systray.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/win32/systray.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- systray.c	8 Apr 2003 18:35:20 -0000	1.11
+++ systray.c	28 Apr 2003 06:11:49 -0000	1.12
@@ -12,7 +12,7 @@
 #include "win32dep.h"
 #include "MinimizeToTray.h"
 #include "ui.h"
-#include "gtklist.h"
+#include "gtkblist.h"
 
 /*
  *  DEFINES, MACROS & DATA TYPES

Update of /cvsroot/gaim/web/htdocs
In directory sc8-pr-cvs1:/tmp/cvs-serv2450/htdocs

Modified Files:
	faq.txt 
Log Message:
I can't control the weather!
That's Pudge the Fish's job.
Thursday is sandwich day.


Index: faq.txt
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/faq.txt,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- faq.txt	27 Apr 2003 06:42:35 -0000	1.41
+++ faq.txt	28 Apr 2003 03:10:42 -0000	1.42
@@ -280,7 +280,7 @@
 Q:	Some of my buddies are not showing up as online, why is that?
 
 A:	AOL has set a limit for the maximum number of people you can
-have in your buddy list.  This number is currently 400.  Gaim 0.58 and newer 
+have in your buddy list.  This number is currently 160.  Gaim 0.58 and newer 
 give you a warning if you are over the limit, but if you are using something 
 prior to 0.58, make sure you are not over the limit (and upgrade to something
  more recent!).

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv25922/src

Modified Files:
	blist.c blist.h util.c 
Log Message:
(22:40:26) Paco-Paco: gaim_find_buddy was an O(n) search through the blist tree, this adds an auxilliary hash to bring that down to O(1)


Index: blist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/blist.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- blist.c	26 Apr 2003 21:43:59 -0000	1.3
+++ blist.c	28 Apr 2003 02:41:00 -0000	1.4
@@ -65,6 +65,21 @@
 	return gaim_blist_get_last_sibling(node->child);
 }
 
+struct _gaim_hbuddy {
+	char *name;
+	struct gaim_account *account;
+};
+
+static guint _gaim_blist_hbuddy_hash (struct _gaim_hbuddy *hb)
+{
+	return g_str_hash(hb->name);
+}
+
+static guint _gaim_blist_hbuddy_equal (struct _gaim_hbuddy *hb1, struct _gaim_hbuddy *hb2)
+{
+	return ((!strcmp(hb1->name, hb2->name)) && hb1->account == hb2->account);
+}
+
 /*****************************************************************************
  * Public API functions                                                      *
  *****************************************************************************/
@@ -75,6 +90,9 @@
 
 	gbl->ui_ops = gaim_get_blist_ui_ops();
 
+	gbl->buddies = g_hash_table_new ((GHashFunc)_gaim_blist_hbuddy_hash, 
+					 (GEqualFunc)_gaim_blist_hbuddy_equal);
+
 	if (gbl->ui_ops != NULL && gbl->ui_ops->new_list != NULL)
 		gbl->ui_ops->new_list(gbl);
 
@@ -348,6 +366,7 @@
 	GaimBlistNode *n = node, *bnode = (GaimBlistNode*)buddy;
 	struct group *g = group;
 	struct gaim_blist_ui_ops *ops = gaimbuddylist->ui_ops;
+	struct _gaim_hbuddy *hb;
 	gboolean save = FALSE;
 
 	if (!n) {
@@ -396,6 +415,18 @@
 		((GaimBlistNode*)buddy)->parent = (GaimBlistNode*)g;
 	}
 
+	hb = g_malloc(sizeof(struct _gaim_hbuddy));
+	hb->name = g_strdup(normalize(buddy->name));
+	hb->account = buddy->account;
+
+	if (g_hash_table_lookup(gaimbuddylist->buddies, (gpointer)hb)) {
+		/* This guy already exists */
+		g_free(hb->name);
+		g_free(hb);
+	} else {
+		g_hash_table_insert(gaimbuddylist->buddies, (gpointer)hb, (gpointer)buddy);
+	}
+
 	if (ops)
 		ops->update(gaimbuddylist, (GaimBlistNode*)buddy);
 	if (save)
@@ -481,6 +512,8 @@
 
 	GaimBlistNode *gnode, *node = (GaimBlistNode*)buddy;
 	struct group *group;
+	struct _gaim_hbuddy hb, *key;
+	struct buddy *val;
 
 	gnode = node->parent;
 	group = (struct group *)gnode;
@@ -492,6 +525,14 @@
 	if (node->next)
 		node->next->prev = node->prev;
 
+	hb.name = normalize(buddy->name);
+	hb.account = buddy->account;
+	if (g_hash_table_lookup_extended(gaimbuddylist->buddies, &hb, (gpointer *)&key, (gpointer *)&val)) {
+		g_hash_table_remove(gaimbuddylist->buddies, &hb);
+		g_free(key->name);
+		g_free(key);
+	}
+
 	ops->remove(gaimbuddylist, node);
 	g_hash_table_destroy(buddy->settings);
 	g_free(buddy->name);
@@ -579,29 +620,17 @@
 
 struct buddy *gaim_find_buddy(struct gaim_account *account, const char *name)
 {
-	GaimBlistNode *group;
-	GaimBlistNode *buddy;
-	char *norm_name = g_strdup(normalize(name));
+	struct buddy *buddy;
+	struct _gaim_hbuddy hb;
 
 	if (!gaimbuddylist)
 		return NULL;
 
-	group = gaimbuddylist->root;
-	while (group) {
-		buddy = group->child;
-		while (buddy) {
-			if(GAIM_BLIST_NODE_IS_BUDDY(buddy)) {
-				if (!gaim_utf8_strcasecmp(normalize(((struct buddy*)buddy)->name), norm_name) && account == ((struct buddy*)buddy)->account) {
-					g_free(norm_name);
-					return (struct buddy*)buddy;
-				}
-			}
-			buddy = buddy->next;
-		}
-		group = group->next;
-	}
-	g_free(norm_name);
-	return NULL;
+	hb.name = normalize(name);
+	hb.account = account;
+	buddy = g_hash_table_lookup(gaimbuddylist->buddies, &hb);
+
+	return buddy;
 }
 
 struct group *gaim_find_group(const char *name)

Index: blist.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/blist.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- blist.h	26 Apr 2003 20:30:29 -0000	1.2
+++ blist.h	28 Apr 2003 02:41:00 -0000	1.3
@@ -116,6 +116,7 @@
  */
 struct gaim_buddy_list {
 	GaimBlistNode *root;                    /**< The first node in the buddy list */
+	GHashTable *buddies;			/**< Every buddy in this list */
 	struct gaim_blist_ui_ops *ui_ops;       /**< The UI operations for the buddy list */
 
 	void *ui_data;                          /**< UI-specific data. */

Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -d -r1.183 -r1.184
--- util.c	26 Apr 2003 20:30:34 -0000	1.183
+++ util.c	28 Apr 2003 02:41:00 -0000	1.184
@@ -541,6 +541,9 @@
 	tmp = g_utf8_strdown(buf, -1);
 	g_snprintf(buf, sizeof(buf), "%s", tmp);
 	g_free(tmp);
+	tmp = g_utf8_normalize(buf, -1, G_NORMALIZE_DEFAULT);
+	g_snprintf(buf, sizeof(buf), "%s", tmp);
+	g_free(tmp);
 
 	return buf;
 }

Update of /cvsroot/gaim/gaim
In directory sc8-pr-cvs1:/tmp/cvs-serv14774

Modified Files:
	ChangeLog 
Log Message:
translation update thanks


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.624
retrieving revision 1.625
diff -u -d -r1.624 -r1.625
--- ChangeLog	26 Apr 2003 20:31:33 -0000	1.624
+++ ChangeLog	27 Apr 2003 22:45:09 -0000	1.625
@@ -7,6 +7,7 @@
 	* Debugging is core/ui split, and has a new API with support for
 	  debug levels and categories.
 	* Support for adding chats to your buddy list.
+	* Thanks to all the various people who submitted translation updates
 
 version 0.62 (04/23/2003):
 	* Keyboard shortcuts in the buddy list work again (Thanks Joe

Update of /cvsroot/gaim/gaim/po
In directory sc8-pr-cvs1:/tmp/cvs-serv14294/po

Modified Files:
	nl.po 
Log Message:
 Vincent van Adrighem updated the dutch translation


Index: nl.po
===================================================================
RCS file: /cvsroot/gaim/gaim/po/nl.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- nl.po	4 Apr 2003 22:20:37 -0000	1.20
+++ nl.po	27 Apr 2003 22:44:06 -0000	1.21
@@ -5,68 +5,79 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nl\n"
-"POT-Creation-Date: 2003-04-04 18:55+0200\n"
-"PO-Revision-Date: 2003-04-04 18:47+0200\n"
+"POT-Creation-Date: 2003-04-28 00:31+0200\n"
+"PO-Revision-Date: 2003-04-28 00:32+0100\n"
 "Last-Translator: Vincent van Adrighem <V.vanAdrighem@..."
 "Language-Team: Dutch <vertaling@..."
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
[...7888 lines suppressed...]
-#~ msgstr "Nieuwe gesprekken _negeren tijdens afwezigheid"
+#: src/plugin.c:228
+msgid "Gaim was unable to load your plugin."
+msgstr "Gaim kan de plugin niet laden."
 
-#~ msgid "Gaim - Sound Configuration"
-#~ msgstr "Gaim - Geluidsconfiguratie"
+#. * Custom away message.
+#: src/prpl.h:165
+msgid "Custom"
+msgstr "Aangepast"
 
-#~ msgid "Gaim - Preferences"
-#~ msgstr "Gaim - Voorkeuren"
+#: src/gtkdebug.c:71
+msgid "Debug Window"
+msgstr "Debugvenster"
 
-#~ msgid "Gaim - Debug Window"
-#~ msgstr "Gaim - Debugvenster"