[Gaim-commits] CVS: gaim/src gtkblist.c,1.428,1.429

[Etan R. <de...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25767/src

Modified Files:
	gtkblist.c 
Log Message:
This finally bothered me enough to fix. We were only rebuilding the Join a Chat
dialog entries when the protocol of the selected account changed. That
didn't work so well for jabber since jabber uses different nickname/server
values based on which server you choose.

I considered testing for jabber specifically instead of always but that seemed
uglier and this really won't hurt us much.


Index: gtkblist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -d -p -r1.428 -r1.429
--- gtkblist.c	21 Mar 2006 04:32:44 -0000	1.428
+++ gtkblist.c	24 Mar 2006 16:04:59 -0000	1.429
@@ -613,18 +613,10 @@ rebuild_joinchat_entries(GaimGtkJoinChat
 
 static void
 joinchat_select_account_cb(GObject *w, GaimAccount *account,
-						   GaimGtkJoinChatData *data)
+                           GaimGtkJoinChatData *data)
 {
-	if (strcmp(gaim_account_get_protocol_id(data->account),
-		gaim_account_get_protocol_id(account)) == 0)
-	{
-		data->account = account;
-	}
-	else
-	{
-		data->account = account;
-		rebuild_joinchat_entries(data);
-	}
+    data->account = account;
+    rebuild_joinchat_entries(data);
 }
 
 static gboolean