Pidgin

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

Modified Files:
	gtkprefs.c 
Log Message:
Apparently some people think that "away and idle" means "away or idle."
This will fix that.


Index: gtkprefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkprefs.c,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -d -p -r1.250 -r1.251
--- gtkprefs.c	16 Feb 2005 21:07:03 -0000	1.250
+++ gtkprefs.c	3 Mar 2005 01:33:00 -0000	1.251
@@ -1699,7 +1699,7 @@ GtkWidget *away_page() {
 		GAIM_PREF_STRING, "/core/away/auto_reply",
 		_("Never"), "never",
 		_("When away"), "away",
-		_("When away and idle"), "awayidle",
+		_("if (away && idle)"), "awayidle",
 		NULL);
 
 	vbox = gaim_gtk_make_frame (ret, _("Idle"));

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

Modified Files:
	gtkaccount.c gtkstatusbox.c gtkstatusbox.h 
Log Message:
Killed Napster. Some status changes. I may be making some status API changes
CVS : ----------------------------------------------------------------------


Index: gtkaccount.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkaccount.c,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -d -p -r1.170 -r1.171
--- gtkaccount.c	1 Mar 2005 21:15:54 -0000	1.170
+++ gtkaccount.c	2 Mar 2005 20:36:51 -0000	1.171
@@ -43,6 +43,7 @@
 #include "gtkblist.h"
 #include "gtkdialogs.h"
 #include "gtkutils.h"
+#include "gtkstatusbox.h"
 #include "gtkstock.h"
 
 enum
@@ -2038,6 +2039,14 @@ enabled_cb(GtkCellRendererToggle *render
 					   COLUMN_DATA, &account,
 					   COLUMN_ENABLED, &enabled,
 					   -1);
+	if (enabled) {
+		gaim_account_disconnect(account);
+	} else {
+		GaimGtkBuddyList *gtkblist = gaim_gtk_blist_get_default_gtk_blist();
+		const char *type = gtk_gaim_status_box_get_active_type(GTK_GAIM_STATUS_BOX(gtkblist->statusbox));
+		const char *message = gtk_gaim_status_box_get_message(GTK_GAIM_STATUS_BOX(gtkblist->statusbox));
+		gaim_account_set_status(account, type, TRUE, "message", message, NULL);
+	}
 
 	gaim_account_set_enabled(account, GAIM_GTK_UI, !enabled);
 

Index: gtkstatusbox.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkstatusbox.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- gtkstatusbox.c	27 Feb 2005 08:35:11 -0000	1.1
+++ gtkstatusbox.c	2 Mar 2005 20:36:51 -0000	1.2
@@ -473,3 +473,21 @@ static void imhtml_changed_cb(GtkTextBuf
 	box->typing = g_timeout_add(3000, (GSourceFunc)remove_typing_cb, box);
 	gtk_gaim_status_box_refresh(box);
 }
+
+const char *gtk_gaim_status_box_get_active_type(GtkGaimStatusBox *status_box)
+{
+	GtkTreeIter iter;
+	char *type;
+	gtk_combo_box_get_active_iter(GTK_COMBO_BOX(status_box), &iter);
+	gtk_tree_model_get(GTK_TREE_MODEL(status_box->dropdown_store), &iter, 
+			   TYPE_COLUMN, &type, -1);
+	return type;
+}
+
+const char *gtk_gaim_status_box_get_message(GtkGaimStatusBox *status_box)
+{
+	if (status_box->imhtml_visible)
+		return gtk_imhtml_get_markup(GTK_IMHTML(status_box->imhtml));
+	else
+		return NULL;
+}

Index: gtkstatusbox.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkstatusbox.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- gtkstatusbox.h	27 Feb 2005 08:35:11 -0000	1.1
+++ gtkstatusbox.h	2 Mar 2005 20:36:51 -0000	1.2
@@ -106,6 +106,11 @@ gtk_gaim_status_box_set_connecting(GtkGa
 void
 gtk_gaim_status_box_pulse_connecting(GtkGaimStatusBox *status_box);
 
+
+const char *gtk_gaim_status_box_get_active_type(GtkGaimStatusBox *status_box);
+
+const char *gtk_gaim_status_box_get_message(GtkGaimStatusBox *status_box);
+
 G_END_DECLS
 
 #endif /* __GTK_GAIM_GTK_STATUS_COMBO_BOX_H__ */

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

Modified Files:
	napster.c 
Log Message:
Killed Napster. Some status changes. I may be making some status API changes
CVS : ----------------------------------------------------------------------


Index: napster.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/napster/napster.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -p -r1.103 -r1.104
--- napster.c	21 Dec 2004 01:48:25 -0000	1.103
+++ napster.c	2 Mar 2005 20:36:52 -0000	1.104
@@ -656,7 +656,7 @@ static GaimPluginProtocolInfo prpl_info 
 static GaimPluginInfo info =
 {
 	GAIM_PLUGIN_MAGIC,
-	GAIM_MAJOR_VERSION,
+	0,
 	GAIM_MINOR_VERSION,
 	GAIM_PLUGIN_PROTOCOL,                             /**< type           */
 	NULL,                                             /**< ui_requirement */

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

Modified Files:
	libgg.c 
Log Message:
This should fix Fedora bug #149984, thanks to a helpful reporter who
valgrinded for us.


Index: libgg.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/gg/libgg.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -p -r1.23 -r1.24
--- libgg.c	16 Dec 2004 03:50:54 -0000	1.23
+++ libgg.c	2 Mar 2005 11:54:08 -0000	1.24
@@ -1055,7 +1055,7 @@ static int gg_watch_fd_connected(struct 
 
 		if (h->length >= sizeof(*s)) {
 			e->type = GG_EVENT_STATUS;
-			memcpy(&e->event.status, p, h->length);
+			memcpy(&e->event.status, p, sizeof(*s));
 			e->event.status.uin = fix32(e->event.status.uin);
 			e->event.status.status = fix32(e->event.status.status);
 		}

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

Modified Files:
      Tag: oldstatus
	libgg.c 
Log Message:
This should fix Red Hat bug #149984, thanks to a helpful reporter who
valgrinded for us.


Index: libgg.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/gg/libgg.c,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -u -d -p -r1.21 -r1.21.2.1
--- libgg.c	25 Aug 2004 03:09:08 -0000	1.21
+++ libgg.c	2 Mar 2005 11:53:57 -0000	1.21.2.1
@@ -1055,7 +1055,7 @@ static int gg_watch_fd_connected(struct 
 
 		if (h->length >= sizeof(*s)) {
 			e->type = GG_EVENT_STATUS;
-			memcpy(&e->event.status, p, h->length);
+			memcpy(&e->event.status, p, sizeof(*s));
 			e->event.status.uin = fix32(e->event.status.uin);
 			e->event.status.status = fix32(e->event.status.status);
 		}

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

Modified Files:
      Tag: oldstatus
	irc.h msgs.c 
Log Message:
Warning cleanup from grim

Index: irc.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.h,v
retrieving revision 1.14.2.4
retrieving revision 1.14.2.5
diff -u -d -p -r1.14.2.4 -r1.14.2.5
--- irc.h	1 Mar 2005 04:00:58 -0000	1.14.2.4
+++ irc.h	2 Mar 2005 04:54:33 -0000	1.14.2.5
@@ -99,7 +99,7 @@ void irc_msg_default(struct irc_conn *ir
 void irc_msg_away(struct irc_conn *irc, const char *name, const char *from, char **args);
 void irc_msg_badmode(struct irc_conn *irc, const char *name, const char *from, char **args);
 void irc_msg_badnick(struct irc_conn *irc, const char *name, const char *from, char **args);
-void irc_msg_banfull(struct irc_conn *irc, const char *name, const char *from, const char **args);
+void irc_msg_banfull(struct irc_conn *irc, const char *name, const char *from, char **args);
 void irc_msg_banned(struct irc_conn *irc, const char *name, const char *from, char **args);
 void irc_msg_chanmode(struct irc_conn *irc, const char *name, const char *from, char **args);
 void irc_msg_endwhois(struct irc_conn *irc, const char *name, const char *from, char **args);

Index: msgs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/msgs.c,v
retrieving revision 1.39.2.7
retrieving revision 1.39.2.8
diff -u -d -p -r1.39.2.7 -r1.39.2.8
--- msgs.c	1 Mar 2005 04:00:58 -0000	1.39.2.7
+++ msgs.c	2 Mar 2005 04:54:34 -0000	1.39.2.8
@@ -110,7 +110,7 @@ void irc_msg_banned(struct irc_conn *irc
 	g_free(buf);
 }
 
-void irc_msg_banfull(struct irc_conn *irc, const char *name, const char *from, const char **args)
+void irc_msg_banfull(struct irc_conn *irc, const char *name, const char *from, char **args)
 {
 	GaimConversation *convo;
 	char *buf, *nick;

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

Modified Files:
	yahoochat.c 
Log Message:
These got committed to oldstatus, but not to HEAD

Index: yahoochat.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoochat.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -p -r1.29 -r1.30
--- yahoochat.c	5 Feb 2005 18:24:50 -0000	1.29
+++ yahoochat.c	2 Mar 2005 04:36:19 -0000	1.30
@@ -1391,7 +1391,7 @@ void yahoo_roomlist_cancel(GaimRoomlist 
 
 	for (; l; l = l->next) {
 		yahoo_roomlist_destroy(l->data);
-		gaim_roomlist_unref(l->data);
+		gaim_roomlist_unref(list);
 	}
 	g_list_free(k);
 }
@@ -1431,6 +1431,7 @@ void yahoo_roomlist_expand_category(Gaim
 	{
 		gaim_notify_error(gaim_account_get_connection(list->account),
 		                  NULL, _("Connection problem"), _("Unable to fetch room list."));
+		gaim_roomlist_ref(list);
 		yahoo_roomlist_cleanup(list, yrl);
 		return;
 	}

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

Modified Files:
	notification.c 
Log Message:
These got committed to oldstatus, but not to HEAD

Index: notification.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/notification.c,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -d -p -r1.140 -r1.141
--- notification.c	23 Feb 2005 03:52:55 -0000	1.140
+++ notification.c	2 Mar 2005 04:36:18 -0000	1.141
@@ -972,9 +972,10 @@ url_cmd(MsnCmdProc *cmdproc, MsnCommand 
 			g_free(session->passport_info.file);
 			session->passport_info.file = NULL;
 		}
+#ifdef _WIN32
 		else
 		{
-			/* 
+			/*
 			 * Renaming file with .html extension, so that the
 			 * win32 open_url will work.
 			 */
@@ -989,11 +990,12 @@ url_cmd(MsnCmdProc *cmdproc, MsnCommand 
 				{
 					g_free(session->passport_info.file);
 					session->passport_info.file = tmp;
-				} 
+				}
 				else
 					g_free(tmp);
 			}
 		}
+#endif
 	}
 }
 /**************************************************************************

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

Modified Files:
	irc.c 
Log Message:
Made IRC, Jabber, MSN, and ICQ not crash on login. Note that these don't
necessarily work the way they should yet, they just don't crash.


Index: irc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.c,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -d -p -r1.250 -r1.251
--- irc.c	22 Feb 2005 16:54:56 -0000	1.250
+++ irc.c	1 Mar 2005 21:15:55 -0000	1.251
@@ -434,19 +434,24 @@ static void irc_get_info(GaimConnection 
 static void irc_set_status(GaimAccount *account, GaimStatus *status)
 {
 	GaimConnection *gc = gaim_account_get_connection(account);
-	struct irc_conn *irc = gc->proto_data;
+	struct irc_conn *irc;
 	const char *args[1];
 	const char *status_id = gaim_status_get_id(status);
 
+	if (gc)
+	  irc = gc->proto_data;
+
 	if (!gaim_status_is_active(status))
 		return;
 
 	args[0] = NULL;
 
-	if (!strcmp(status_id, "away"))
+	if (strcmp(status_id, "offline") && !gc) {
+		gaim_account_connect(account, status);
+	} else if (!strcmp(status_id, "away")) {
 		args[0] = gaim_status_get_attr_string(status, "message");
-
-	irc_cmd_away(irc, "away", NULL, args);
+		irc_cmd_away(irc, "away", NULL, args);
+	}
 }
 
 static void irc_add_buddy(GaimConnection *gc, GaimBuddy *buddy, GaimGroup *group)

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

Modified Files:
	account.c gtkaccount.c 
Log Message:
Made IRC, Jabber, MSN, and ICQ not crash on login. Note that these don't
necessarily work the way they should yet, they just don't crash.


Index: account.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/account.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -p -r1.125 -r1.126
--- account.c	8 Jan 2005 21:10:16 -0000	1.125
+++ account.c	1 Mar 2005 21:15:54 -0000	1.126
@@ -584,7 +584,7 @@ gaim_account_new(const char *username, c
 	account->ui_settings = g_hash_table_new_full(g_str_hash, g_str_equal,
 				g_free, (GDestroyNotify)g_hash_table_destroy);
 	account->system_log = NULL;
-
+	
 	account->presence = gaim_presence_new_for_account(account);
 
 	prpl = gaim_find_prpl(protocol_id);

Index: gtkaccount.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkaccount.c,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -d -p -r1.169 -r1.170
--- gtkaccount.c	26 Feb 2005 19:20:27 -0000	1.169
+++ gtkaccount.c	1 Mar 2005 21:15:54 -0000	1.170
@@ -1353,6 +1353,8 @@ ok_account_prefs_cb(GtkWidget *w, Accoun
 		screenname = gtk_entry_get_text(GTK_ENTRY(dialog->screenname_entry));
 
 		dialog->account = gaim_account_new(screenname, dialog->protocol_id);
+		gaim_account_set_enabled(dialog->account, GAIM_GTK_UI, TRUE);
+			
 	}
 	else
 	{

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

Modified Files:
	presence.c 
Log Message:
Made IRC, Jabber, MSN, and ICQ not crash on login. Note that these don't
necessarily work the way they should yet, they just don't crash.


Index: presence.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/presence.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -p -r1.66 -r1.67
--- presence.c	30 Jan 2005 17:19:57 -0000	1.66
+++ presence.c	1 Mar 2005 21:15:56 -0000	1.67
@@ -102,10 +102,13 @@ void jabber_presence_send(GaimAccount *a
 
 	if(!account) return ;
 	gc = account->gc;
-
-	if(!gc) return ;
+	
+	if (!gc && strcmp(gaim_status_get_id(status), "offline"))
+		gaim_account_connect(account, status);
+	
+	if(!gc) return;
 	js= gc->proto_data;
-
+	
 	gaim_status_to_jabber(status, &state, &msg, &priority);
 
 	if(msg)

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

Modified Files:
	oscar.c 
Log Message:
Made IRC, Jabber, MSN, and ICQ not crash on login. Note that these don't
necessarily work the way they should yet, they just don't crash.


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.730
retrieving revision 1.731
diff -u -d -p -r1.730 -r1.731
--- oscar.c	24 Feb 2005 01:11:17 -0000	1.730
+++ oscar.c	1 Mar 2005 21:15:58 -0000	1.731
@@ -5802,9 +5802,14 @@ static void
 oscar_set_status_icq(GaimAccount *account, GaimStatus *status)
 {
 	GaimConnection *gc = gaim_account_get_connection(account);
-	OscarData *od = (OscarData *)gc->proto_data;
+	OscarData *od = NULL;
 	const gchar *status_id = gaim_status_get_id(status);
 
+	if (gc)
+		od = (OscarData *)gc->proto_data;
+	if (!od)
+		return;
+
 	if (gaim_status_type_get_primitive(gaim_status_get_type(status)) == GAIM_STATUS_HIDDEN)
 		account->perm_deny = 4;
 	else

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

Modified Files:
	msn.c 
Log Message:
Made IRC, Jabber, MSN, and ICQ not crash on login. Note that these don't
necessarily work the way they should yet, they just don't crash.


Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -d -p -r1.352 -r1.353
--- msn.c	22 Feb 2005 15:16:37 -0000	1.352
+++ msn.c	1 Mar 2005 21:15:56 -0000	1.353
@@ -823,14 +823,17 @@ msn_set_status(GaimAccount *account, Gai
 
 	gc = gaim_account_get_connection(account);
 
-	if (gc == NULL)
-		return;
-
-	session = gc->proto_data;
+	if (gc) 
+		session = gc->proto_data;
 
 	state = gaim_status_get_id(status);
 
-	if (!strcmp(state, "away"))
+	printf("%d %s\n", gc, state);
+	if (strcmp(state, "offline") && !gc) {
+		gaim_account_connect(account, status);
+		return;
+	}
+	else if (!strcmp(state, "away"))
 		msnstatus = MSN_AWAY;
 	else if (!strcmp(state, "brb"))
 		msnstatus = MSN_BRB;
@@ -846,8 +849,8 @@ msn_set_status(GaimAccount *account, Gai
 		msnstatus = MSN_IDLE;
 	else
 		msnstatus = MSN_ONLINE;
-
-	msn_change_status(session, msnstatus);
+	if (gc)
+		msn_change_status(session, msnstatus);
 }
 
 static void

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

Modified Files:
      Tag: oldstatus
	iq.c 
Log Message:
apparently the timezone can be non-ascii characters too


Index: iq.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/iq.c,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -u -d -p -r1.21.2.1 -r1.21.2.2
--- iq.c	1 Mar 2005 07:02:36 -0000	1.21.2.1
+++ iq.c	1 Mar 2005 07:20:49 -0000	1.21.2.2
@@ -190,8 +190,12 @@ static void jabber_iq_time_parse(JabberS
 
 		strftime(buf, sizeof(buf), "%Y%m%dT%T", now);
 		xmlnode_insert_data(xmlnode_new_child(query, "utc"), buf, -1);
+
 		strftime(buf, sizeof(buf), "%Z", now);
-		xmlnode_insert_data(xmlnode_new_child(query, "tz"), buf, -1);
+		if((utf8 = gaim_utf8_try_convert(buf))) {
+			xmlnode_insert_data(xmlnode_new_child(query, "tz"), utf8, -1);
+			g_free(utf8);
+		}
 
 		strftime(buf, sizeof(buf), "%d %b %Y %T", now);
 		if((utf8 = gaim_utf8_try_convert(buf))) {

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

Modified Files:
      Tag: oldstatus
	si.c 
Log Message:
this may fix the reported jabber ft crash, but I'm not in a position to test it


Index: si.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/si.c,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -d -p -r1.10.2.1 -r1.10.2.2
--- si.c	2 Oct 2004 00:11:56 -0000	1.10.2.1
+++ si.c	1 Mar 2005 07:15:49 -0000	1.10.2.2
@@ -74,7 +74,7 @@ jabber_si_xfer_find(JabberStream *js, co
 	for(xfers = js->file_transfers; xfers; xfers = xfers->next) {
 		GaimXfer *xfer = xfers->data;
 		JabberSIXfer *jsx = xfer->data;
-		if(jsx->stream_id && xfer->who &&
+		if(jsx && jsx->stream_id && xfer->who &&
 				!strcmp(jsx->stream_id, sid) && !strcmp(xfer->who, from))
 			return xfer;
 	}

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

Modified Files:
      Tag: oldstatus
	iq.c message.c 
Log Message:
this should fix jabber ignoring formatting, and hopefully fix the iq:time brokenness.  If someone could test the latter, that'd be most appreciated


Index: iq.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/iq.c,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -u -d -p -r1.21 -r1.21.2.1
--- iq.c	8 Aug 2004 16:56:34 -0000	1.21
+++ iq.c	1 Mar 2005 07:02:36 -0000	1.21.2.1
@@ -21,6 +21,7 @@
 #include "internal.h"
 #include "debug.h"
 #include "prefs.h"
+#include "util.h"
 
 #include "buddy.h"
 #include "disco.h"
@@ -179,6 +180,7 @@ static void jabber_iq_time_parse(JabberS
 	id = xmlnode_get_attrib(packet, "id");
 
 	if(type && !strcmp(type, "get")) {
+		char *utf8;
 
 		iq = jabber_iq_new_query(js, JABBER_IQ_RESULT, "jabber:iq:time");
 		jabber_iq_set_id(iq, id);
@@ -190,8 +192,12 @@ static void jabber_iq_time_parse(JabberS
 		xmlnode_insert_data(xmlnode_new_child(query, "utc"), buf, -1);
 		strftime(buf, sizeof(buf), "%Z", now);
 		xmlnode_insert_data(xmlnode_new_child(query, "tz"), buf, -1);
+
 		strftime(buf, sizeof(buf), "%d %b %Y %T", now);
-		xmlnode_insert_data(xmlnode_new_child(query, "display"), buf, -1);
+		if((utf8 = gaim_utf8_try_convert(buf))) {
+			xmlnode_insert_data(xmlnode_new_child(query, "display"), utf8, -1);
+			g_free(utf8);
+		}
 
 		jabber_iq_send(iq);
 	}

Index: message.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/message.c,v
retrieving revision 1.39.2.1
retrieving revision 1.39.2.2
diff -u -d -p -r1.39.2.1 -r1.39.2.2
--- message.c	9 Feb 2005 14:58:22 -0000	1.39.2.1
+++ message.c	1 Mar 2005 07:02:36 -0000	1.39.2.2
@@ -286,7 +286,7 @@ void jabber_message_parse(JabberStream *
 			if(!jm->body)
 				jm->body = xmlnode_to_str(child, NULL);
 		} else if(!strcmp(child->name, "html")) {
-			if(!jm->xhtml && child->data_sz > 0)
+			if(!jm->xhtml && xmlnode_get_child(child, "body"))
 				jm->xhtml = xmlnode_to_str(child, NULL);
 		} else if(!strcmp(child->name, "error")) {
 			const char *code = xmlnode_get_attrib(child, "code");

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

Modified Files:
      Tag: oldstatus
	irc.h msgs.c parse.c 
Log Message:
478: ban list full

Index: irc.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.h,v
retrieving revision 1.14.2.3
retrieving revision 1.14.2.4
diff -u -d -p -r1.14.2.3 -r1.14.2.4
--- irc.h	23 Feb 2005 04:42:11 -0000	1.14.2.3
+++ irc.h	1 Mar 2005 04:00:58 -0000	1.14.2.4
@@ -99,6 +99,7 @@ void irc_msg_default(struct irc_conn *ir
 void irc_msg_away(struct irc_conn *irc, const char *name, const char *from, char **args);
 void irc_msg_badmode(struct irc_conn *irc, const char *name, const char *from, char **args);
 void irc_msg_badnick(struct irc_conn *irc, const char *name, const char *from, char **args);
+void irc_msg_banfull(struct irc_conn *irc, const char *name, const char *from, const char **args);
 void irc_msg_banned(struct irc_conn *irc, const char *name, const char *from, char **args);
 void irc_msg_chanmode(struct irc_conn *irc, const char *name, const char *from, char **args);
 void irc_msg_endwhois(struct irc_conn *irc, const char *name, const char *from, char **args);

Index: msgs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/msgs.c,v
retrieving revision 1.39.2.6
retrieving revision 1.39.2.7
diff -u -d -p -r1.39.2.6 -r1.39.2.7
--- msgs.c	23 Feb 2005 04:42:11 -0000	1.39.2.6
+++ msgs.c	1 Mar 2005 04:00:58 -0000	1.39.2.7
@@ -110,6 +110,27 @@ void irc_msg_banned(struct irc_conn *irc
 	g_free(buf);
 }
 
+void irc_msg_banfull(struct irc_conn *irc, const char *name, const char *from, const char **args)
+{
+	GaimConversation *convo;
+	char *buf, *nick;
+
+	if (!args || !args[0] || !args[1] || !args[2])
+		return;
+
+	convo = gaim_find_conversation_with_account(args[1], irc->account);
+	if (!convo)
+		return;
+
+	nick = g_markup_escape_text(args[2], -1);
+	buf = g_strdup_printf(_("Cannot ban %s: banlist is full"), nick);
+	g_free(nick);
+	gaim_conv_chat_write(GAIM_CONV_CHAT(convo), "", buf,
+			     GAIM_MESSAGE_SYSTEM|GAIM_MESSAGE_NO_LOG,
+			     time(NULL));
+	g_free(buf);
+}
+
 void irc_msg_chanmode(struct irc_conn *irc, const char *name, const char *from, char **args)
 {
 	GaimConversation *convo;

Index: parse.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/parse.c,v
retrieving revision 1.25.2.8
retrieving revision 1.25.2.9
diff -u -d -p -r1.25.2.8 -r1.25.2.9
--- parse.c	23 Feb 2005 04:42:11 -0000	1.25.2.8
+++ parse.c	1 Mar 2005 04:00:58 -0000	1.25.2.9
@@ -83,6 +83,7 @@ static struct _irc_msg {
 	{ "442", "nc:", irc_msg_notinchan },	/* Not in channel		*/
 	{ "473", "nc:", irc_msg_inviteonly },	/* Tried to join invite-only	*/
 	{ "474", "nc:", irc_msg_banned },	/* Banned from channel		*/
+	{ "478", "nct:", irc_msg_banfull },	/* Banlist is full		*/
 	{ "482", "nc:", irc_msg_notop },	/* Need to be op to do that	*/
 	{ "501", "n:", irc_msg_badmode },	/* Unknown mode flag		*/
 	{ "506", "nc:", irc_msg_nosend },	/* Must identify to send	*/

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

Modified Files:
	gtklog.c log.c 
Log Message:
Thanks to Richard Laager, our log files will be considerably shorter and
we'll be able to see the correct smileys, regardless of log type.


Index: gtklog.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtklog.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -p -r1.26 -r1.27
--- gtklog.c	24 Feb 2005 01:11:16 -0000	1.26
+++ gtklog.c	28 Feb 2005 18:18:21 -0000	1.27
@@ -191,6 +191,8 @@ static void log_select_cb(GtkTreeSelecti
 	title = title_utf8;
 	gtk_window_set_title(GTK_WINDOW(viewer->window), title);
 	gtk_imhtml_clear(GTK_IMHTML(viewer->imhtml));
+	gtk_imhtml_set_protocol_name(GTK_IMHTML(viewer->imhtml),
+	                            gaim_account_get_protocol_name(log->account));
 	gtk_imhtml_append_text(GTK_IMHTML(viewer->imhtml), read,
 			       GTK_IMHTML_NO_COMMENTS | GTK_IMHTML_NO_TITLE | GTK_IMHTML_NO_SCROLL |
 			       ((flags & GAIM_LOG_READ_NO_NEWLINE) ? GTK_IMHTML_NO_NEWLINE : 0));

Index: log.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/log.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -p -r1.109 -r1.110
--- log.c	11 Feb 2005 05:10:25 -0000	1.109
+++ log.c	28 Feb 2005 18:18:22 -0000	1.110
@@ -562,7 +562,6 @@ static void html_logger_write(GaimLog *l
 	char *msg_fixed;
 	char date[64];
 	GaimPlugin *plugin = gaim_find_prpl(gaim_account_get_protocol_id(log->account));
-	const char *prpl_name = plugin->info->name;
 	struct generic_logger_data *data = log->logger_data;
 
 	if(!data) {
@@ -610,18 +609,18 @@ static void html_logger_write(GaimLog *l
 				fprintf(data->file, _("<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"), date, from, msg_fixed);
 		} else if (type & GAIM_MESSAGE_RECV) {
 			if(gaim_message_meify(msg_fixed, -1))
-				fprintf(data->file, "<font color=\"#6C2585\"><font size=\"2\">(%s)</font> <b>***%s</b></font> <font sml=\"%s\">%s</font><br/>\n",
-						date, from, prpl_name, msg_fixed);
+				fprintf(data->file, "<font color=\"#6C2585\"><font size=\"2\">(%s)</font> <b>***%s</b></font> %s<br/>\n",
+						date, from, msg_fixed);
 			else
-				fprintf(data->file, "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s:</b></font> <font sml=\"%s\">%s</font><br/>\n",
-						date, from, prpl_name, msg_fixed);
+				fprintf(data->file, "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s:</b></font> %s<br/>\n",
+						date, from, msg_fixed);
 		} else if (type & GAIM_MESSAGE_SEND) {
 			if(gaim_message_meify(msg_fixed, -1))
-				fprintf(data->file, "<font color=\"#6C2585\"><font size=\"2\">(%s)</font> <b>***%s</b></font> <font sml=\"%s\">%s</font><br/>\n",
-						date, from, prpl_name, msg_fixed);
+				fprintf(data->file, "<font color=\"#6C2585\"><font size=\"2\">(%s)</font> <b>***%s</b></font> %s<br/>\n",
+						date, from, msg_fixed);
 			else
-				fprintf(data->file, "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s:</b></font> <font sml=\"%s\">%s</font><br/>\n",
-						date, from, prpl_name, msg_fixed);
+				fprintf(data->file, "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s:</b></font> %s<br/>\n",
+						date, from, msg_fixed);
 		}
 	}

Update of /cvsroot/gaim/web/htdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28331

Modified Files:
	contactinfo.php 
Log Message:
Hmm, do I do anything else?


Index: contactinfo.php
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/contactinfo.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -p -r1.37 -r1.38
--- contactinfo.php	25 Feb 2005 21:04:04 -0000	1.37
+++ contactinfo.php	28 Feb 2005 00:51:16 -0000	1.38
@@ -84,6 +84,13 @@
 </dd>
 
 <dt>
+  Timothy Ringenbach - &lt;<a href="mailto:marv_sf@...;
+</dt> <dd>
+  <b>Jabber:</b> TimRingenbach@... />
+  <i>Yahoo!, ImHTML, <a href="http://gaim-vv.sf.net">Gaim-vv</a>, <a href="http://autopackage.org">autopackage</a> builder</i>
+</dd>
+
+<dt>
   Stu Tomlinson
 </dt>
 <dd>

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

Modified Files:
	POTFILES.in 
Log Message:
Ka-ching


Index: POTFILES.in
===================================================================
RCS file: /cvsroot/gaim/gaim/po/POTFILES.in,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -p -r1.91 -r1.92
--- POTFILES.in	10 Feb 2005 15:47:32 -0000	1.91
+++ POTFILES.in	27 Feb 2005 20:47:00 -0000	1.92
@@ -62,6 +62,7 @@ src/gtkrequest.c
 src/gtkroomlist.c
 src/gtksavedstatuses.c
 src/gtksound.c
+src/gtkstatusbox.c
 src/gtkstatusselector.c
 src/gtkstock.c
 src/gtkutils.c

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

Modified Files:
	Makefile.mingw 
Log Message:
Ka-ching


Index: Makefile.mingw
===================================================================
RCS file: /cvsroot/gaim/gaim/src/Makefile.mingw,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -p -r1.78 -r1.79
--- Makefile.mingw	11 Feb 2005 05:10:21 -0000	1.78
+++ Makefile.mingw	27 Feb 2005 20:46:59 -0000	1.79
@@ -114,6 +114,7 @@ DLL_C_SRC =	\
 			gtksavedstatuses.c \
 			gtksound.c \
 			gtksourceiter.c \
+			gtkstatusbox.c \
 			gtkstatusselector.c \
 			gtkstock.c \
 			gtkthemes.c \

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

Modified Files:
	auth.c 
Log Message:
Ka-ching


Index: auth.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/auth.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -p -r1.24 -r1.25
--- auth.c	3 Jan 2005 05:08:03 -0000	1.24
+++ auth.c	27 Feb 2005 20:46:59 -0000	1.25
@@ -476,12 +476,10 @@ faim_export int aim_request_login(aim_se
 
 	aim_tlvlist_add_raw(&tl, 0x0001, strlen(sn), sn);
 
-	/*
-	 * These are sent in logins for recent WinAIM clients.  Maybe tells
-	 * the server we're able to handle SecurID requests?  That's a complete
-	 * guess.
-	 */
+	/* Tell the server we support SecurID logins. */
 	aim_tlvlist_add_noval(&tl, 0x004b);
+
+	/* Unknown.  Sent in recent WinAIM clients.*/
 	aim_tlvlist_add_noval(&tl, 0x005a);
 
 	aim_tlvlist_write(&fr->data, &tl);

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

Modified Files:
      Tag: oldstatus
	gtkdialogs.c 
Log Message:
This certainly wasn't right.



Index: gtkdialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkdialogs.c,v
retrieving revision 1.11.2.32
retrieving revision 1.11.2.33
diff -u -d -p -r1.11.2.32 -r1.11.2.33
--- gtkdialogs.c	27 Feb 2005 02:13:29 -0000	1.11.2.32
+++ gtkdialogs.c	27 Feb 2005 12:55:19 -0000	1.11.2.33
@@ -244,13 +244,13 @@ void gaim_gtkdialogs_about(GtkWidget *w,
 	g_string_append(str, "<FONT SIZE=\"4\">URL:</FONT> <A HREF=\""
 					GAIM_WEBSITE "\">" GAIM_WEBSITE "</A><BR/><BR/>");
 
-	g_string_append_printf(str, _("<FONT SIZE=\"4\">IRC:</FONT> "
 #ifdef _WIN32
-						   "#wingaim"
+	g_string_append_printf(str, _("<FONT SIZE=\"4\">IRC:</FONT> "
+						   "#wingaim on irc.freenode.net<BR><BR>"));
 #else
-						   "#gaim"
+	g_string_append_printf(str, _("<FONT SIZE=\"4\">IRC:</FONT> "
+						   "#gaim on irc.freenode.net<BR><BR>"));
 #endif
-						   " on irc.freenode.net<BR><BR>"));
 
 	/* Active Developers */
 	g_string_append_printf(str, "<FONT SIZE=\"4\">%s:</FONT><BR/>",

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

Modified Files:
      Tag: oldstatus
	yahoo_filexfer.c 
Log Message:
GtkGaimStatusBox, a new status selection widget.

It currently sucks. Pretty much just the UI code with enough copy/paste
code hacked in from gtkstatusselector to minimally work.

Minimally work provided you're only using protocol which have already been
updated to handle offline/online as statuses. Which I think is limited to
AIM and Yahoo! right now. Anyway, it's cool.


Index: yahoo_filexfer.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo_filexfer.c,v
retrieving revision 1.13.2.7
retrieving revision 1.13.2.8
diff -u -d -p -r1.13.2.7 -r1.13.2.8
--- yahoo_filexfer.c	6 Feb 2005 17:40:26 -0000	1.13.2.7
+++ yahoo_filexfer.c	27 Feb 2005 08:34:53 -0000	1.13.2.8
@@ -125,7 +125,7 @@ static void yahoo_sendfile_connected(gpo
 	yahoo_packet_hash(pkt, 5, xfer->who);
 	yahoo_packet_hash(pkt, 14, "");
 	filename = g_path_get_basename(gaim_xfer_get_local_filename(xfer));
-	yahoo_packet_hash(pkt, 27, filename);
+	yahoo_packet_hash(pkt, 27, gaim_url_encode(filename));
 	yahoo_packet_hash(pkt, 28, size);
 
 	content_length = YAHOO_PACKET_HDRLEN + yahoo_packet_length(pkt);

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

Modified Files:
	Makefile.am gtkblist.c gtkblist.h gtkconn.c gtkstock.c 
	gtkstock.h 
Added Files:
	gtkstatusbox.c gtkstatusbox.h 
Log Message:
GtkGaimStatusBox, a new status selection widget.

It currently sucks. Pretty much just the UI code with enough copy/paste
code hacked in from gtkstatusselector to minimally work.

Minimally work provided you're only using protocol which have already been
updated to handle offline/online as statuses. Which I think is limited to
AIM and Yahoo! right now. Anyway, it's cool.


--- NEW FILE: gtkstatusbox.c ---
/*
 * @file gtkstatusbox.c GTK+ Status Selection Widget
 * @ingroup gtkui
 *
 * gaim
 *
 * Gaim is the legal property of its developers, whose names are too numerous
 * to list here.  Please refer to the COPYRIGHT file distributed with this
 * source distribution.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

#include "internal.h"
#include "account.h"
#include "status.h"
#include "gtkgaim.h"
#include "gtkstock.h"
#include "gtkstatusbox.h"

static void imhtml_changed_cb(GtkTextBuffer *buffer, void *data);

static void gtk_gaim_status_box_changed(GtkComboBox *box);
static void gtk_gaim_status_box_size_request (GtkWidget *widget, GtkRequisition *requisition);
static void gtk_gaim_status_box_size_allocate (GtkWidget *widget, GtkAllocation *allocation);
static gboolean gtk_gaim_status_box_expose_event (GtkWidget *widget, GdkEventExpose *event);
static void gtk_gaim_status_box_forall (GtkContainer *container, gboolean include_internals, GtkCallback callback, gpointer callback_data);

static void (*combo_box_size_request)(GtkWidget *widget, GtkRequisition *requisition);
static void (*combo_box_size_allocate)(GtkWidget *widget, GtkAllocation *allocation);
static gboolean (*combo_box_expose_event)(GtkWidget *widget, GdkEventExpose *event);
static void (*combo_box_forall) (GtkContainer *container, gboolean include_internals, GtkCallback callback, gpointer callback_data);
enum {
	ICON_COLUMN,
	TEXT_COLUMN,
	TITLE_COLUMN,
	DESC_COLUMN,
	TYPE_COLUMN,
	NUM_COLUMNS
};

static void gtk_gaim_status_box_class_init (GtkGaimStatusBoxClass *klass);
static void gtk_gaim_status_box_init (GtkGaimStatusBox *status_box);

GType
gtk_gaim_status_box_get_type (void)
{
  static GType status_box_type = 0;

  if (!status_box_type)
    {
      static const GTypeInfo status_box_info =
        {
          sizeof (GtkGaimStatusBoxClass),
          NULL, /* base_init */
          NULL, /* base_finalize */
          (GClassInitFunc) gtk_gaim_status_box_class_init,
          NULL, /* class_finalize */
          NULL, /* class_data */
          sizeof (GtkGaimStatusBox),
          0,
          (GInstanceInitFunc) gtk_gaim_status_box_init
        };

      status_box_type = g_type_register_static (GTK_TYPE_COMBO_BOX,
                                               "GtkGaimStatusBox",
                                               &status_box_info,
                                               0);
   }

  return status_box_type;
}

static void
gtk_gaim_status_box_class_init (GtkGaimStatusBoxClass *klass)
{
  GObjectClass *object_class;
  GtkWidgetClass *widget_class;
  GtkComboBoxClass *parent_class = (GtkComboBoxClass*)klass;
  GtkContainerClass *container_class = (GtkContainerClass*)klass;
 
  parent_class->changed = gtk_gaim_status_box_changed;
  widget_class = (GtkWidgetClass*)klass;
  combo_box_size_request = widget_class->size_request;
  widget_class->size_request = gtk_gaim_status_box_size_request;
  combo_box_size_allocate = widget_class->size_allocate;
  widget_class->size_allocate = gtk_gaim_status_box_size_allocate;
  combo_box_expose_event = widget_class->expose_event;
  widget_class->expose_event = gtk_gaim_status_box_expose_event;

  combo_box_forall = container_class->forall;
  container_class->forall = gtk_gaim_status_box_forall;

  object_class = (GObjectClass *)klass;
}

static void
gtk_gaim_status_box_refresh(GtkGaimStatusBox *status_box)
{
	char *text;
	char aa_color[8];
	GdkPixbuf *pixbuf;

	GtkStyle *style = gtk_widget_get_style(GTK_WIDGET(status_box));
	snprintf(aa_color, sizeof(aa_color), "#%02x%02x%02x",
		 style->text_aa[GTK_STATE_NORMAL].red >> 8,
		 style->text_aa[GTK_STATE_NORMAL].green >> 8,
		 style->text_aa[GTK_STATE_NORMAL].blue >> 8);
	
	if (status_box->error) {
		text = g_strdup_printf("%s\n<span size=\"smaller\" weight=\"bold\" color=\"red\">%s</span>", 
				       status_box->title, status_box->error);
	} else if (status_box->typing) {
		text = 	text = g_strdup_printf("%s\n<span size=\"smaller\" color=\"%s\">%s</span>", 
					       status_box->title, 
					       aa_color,
					       _("Typing"));
	} else if (status_box->connecting) {
		text = g_strdup_printf("%s\n<span size=\"smaller\" color=\"%s\">%s</span>", 
				       status_box->title, 
				       aa_color,
				       _("Connecting"));
       	} else if (status_box->desc) {
		text = g_strdup_printf("%s\n<span size=\"smaller\" color=\"%s\">%s</span>", 
				       status_box->title, aa_color, status_box->desc);
	} else {
		text = g_strdup_printf("%s", status_box->title);
	}
		
	if (status_box->error) 
		pixbuf = status_box->error_pixbuf;
	else if (status_box->typing)
		pixbuf = status_box->typing_pixbufs[status_box->typing_index];
	else if (status_box->connecting)
		pixbuf = status_box->connecting_pixbufs[status_box->connecting_index];
	else
		pixbuf = status_box->pixbuf;

	gtk_list_store_set(status_box->store, &(status_box->iter),
			   ICON_COLUMN, pixbuf,
			   TEXT_COLUMN, text, 
			   TITLE_COLUMN, status_box->title,
			   DESC_COLUMN, status_box->desc, 
			   TYPE_COLUMN, NULL, -1);
	gtk_cell_view_set_displayed_row(GTK_CELL_VIEW(status_box->cell_view), gtk_tree_path_new_from_string("0"));

	g_free(text);
}

static void
gtk_gaim_status_box_init (GtkGaimStatusBox *status_box)
{
	GtkCellRenderer *text_rend = gtk_cell_renderer_text_new();
	GtkCellRenderer *icon_rend = gtk_cell_renderer_pixbuf_new();
	GtkTextBuffer *buffer;
	GdkPixbuf *pixbuf, *pixbuf2, *pixbuf3, *pixbuf4;
	GtkIconSize icon_size = gtk_icon_size_from_name(GAIM_ICON_SIZE_STATUS);

	status_box->imhtml_visible = FALSE;
	status_box->error_pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_OFFLINE,
							   icon_size, "GtkGaimStatusBox");
	status_box->connecting_index = 0;
	status_box->connecting_pixbufs[0] =  gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_CONNECT0,
								     icon_size, "GtkGaimStatusBox");
	status_box->connecting_pixbufs[1] =  gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_CONNECT1,
								     icon_size, "GtkGaimStatusBox");
	status_box->connecting_pixbufs[2] =  gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_CONNECT2,
								     icon_size, "GtkGaimStatusBox");
	status_box->connecting_pixbufs[3] =  gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_CONNECT3,
								     icon_size, "GtkGaimStatusBox");

	status_box->typing_index = 0;
	status_box->typing_pixbufs[0] =  gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_TYPING0,
								     icon_size, "GtkGaimStatusBox");
	status_box->typing_pixbufs[1] =  gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_TYPING1,
								     icon_size, "GtkGaimStatusBox");
	status_box->typing_pixbufs[2] =  gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_TYPING2,
								     icon_size, "GtkGaimStatusBox");
	status_box->typing_pixbufs[3] =  gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_TYPING3,
								     icon_size, "GtkGaimStatusBox");
	status_box->connecting = FALSE;
	status_box->typing = FALSE;
	status_box->title = NULL;
	status_box->pixbuf = NULL;	
	status_box->cell_view = gtk_cell_view_new();
	gtk_widget_show (status_box->cell_view);
	
	status_box->store = gtk_list_store_new(NUM_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
	status_box->dropdown_store = gtk_list_store_new(NUM_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
	gtk_combo_box_set_model(GTK_COMBO_BOX(status_box), GTK_TREE_MODEL(status_box->dropdown_store));
	gtk_cell_view_set_model(GTK_CELL_VIEW(status_box->cell_view), GTK_TREE_MODEL(status_box->store));
	gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(status_box), 0);
	gtk_list_store_append(status_box->store, &(status_box->iter));
	gtk_gaim_status_box_refresh(status_box);
	gtk_cell_view_set_displayed_row(GTK_CELL_VIEW(status_box->cell_view), gtk_tree_path_new_from_string("0"));
	gtk_container_add(GTK_CONTAINER(status_box), status_box->cell_view);
	
	status_box->icon_rend = gtk_cell_renderer_pixbuf_new();
	status_box->text_rend = gtk_cell_renderer_text_new();

	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(status_box), icon_rend, FALSE);
	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(status_box), text_rend, TRUE); 
	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(status_box), icon_rend, "pixbuf", ICON_COLUMN, NULL);
	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(status_box), text_rend, "markup", TEXT_COLUMN, NULL);

	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(status_box->cell_view), status_box->icon_rend, FALSE);
	gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(status_box->cell_view), status_box->text_rend, TRUE); 
	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(status_box->cell_view), status_box->icon_rend, "pixbuf", ICON_COLUMN, NULL);
	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(status_box->cell_view), status_box->text_rend, "markup", TEXT_COLUMN, NULL);

	status_box->vbox = gtk_vbox_new(0, FALSE);
	status_box->imhtml = gtk_imhtml_new(NULL, NULL);
	buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(status_box->imhtml));
	g_signal_connect(G_OBJECT(buffer), "changed", G_CALLBACK(imhtml_changed_cb), status_box);
	gtk_imhtml_set_editable(GTK_IMHTML(status_box->imhtml), TRUE);
	gtk_widget_set_parent(status_box->vbox, GTK_WIDGET(status_box));
	status_box->sw = gtk_scrolled_window_new(NULL, NULL);
	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(status_box->sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(status_box->sw), GTK_SHADOW_IN);
	gtk_container_add(GTK_CONTAINER(status_box->sw), status_box->imhtml);
	gtk_box_pack_start(GTK_BOX(status_box->vbox), status_box->sw, TRUE, TRUE, 0);
	pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_ONLINE,
					 icon_size, "GtkGaimStatusBox");
	pixbuf2 = gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_AWAY,
					 icon_size, "GtkGaimStatusBox");
	pixbuf3 = gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_OFFLINE,
					 icon_size, "GtkGaimStatusBox");
	pixbuf4 = gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_INVISIBLE,
					 icon_size, "GtkGaimStatusBox");
	/* hacks */
	gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), pixbuf, _("Available"), NULL, "available");
	gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), pixbuf2, _("Away"), NULL, "away");
	gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), pixbuf4, _("Invisible"), NULL, "invisible");
	gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), pixbuf3, _("Offline"), NULL, "offline");
	gtk_combo_box_set_active(GTK_COMBO_BOX(status_box), 0);

}


static void
gtk_gaim_status_box_size_request (GtkWidget      *widget,
                            GtkRequisition *requisition)
{
	GtkRequisition box_req;
	combo_box_size_request(widget, requisition);
	
	gtk_widget_size_request(GTK_GAIM_STATUS_BOX(widget)->vbox, &box_req);
	if (box_req.height > 1)
		requisition->height = requisition->height + box_req.height + 6;
	
	requisition->width = 1;

}

static void
gtk_gaim_status_box_size_allocate (GtkWidget *widget,
			       GtkAllocation *allocation)
{
	GtkRequisition req = {0,0};
	GtkAllocation parent_alc = *allocation, box_alc = *allocation ;
	combo_box_size_request(widget, &req);
		
	/* EVIL XXX */
	box_alc.height =  80;//MAX(1,box_alc.height - req.height - 6);
	
	box_alc.y = box_alc.y + req.height + 6;
	gtk_widget_size_allocate((GTK_GAIM_STATUS_BOX(widget))->vbox, &box_alc);
	
	parent_alc.height = MAX(1,req.height);
	combo_box_size_allocate(widget, &parent_alc);
	widget->allocation = *allocation;
}


static gboolean
gtk_gaim_status_box_expose_event (GtkWidget      *widget,
			      GdkEventExpose *event)
{

  GtkGaimStatusBox *status_box = GTK_GAIM_STATUS_BOX (widget);
  combo_box_expose_event(widget, event);

	  gtk_container_propagate_expose (GTK_CONTAINER (widget),
					  status_box->vbox, event);
  return FALSE;
}

static void
gtk_gaim_status_box_forall (GtkContainer *container,
                      gboolean      include_internals,
                      GtkCallback   callback,
                      gpointer      callback_data)
{
  GtkGaimStatusBox *status_box = GTK_GAIM_STATUS_BOX (container);

  if (include_internals)
    {
	    (* callback) (status_box->vbox, callback_data);
    }

  combo_box_forall(container, include_internals, callback, callback_data);
}

GtkWidget *
gtk_gaim_status_box_new()
{
	return g_object_new(GTK_GAIM_TYPE_STATUS_BOX, NULL);
}


void
gtk_gaim_status_box_add(GtkGaimStatusBox *status_box, GdkPixbuf *pixbuf, const char *text, const char *sec_text, char *edit)
{
	GtkTreeIter iter;
	char *t;
	
	if (sec_text) {
		char aa_color[8];
		GtkStyle *style = gtk_widget_get_style(GTK_WIDGET(status_box));
		snprintf(aa_color, sizeof(aa_color), "#%02x%02x%02x",
			 style->text_aa[GTK_STATE_NORMAL].red >> 8,
			 style->text_aa[GTK_STATE_NORMAL].green >> 8,
			 style->text_aa[GTK_STATE_NORMAL].blue >> 8);	
		t = g_strdup_printf("%s\n<span color=\"%s\">%s</span>", text, aa_color, sec_text);
	} else {
		t = g_strdup(text);
	}
	
	gtk_list_store_append(status_box->dropdown_store, &iter);
	gtk_list_store_set(status_box->dropdown_store, &iter,
			   ICON_COLUMN, pixbuf,
			   TEXT_COLUMN, t, 
			   TITLE_COLUMN, text,
			   DESC_COLUMN, sec_text, 
			   TYPE_COLUMN, edit, -1);
}

void
gtk_gaim_status_box_set_error(GtkGaimStatusBox *status_box, const gchar *error)
{
	status_box->error = g_strdup(error);
	gtk_gaim_status_box_refresh(status_box);
}

void
gtk_gaim_status_box_set_connecting(GtkGaimStatusBox *status_box, gboolean connecting)
{
	if (!status_box)
		return;
	status_box->connecting = connecting;
	gtk_gaim_status_box_refresh(status_box);
}

void
gtk_gaim_status_box_pulse_connecting(GtkGaimStatusBox *status_box)
{
	if (!status_box)
		return;
	if (status_box->connecting_index == 3)
		status_box->connecting_index = 0;
	else 
		status_box->connecting_index++;
	gtk_gaim_status_box_refresh(status_box);
}

void
gtk_gaim_status_box_pulse_typing(GtkGaimStatusBox *status_box)
{
	if (status_box->typing_index == 3)
		status_box->typing_index = 0;
	else 
		status_box->typing_index++;
	gtk_gaim_status_box_refresh(status_box);
}

static void remove_typing_cb(GtkGaimStatusBox *box)
{
	gchar *status_type_id;
	GList *l;
	GtkTreeIter iter;

	gtk_combo_box_get_active_iter(GTK_COMBO_BOX(box), &iter);
	gtk_tree_model_get(GTK_TREE_MODEL(box->dropdown_store), &iter, TYPE_COLUMN, &status_type_id, -1);
	for (l = gaim_accounts_get_all(); l != NULL; l = l->next) {
		GaimAccount *account = (GaimAccount*)l->data;
		GaimStatusType *status_type;
		
		if (!gaim_account_get_enabled(account, GAIM_GTK_UI))
			continue;

		status_type = gaim_account_get_status_type(account, status_type_id);

		if (status_type == NULL)
			continue;
		gaim_account_set_status(account, status_type_id, TRUE, 
					"message",gtk_imhtml_get_markup(GTK_IMHTML(box->imhtml)), NULL);
	}
	g_source_remove(box->typing);
	box->typing = 0;
	gtk_gaim_status_box_refresh(box);
}

static void gtk_gaim_status_box_changed(GtkComboBox *box)
{
	GtkGaimStatusBox *status_box = GTK_GAIM_STATUS_BOX(box);
	GtkTreeIter iter;
	char *text, *sec_text;
	GdkPixbuf *pixbuf;
	gchar *status_type_id;
	GList *l;

	gtk_combo_box_get_active_iter(GTK_COMBO_BOX(status_box), &iter);
	gtk_tree_model_get(GTK_TREE_MODEL(status_box->dropdown_store), &iter, TITLE_COLUMN, &text,
			   DESC_COLUMN, &sec_text, ICON_COLUMN, &pixbuf, 
			   TYPE_COLUMN, &status_type_id, -1);
	if (status_box->title)
		g_free(status_box->title);
	status_box->title = g_strdup(text);
	if (status_box->desc && sec_text)
 	  g_free(status_box->desc);
	status_box->desc = g_strdup(sec_text);
	if (status_box->pixbuf)
		g_object_unref(status_box->pixbuf);
	status_box->pixbuf = pixbuf;
	
	if (!strcmp(status_type_id, "away")) {
		gtk_widget_show_all(status_box->vbox);
		status_box->typing = g_timeout_add(3000, (GSourceFunc)remove_typing_cb, status_box);
		gtk_imhtml_clear(GTK_IMHTML(status_box->imhtml));
		gtk_widget_grab_focus(status_box->imhtml);
	} else {
		if (status_box->typing) {
			g_source_remove(status_box->typing);
			status_box->typing = 0;
		}
		gtk_widget_hide_all(status_box->vbox);
		for (l = gaim_accounts_get_all(); l != NULL; l = l->next) {
			GaimAccount *account = (GaimAccount*)l->data;
			GaimStatusType *status_type;

			if (!gaim_account_get_enabled(account, GAIM_GTK_UI))
				continue;

			status_type = gaim_account_get_status_type(account, status_type_id);

			if (status_type == NULL)
				continue;
			gaim_account_set_status(account, status_type_id, TRUE, NULL);
		}
	}
	gtk_gaim_status_box_refresh(status_box);
}

static void imhtml_changed_cb(GtkTextBuffer *buffer, void *data)
{
	GtkGaimStatusBox *box = (GtkGaimStatusBox*)data;
	if (box->typing) {
		gtk_gaim_status_box_pulse_typing(box);
		g_source_remove(box->typing);
	} 
	box->typing = g_timeout_add(3000, (GSourceFunc)remove_typing_cb, box);
	gtk_gaim_status_box_refresh(box);
}

--- NEW FILE: gtkstatusbox.h ---
/*
 * @file gtkstatusbox.c GTK+ Status Selection Widget
 * @ingroup gtkui
 *
 * gaim
 *
 * Gaim is the legal property of its developers, whose names are too numerous
 * to list here.  Please refer to the COPYRIGHT file distributed with this
 * source distribution.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */


#ifndef __GTK_GAIM_STATUS_BOX_H__
#define __GTK_GAIM_STATUS_BOX_H__

#include <gtk/gtk.h>
#include "gtkimhtml.h"
#include <gtk/gtktreemodel.h>
#include <gtk/gtktreeview.h>

G_BEGIN_DECLS

#define GTK_GAIM_TYPE_STATUS_BOX             (gtk_gaim_status_box_get_type ())
#define GTK_GAIM_STATUS_BOX(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_GAIM_TYPE_STATUS_BOX, GtkGaimStatusBox))
#define GTK_GAIM_STATUS_BOX_CLASS(vtable)    (G_TYPE_CHECK_CLASS_CAST ((vtable), GTK_GAIM_TYPE_STATUS_BOX, GtkGaimStatusBoxClass))
#define GTK_GAIM_IS_STATUS_BOX(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_GAIM_TYPE_STATUS_BOX))
#define GTK_GAIM_IS_STATUS_BOX_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), GTK_GAIM_TYPE_STATUS_BOX))
#define GTK_GAIM_STATUS_BOX_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst), GTK_GAIM_TYPE_STATUS_BOX, GtkGaimStatusBoxClass))

typedef struct _GtkGaimStatusBox      GtkGaimStatusBox;
typedef struct _GtkGaimStatusBoxClass GtkGaimStatusBoxClass;

struct _GtkGaimStatusBox
{
	GtkComboBox parent_instance;

	GtkListStore *store;
	GtkListStore *dropdown_store;

	GtkWidget *vbox, *sw;
	GtkWidget *imhtml;
	gboolean imhtml_visible;

	GtkWidget *cell_view;
	GtkCellRenderer *icon_rend;
	GtkCellRenderer *text_rend;

	GdkPixbuf *error_pixbuf;
	int connecting_index;
	GdkPixbuf *connecting_pixbufs[4];
	int typing_index;
	GdkPixbuf *typing_pixbufs[4];

	gboolean connecting;
	gboolean typing;


	GtkTreeIter iter;
	GdkPixbuf *pixbuf;
	char *title;
	char *desc;
	char *error;
};

struct _GtkGaimStatusBoxClass
{
  GtkComboBoxClass parent_class;

  /* signals */
  void     (* changed)          (GtkComboBox *combo_box);

  /* Padding for future expansion */
  void (*_gtk_reserved0) (void);
  void (*_gtk_reserved1) (void);
  void (*_gtk_reserved2) (void);
  void (*_gtk_reserved3) (void);
};


GType         gtk_gaim_status_box_get_type         (void) G_GNUC_CONST;
GtkWidget    *gtk_gaim_status_box_new              (void);

void
gtk_gaim_status_box_add(GtkGaimStatusBox *status_box, GdkPixbuf *pixbuf, const char *text, const char *sec_text, char *edit);

void
gtk_gaim_status_box_set_error(GtkGaimStatusBox *status_box, const gchar *error);

void
gtk_gaim_status_box_set_connecting(GtkGaimStatusBox *status_box, gboolean connecting);

void
gtk_gaim_status_box_pulse_connecting(GtkGaimStatusBox *status_box);

G_END_DECLS

#endif /* __GTK_GAIM_GTK_STATUS_COMBO_BOX_H__ */

Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/src/Makefile.am,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -d -p -r1.178 -r1.179
--- Makefile.am	26 Dec 2004 00:46:25 -0000	1.178
+++ Makefile.am	27 Feb 2005 08:35:10 -0000	1.179
@@ -171,7 +171,7 @@ gaim_SOURCES = \
 	gtksavedstatuses.c \
 	gtksound.c \
 	gtksourceiter.c \
-	gtkstatusselector.c \
+	gtkstatusbox.c \
 	gtkstock.c \
 	gtkthemes.c \
 	gtkutils.c \
@@ -206,7 +206,7 @@ gaim_headers = \
 	gtksavedstatuses.h \
 	gtksound.h \
 	gtksourceiter.h \
-	gtkstatusselector.h \
+	gtkstatusbox.h \
 	gtkstock.h \
 	gtkutils.h \
 	internal.h

Index: gtkblist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -d -p -r1.237 -r1.238
--- gtkblist.c	22 Feb 2005 16:06:29 -0000	1.237
+++ gtkblist.c	27 Feb 2005 08:35:10 -0000	1.238
@@ -53,7 +53,7 @@
 #include "gtkroomlist.h"
 #include "gtksavedstatuses.h"
 #include "gtksound.h"
-#include "gtkstatusselector.h"
+#include "gtkstatusbox.h"
 #include "gtkutils.h"
 
 #include <gdk/gdkkeysyms.h>
@@ -3353,7 +3353,6 @@ static void gaim_gtk_blist_show(GaimBudd
 	GtkTreeViewColumn *column;
 	GtkWidget *menu;
 	GtkWidget *sw;
-	GtkWidget *selector;
 	GtkAccelGroup *accel_group;
 	GtkTreeSelection *selection;
 	GtkTargetEntry dte[] = {{"GAIM_BLIST_NODE", GTK_TARGET_SAME_APP, DRAG_ROW},
@@ -3495,9 +3494,10 @@ static void gaim_gtk_blist_show(GaimBudd
 	gtk_container_add(GTK_CONTAINER(sw), gtkblist->treeview);
 	gaim_gtk_blist_update_columns();
 
-	selector = gaim_gtk_status_selector_new();
-	gtk_widget_show(selector);
-	gtk_box_pack_start(GTK_BOX(gtkblist->vbox), selector, FALSE, TRUE, 0);
+	gtkblist->statusbox = gtk_gaim_status_box_new();
+
+	gtk_widget_show(gtkblist->statusbox);
+	gtk_box_pack_start(GTK_BOX(gtkblist->vbox), gtkblist->statusbox, FALSE, TRUE, 0);
 
 	/* set the Show Offline Buddies option. must be done
 	 * after the treeview or faceprint gets mad. -Robot101
@@ -4749,6 +4749,11 @@ gaim_gtk_blist_get_ui_ops(void)
 	return &blist_ui_ops;
 }
 
+GaimGtkBuddyList *gaim_gtk_blist_get_default_gtk_blist()
+{
+        return gtkblist;
+}
+
 static void account_signon_cb(GaimConnection *gc, gpointer z)
 {
 	GaimAccount *account = gaim_connection_get_account(gc);

Index: gtkblist.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkblist.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -p -r1.29 -r1.30
--- gtkblist.h	8 Jan 2005 07:40:31 -0000	1.29
+++ gtkblist.h	27 Feb 2005 08:35:10 -0000	1.30
@@ -83,7 +83,7 @@ struct _GaimGtkBuddyList {
 	GtkWidget *tipwindow;            /**< The window used by the tooltip */
 
 	GaimBlistNode *selected_node;   /**< The currently selected node */
-
+        GtkWidget *statusbox;            /**< The status selector dropdown */
 	GdkPixbuf *east, *south;                 /**< Drop shadow stuff */
 	GdkWindow *east_shadow, *south_shadow;   /**< Drop shadow stuff */
 
@@ -122,6 +122,17 @@ void gaim_gtk_blist_uninit(void);
 GaimBlistUiOps *gaim_gtk_blist_get_ui_ops(void);
 
 /**
+ * Returns the default gtk buddy list
+ * 
+ * There's normally only one buddy list window, but that isn't a necessity. This function
+ * returns the GaimGtkBuddyList we're most likely wanting to work with. This is slightly
+ * cleaner than an externed global.
+ * 
+ * @return The default GTK buddy list
+ */
+GaimGtkBuddyList *gaim_gtk_blist_get_default_gtk_blist();
+
+/**
  * Returns the base image to represent the account, based on the currently selected theme
  *
  * @param account  The account.

Index: gtkconn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconn.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -p -r1.61 -r1.62
--- gtkconn.c	11 Jan 2005 17:24:54 -0000	1.61
+++ gtkconn.c	27 Feb 2005 08:35:10 -0000	1.62
@@ -29,6 +29,8 @@
 #include "debug.h"
 #include "notify.h"
 #include "prefs.h"
+#include "gtkblist.h"
+#include "gtkstatusbox.h"
 #include "gtkstock.h"
 #include "util.h"
 
@@ -39,24 +41,32 @@
 static void gaim_gtk_connection_connect_progress(GaimConnection *gc,
 		const char *text, size_t step, size_t step_count)
 {
-	/* SME - Pulse the statusselector */
+	GaimGtkBuddyList *gtkblist = gaim_gtk_blist_get_default_gtk_blist();
+	if (!gtkblist)
+		return;
+	gtk_gaim_status_box_set_connecting(GTK_GAIM_STATUS_BOX(gtkblist->statusbox),
+					   (gaim_connections_get_connecting() != NULL));
+	gtk_gaim_status_box_pulse_connecting(GTK_GAIM_STATUS_BOX(gtkblist->statusbox));
 }
 
 static void gaim_gtk_connection_connected(GaimConnection *gc)
 {
-
-#if 0 /* XXX CORE/UI */
-	do_away_menu();
-#endif
+	GaimGtkBuddyList *gtkblist = gaim_gtk_blist_get_default_gtk_blist();
+	if (!gtkblist)
+		return;
+	gtk_gaim_status_box_set_connecting(GTK_GAIM_STATUS_BOX(gtkblist->statusbox),
+					   (gaim_connections_get_connecting() != NULL));
 	gaim_gtk_blist_update_protocol_actions();
 
 }
 
 static void gaim_gtk_connection_disconnected(GaimConnection *gc)
 {
-#if 0 /* XXX CORE/UI */
-	do_away_menu();
-#endif
+	GaimGtkBuddyList *gtkblist = gaim_gtk_blist_get_default_gtk_blist();
+	if (!gtkblist)
+		return;
+	gtk_gaim_status_box_set_connecting(GTK_GAIM_STATUS_BOX(gtkblist->statusbox),
+					   (gaim_connections_get_connecting() != NULL));
 	gaim_gtk_blist_update_protocol_actions();
 
 	if (gaim_connections_get_all() != NULL)

Index: gtkstock.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkstock.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- gtkstock.c	2 Dec 2004 20:34:18 -0000	1.1
+++ gtkstock.c	27 Feb 2005 08:35:11 -0000	1.2
@@ -79,6 +79,18 @@ static struct StockIcon
 	{ GAIM_STOCK_TEXT_SMALLER,    "buttons", "text_smaller.png"         },
 	{ GAIM_STOCK_TYPED,           "gaim",    "typed.png"                },
 	{ GAIM_STOCK_TYPING,          "gaim",    "typing.png"               },
+	{ GAIM_STOCK_STATUS_ONLINE,   "gaim",    "status-online.png"        },
+	{ GAIM_STOCK_STATUS_OFFLINE,  "gaim",    "status-offline.png"       },
+	{ GAIM_STOCK_STATUS_AWAY,     "gaim",    "status-away.png"          },
+	{ GAIM_STOCK_STATUS_INVISIBLE,"gaim",    "status-invisible.png"     },
+	{ GAIM_STOCK_STATUS_TYPING0,  "gaim",    "status-typing0.png"       },
+	{ GAIM_STOCK_STATUS_TYPING1,  "gaim",    "status-typing1.png"       },
+	{ GAIM_STOCK_STATUS_TYPING2,  "gaim",    "status-typing2.png"       },
+	{ GAIM_STOCK_STATUS_TYPING3,  "gaim",    "status-typing3.png"       },
+	{ GAIM_STOCK_STATUS_CONNECT0, "gaim",    "status-connect0.png"      },
+	{ GAIM_STOCK_STATUS_CONNECT1, "gaim",    "status-connect1.png"      },
+	{ GAIM_STOCK_STATUS_CONNECT2, "gaim",    "status-connect2.png"      },
+	{ GAIM_STOCK_STATUS_CONNECT3, "gaim",    "status-connect3.png"      },
 	{ GAIM_STOCK_UPLOAD,          NULL,      GTK_STOCK_GO_UP            },
 	{ GAIM_STOCK_WARN,            NULL,      GTK_STOCK_DIALOG_WARNING   }
 };
@@ -221,6 +233,7 @@ gaim_gtk_stock_init(void)
 	/* register custom icon sizes */
 	gtk_icon_size_register(GAIM_ICON_SIZE_LOGO, 330, 90);
 	gtk_icon_size_register(GAIM_ICON_SIZE_DIALOG_COOL, 40, 60);
+	gtk_icon_size_register(GAIM_ICON_SIZE_STATUS, 30, 30);
 
 	g_object_unref(G_OBJECT(icon_factory));
 

Index: gtkstock.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkstock.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- gtkstock.h	2 Dec 2004 20:34:18 -0000	1.1
+++ gtkstock.h	27 Feb 2005 08:35:11 -0000	1.2
@@ -68,6 +68,18 @@
 #define GAIM_STOCK_SIGN_OFF        "gaim-sign-off"
 #define GAIM_STOCK_SIGN_ON         "gaim-sign-on"
 #define GAIM_STOCK_SMILEY          "gaim-smiley"
+#define GAIM_STOCK_STATUS_ONLINE   "gaim-status-online"
+#define GAIM_STOCK_STATUS_AWAY     "gaim-status-away"
+#define GAIM_STOCK_STATUS_INVISIBLE "gaim-status-invisible"
+#define GAIM_STOCK_STATUS_OFFLINE   "gaim-status-offline"
+#define GAIM_STOCK_STATUS_TYPING0  "gaim-status-typing0"
+#define GAIM_STOCK_STATUS_TYPING1  "gaim-status-typing1"
+#define GAIM_STOCK_STATUS_TYPING2  "gaim-status-typing2"
+#define GAIM_STOCK_STATUS_TYPING3  "gaim-status-typing3"
+#define GAIM_STOCK_STATUS_CONNECT0 "gaim-status-connect0"
+#define GAIM_STOCK_STATUS_CONNECT1 "gaim-status-connect1"
+#define GAIM_STOCK_STATUS_CONNECT2 "gaim-status-connect2"
+#define GAIM_STOCK_STATUS_CONNECT3 "gaim-status-connect3"
 #define GAIM_STOCK_TEXT_BIGGER     "gaim-text-bigger"
 #define GAIM_STOCK_TEXT_NORMAL     "gaim-text-normal"
 #define GAIM_STOCK_TEXT_SMALLER    "gaim-text-smaller"
@@ -82,6 +94,7 @@
  */
 #define GAIM_ICON_SIZE_DIALOG_COOL "gaim-icon-size-dialog-cool"
 #define GAIM_ICON_SIZE_LOGO        "gaim-icon-size-logo"
+#define GAIM_ICON_SIZE_STATUS      "gaim-icon-size-status"
 
 /**
  * Sets up the gaim stock repository.