# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1172207810 0
# Node ID f344b5cc2fc95e1b1c4839d83b3616498b36a011
# Parent  cad32dba756b9d313ce4813f08ebc9d4085c03b6# Parent  fc981ec147a6af10639c16924dec0873e0177d77
merge of 'dbd6240bc36085014ed8c0efd9549c1213bd4785'
     and 'fef1af8e40707d8feb138874ec7675ae23a50f90'

diff -r fc981ec147a6 -r f344b5cc2fc9 configure.ac
--- a/configure.ac	Mon Feb 19 04:55:48 2007 +0000
+++ b/configure.ac	Fri Feb 23 05:16:50 2007 +0000
@@ -1937,6 +1937,8 @@
 		   pidgin/pixmaps/toolbar/Makefile
 		   pidgin/pixmaps/toolbar/16/Makefile
 		   pidgin/pixmaps/toolbar/16/scalable/Makefile
+		   pidgin/pixmaps/tray/Makefile
+		   pidgin/pixmaps/tray/16/Makefile
 		   pidgin/plugins/Makefile
 		   pidgin/plugins/cap/Makefile
 		   pidgin/plugins/gestures/Makefile
diff -r fc981ec147a6 -r f344b5cc2fc9 console/gntgaim.c
--- a/console/gntgaim.c	Mon Feb 19 04:55:48 2007 +0000
+++ b/console/gntgaim.c	Fri Feb 23 05:16:50 2007 +0000
@@ -146,9 +146,9 @@
 static GaimEventLoopUiOps eventloop_ops =
 {
 	g_timeout_add,
-	(guint (*)(guint))g_source_remove,
+	g_source_remove,
 	gnt_input_add,
-	(guint (*)(guint))g_source_remove
+	g_source_remove
 };
 
 static GaimEventLoopUiOps *
diff -r fc981ec147a6 -r f344b5cc2fc9 libpurple/blist.c
--- a/libpurple/blist.c	Mon Feb 19 04:55:48 2007 +0000
+++ b/libpurple/blist.c	Fri Feb 23 05:16:50 2007 +0000
@@ -1910,28 +1910,8 @@
 	node = (GaimBlistNode *)group;
 
 	/* Make sure the group is empty */
-	if (node->child) {
-		char *buf;
-		int count = 0;
-		GaimBlistNode *child;
-
-		for (child = node->child; child != NULL; child = child->next)
-			count++;
-
-		buf = g_strdup_printf(ngettext("%d buddy from group %s was not removed "
-									   "because it belongs to an account which is "
-									   "disabled or offline.  This buddy and the "
-									   "group were not removed.\n",
-									   "%d buddies from group %s were not "
-									   "removed because they belong to accounts "
-									   "which are currently disabled or offline.  "
-									   "These buddies and the group were not "
-									   "removed.\n", count),
-							  count, group->name);
-		gaim_notify_error(NULL, NULL, _("Group not removed"), buf);
-		g_free(buf);
+	if (node->child)
 		return;
-	}
 
 	/* Remove the node from its parent */
 	if (gaimbuddylist->root == node)
diff -r fc981ec147a6 -r f344b5cc2fc9 libpurple/eventloop.c
--- a/libpurple/eventloop.c	Mon Feb 19 04:55:48 2007 +0000
+++ b/libpurple/eventloop.c	Fri Feb 23 05:16:50 2007 +0000
@@ -34,7 +34,7 @@
 	return ops->timeout_add(interval, function, data);
 }
 
-guint
+gboolean
 gaim_timeout_remove(guint tag)
 {
 	GaimEventLoopUiOps *ops = gaim_eventloop_get_ui_ops();
@@ -50,7 +50,7 @@
 	return ops->input_add(source, condition, func, user_data);
 }
 
-guint
+gboolean
 gaim_input_remove(guint tag)
 {
 	GaimEventLoopUiOps *ops = gaim_eventloop_get_ui_ops();
diff -r fc981ec147a6 -r f344b5cc2fc9 libpurple/eventloop.h
--- a/libpurple/eventloop.h	Mon Feb 19 04:55:48 2007 +0000
+++ b/libpurple/eventloop.h	Fri Feb 23 05:16:50 2007 +0000
@@ -57,7 +57,7 @@
 	 * Removes a callback timer.
 	 * @see gaim_timeout_remove, g_source_remove
 	 */
-	guint (*timeout_remove)(guint handle);
+	gboolean (*timeout_remove)(guint handle);
 
 	/**
 	 * Adds an input handler.
@@ -70,7 +70,7 @@
 	 * Removes an input handler.
 	 * @see gaim_input_remove, g_source_remove
 	 */
-	guint (*input_remove)(guint handle);
+	gboolean (*input_remove)(guint handle);
 };
 
 /**************************************************************************/
@@ -97,7 +97,7 @@
  *
  * @return Something.
  */
-guint gaim_timeout_remove(guint handle);
+gboolean gaim_timeout_remove(guint handle);
 
 /**
  * Adds an input handler.
@@ -119,7 +119,7 @@
  * @param handle The handle of the input handler. Note that this is the return
  * value from gaim_input_add, <i>not</i> the file descriptor.
  */
-guint gaim_input_remove(guint handle);
+gboolean gaim_input_remove(guint handle);
 
 /*@}*/
 
diff -r fc981ec147a6 -r f344b5cc2fc9 libpurple/protocols/jabber/buddy.c
--- a/libpurple/protocols/jabber/buddy.c	Mon Feb 19 04:55:48 2007 +0000
+++ b/libpurple/protocols/jabber/buddy.c	Fri Feb 23 05:16:50 2007 +0000
@@ -602,11 +602,11 @@
 	/* Remove the timeout, which would otherwise trigger jabber_buddy_get_info_timeout() */
 	if (jbi->timeout_handle > 0)
 		gaim_timeout_remove(jbi->timeout_handle);
-	
+
 	g_free(jbi->jid);
 	g_hash_table_destroy(jbi->resources);
 	g_free(jbi->vcard_text);
-	g_free(jbi);	
+	g_free(jbi);
 }
 
 static void jabber_buddy_info_show_if_ready(JabberBuddyInfo *jbi)
@@ -694,7 +694,7 @@
 				gaim_notify_user_info_add_pair(user_info,
 											   _("Client"), tmp);
 				g_free(tmp);
-				
+
 				if(jbr->client.os) {
 					gaim_notify_user_info_add_pair(user_info, _("Operating System"), jbr->client.os);
 				}
@@ -726,14 +726,16 @@
 static void jabber_buddy_info_remove_id(JabberBuddyInfo *jbi, const char *id)
 {
 	GSList *l = jbi->ids;
+	char *comp_id;
 
 	if(!id)
 		return;
 
 	while(l) {
-		if(!strcmp(id, l->data)) {
-			jbi->ids = g_slist_remove(jbi->ids, l->data);
-			g_free(l->data);			
+		comp_id = l->data;
+		if(!strcmp(id, comp_id)) {
+			jbi->ids = g_slist_remove(jbi->ids, comp_id);
+			g_free(comp_id);
 			return;
 		}
 		l = l->next;
@@ -1093,7 +1095,7 @@
 			g_slist_free(jbi->ids);
 			jabber_buddy_info_destroy(jbi);
 
-			l = l->next;			
+			l = l->next;
 		}
 
 		g_slist_free(js->pending_buddy_info_requests);
diff -r fc981ec147a6 -r f344b5cc2fc9 libpurple/protocols/msn/error.c
--- a/libpurple/protocols/msn/error.c	Mon Feb 19 04:55:48 2007 +0000
+++ b/libpurple/protocols/msn/error.c	Fri Feb 23 05:16:50 2007 +0000
@@ -25,17 +25,21 @@
 #include "error.h"
 
 const char *
-msn_error_get_text(unsigned int type)
+msn_error_get_text(unsigned int type, gboolean *debug)
 {
 	static char msg[MSN_BUF_LEN];
+	debug = FALSE;
 
 	switch (type) {
 		case 0:
 			g_snprintf(msg, sizeof(msg),
 					   _("Unable to parse message"));
+			debug = TRUE;
+			break;
 		case 200:
 			g_snprintf(msg, sizeof(msg),
 					   _("Syntax Error (probably a client bug)"));
+			debug = TRUE;
 			break;
 		case 201:
 			g_snprintf(msg, sizeof(msg),
@@ -62,6 +66,7 @@
 			break;
 		case 215:
 			g_snprintf(msg, sizeof(msg), _("Already there"));
+			debug = TRUE;
 			break;
 		case 216:
 			g_snprintf(msg, sizeof(msg), _("Not on list"));
@@ -71,9 +76,11 @@
 			break;
 		case 218:
 			g_snprintf(msg, sizeof(msg), _("Already in the mode"));
+			debug = TRUE;
 			break;
 		case 219:
 			g_snprintf(msg, sizeof(msg), _("Already in opposite list"));
+			debug = TRUE;
 			break;
 		case 223:
 			g_snprintf(msg, sizeof(msg), _("Too many groups"));
@@ -89,6 +96,7 @@
 			break;
 		case 230:
 			g_snprintf(msg, sizeof(msg), _("Cannot remove group zero"));
+			debug = TRUE;
 			break;
 		case 231:
 			g_snprintf(msg, sizeof(msg),
@@ -97,16 +105,20 @@
 			break;
 		case 280:
 			g_snprintf(msg, sizeof(msg), _("Switchboard failed"));
+			debug = TRUE;
 			break;
 		case 281:
 			g_snprintf(msg, sizeof(msg), _("Notify transfer failed"));
+			debug = TRUE;
 			break;
 
 		case 300:
 			g_snprintf(msg, sizeof(msg), _("Required fields missing"));
+			debug = TRUE;
 			break;
 		case 301:
 			g_snprintf(msg, sizeof(msg), _("Too many hits to a FND"));
+			debug = TRUE;
 			break;
 		case 302:
 			g_snprintf(msg, sizeof(msg), _("Not logged in"));
@@ -117,18 +129,23 @@
 			break;
 		case 501:
 			g_snprintf(msg, sizeof(msg), _("Database server error"));
+			debug = TRUE;
 			break;
 		case 502:
 			g_snprintf(msg, sizeof(msg), _("Command disabled"));
+			debug = TRUE;
 			break;
 		case 510:
 			g_snprintf(msg, sizeof(msg), _("File operation error"));
+			debug = TRUE;
 			break;
 		case 520:
 			g_snprintf(msg, sizeof(msg), _("Memory allocation error"));
+			debug = TRUE;
 			break;
 		case 540:
 			g_snprintf(msg, sizeof(msg), _("Wrong CHL value sent to server"));
+			debug = TRUE;
 			break;
 
 		case 600:
@@ -139,9 +156,11 @@
 			break;
 		case 602:
 			g_snprintf(msg, sizeof(msg), _("Peer notification server down"));
+			debug = TRUE;
 			break;
 		case 603:
 			g_snprintf(msg, sizeof(msg), _("Database connect error"));
+			debug = TRUE;
 			break;
 		case 604:
 			g_snprintf(msg, sizeof(msg),
@@ -153,16 +172,19 @@
 
 		case 707:
 			g_snprintf(msg, sizeof(msg), _("Error creating connection"));
+			debug = TRUE;
 			break;
 		case 710:
 			g_snprintf(msg, sizeof(msg),
 					   _("CVR parameters are either unknown or not allowed"));
+			debug = TRUE;
 			break;
 		case 711:
 			g_snprintf(msg, sizeof(msg), _("Unable to write"));
 			break;
 		case 712:
 			g_snprintf(msg, sizeof(msg), _("Session overload"));
+			debug = TRUE;
 			break;
 		case 713:
 			g_snprintf(msg, sizeof(msg), _("User is too active"));
@@ -175,9 +197,11 @@
 			break;
 		case 717:
 			g_snprintf(msg, sizeof(msg), _("Bad friend file"));
+			debug = TRUE;
 			break;
 		case 731:
 			g_snprintf(msg, sizeof(msg), _("Not expected"));
+			debug = TRUE;
 			break;
 
 		case 800:
@@ -218,10 +242,12 @@
 			break;
 		case 928:
 			g_snprintf(msg, sizeof(msg), _("Bad ticket"));
+			debug = TRUE;
 			break;
 
 		default:
 			g_snprintf(msg, sizeof(msg), _("Unknown Error Code %d"), type);
+			debug = TRUE;
 			break;
 	}
 
@@ -232,9 +258,12 @@
 msn_error_handle(MsnSession *session, unsigned int type)
 {
 	char buf[MSN_BUF_LEN];
-
+	gboolean debug;
+	
 	g_snprintf(buf, sizeof(buf), _("MSN Error: %s\n"),
-			   msn_error_get_text(type));
-
-	gaim_notify_error(session->account->gc, NULL, buf, NULL);
+			   msn_error_get_text(type, &debug));
+	if (debug)
+		gaim_debug_warning("msn", "error %d: %s\n", type, buf);
+	else
+		gaim_notify_error(session->account->gc, NULL, buf, NULL);
 }
diff -r fc981ec147a6 -r f344b5cc2fc9 libpurple/protocols/msn/error.h
--- a/libpurple/protocols/msn/error.h	Mon Feb 19 04:55:48 2007 +0000
+++ b/libpurple/protocols/msn/error.h	Fri Feb 23 05:16:50 2007 +0000
@@ -30,10 +30,11 @@
  * Returns the string representation of an error type.
  *
  * @param type The error type.
+ * @param debug Whether this should be treated as a debug log message or a user-visible error
  *
  * @return The string representation of the error type.
  */
-const char *msn_error_get_text(unsigned int type);
+const char *msn_error_get_text(unsigned int type, gboolean *debug);
 
 /**
  * Handles an error.
diff -r fc981ec147a6 -r f344b5cc2fc9 libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Mon Feb 19 04:55:48 2007 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Fri Feb 23 05:16:50 2007 +0000
@@ -201,6 +201,7 @@
 void oscar_set_info(GaimConnection *gc, const char *info);
 static void oscar_set_info_and_status(GaimAccount *account, gboolean setinfo, const char *rawinfo, gboolean setstatus, GaimStatus *status);
 static void oscar_set_extendedstatus(GaimConnection *gc);
+static void oscar_format_screenname(GaimConnection *gc, const char *nick); 
 static gboolean gaim_ssi_rerequestdata(gpointer data);
 
 static void oscar_free_name_data(struct name_data *data) {
@@ -2713,7 +2714,6 @@
 static int gaim_parse_genericerr(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...) {
 	va_list ap;
 	guint16 reason;
-	char *m;
 
 	va_start(ap, fr);
 	reason = (guint16) va_arg(ap, unsigned int);
@@ -2722,12 +2722,6 @@
 	gaim_debug_error("oscar",
 			   "snac threw error (reason 0x%04hx: %s)\n", reason,
 			   (reason < msgerrreasonlen) ? msgerrreason[reason] : "unknown");
-
-	m = g_strdup_printf(_("SNAC threw error: %s\n"),
-			reason < msgerrreasonlen ? _(msgerrreason[reason]) : _("Unknown error"));
-	gaim_notify_error(od->gc, NULL, m, NULL);
-	g_free(m);
-
 	return 1;
 }
 
@@ -3598,6 +3592,8 @@
 	if (gaim_account_get_user_info(account) != NULL)
 		serv_set_info(gc, gaim_account_get_user_info(account));
 
+	oscar_format_screenname(gc, account->username);
+
 	/* Set our available message based on the current status */
 	status = gaim_account_get_active_status(account);
 	if (gaim_status_is_available(status))
@@ -4013,12 +4009,6 @@
 		return 1;
 	}
 
-	if (sn != NULL) {
-		char *dialog_msg = g_strdup_printf(_("Your screen name is currently formatted as follows:\n%s"), sn);
-		gaim_notify_info(gc, NULL, _("Account Info"), dialog_msg);
-		g_free(dialog_msg);
-	}
-
 	if (email != NULL) {
 		char *dialog_msg = g_strdup_printf(_("The e-mail address for %s is %s"),
 						   gaim_account_get_username(gaim_connection_get_account(gc)), email);
@@ -6041,16 +6031,6 @@
 	}
 }
 
-static void oscar_show_format_screenname(GaimPluginAction *action)
-{
-	GaimConnection *gc = (GaimConnection *) action->context;
-	gaim_request_input(gc, NULL, _("New screen name formatting:"), NULL,
-					   gaim_connection_get_display_name(gc), FALSE, FALSE, NULL,
-					   _("_OK"), G_CALLBACK(oscar_format_screenname),
-					   _("_Cancel"), NULL,
-					   gc);
-}
-
 static void oscar_confirm_account(GaimPluginAction *action)
 {
 	GaimConnection *gc;
@@ -6372,10 +6352,6 @@
 	else
 	{
 		/* AIM actions */
-		act = gaim_plugin_action_new(_("Format Screen Name..."),
-				oscar_show_format_screenname);
-		menu = g_list_prepend(menu, act);
-
 		act = gaim_plugin_action_new(_("Confirm Account"),
 				oscar_confirm_account);
 		menu = g_list_prepend(menu, act);
diff -r fc981ec147a6 -r f344b5cc2fc9 libpurple/savedstatuses.c
--- a/libpurple/savedstatuses.c	Mon Feb 19 04:55:48 2007 +0000
+++ b/libpurple/savedstatuses.c	Fri Feb 23 05:16:50 2007 +0000
@@ -1068,6 +1068,8 @@
 	saved_status->usage_count++;
 	saved_statuses = g_list_remove(saved_statuses, saved_status);
 	saved_statuses = g_list_insert_sorted(saved_statuses, saved_status, saved_statuses_sort_func);
+	gaim_prefs_set_int("/core/savedstatus/default",
+					   gaim_savedstatus_get_creation_time(saved_status));
 
 	accounts = gaim_accounts_get_all_active();
 	for (node = accounts; node != NULL; node = node->next)
@@ -1081,8 +1083,6 @@
 
 	g_list_free(accounts);
 
-	gaim_prefs_set_int("/core/savedstatus/default",
-					   gaim_savedstatus_get_creation_time(saved_status));
 	gaim_savedstatus_set_idleaway(FALSE);
 
 	gaim_signal_emit(gaim_savedstatuses_get_handle(), "savedstatus-changed",
diff -r fc981ec147a6 -r f344b5cc2fc9 libpurple/util.c
--- a/libpurple/util.c	Mon Feb 19 04:55:48 2007 +0000
+++ b/libpurple/util.c	Fri Feb 23 05:16:50 2007 +0000
@@ -4117,6 +4117,7 @@
 
 void gaim_restore_default_signal_handlers(void)
 {
+#ifndef _WIN32
 #ifdef HAVE_SIGNAL_H
 	signal(SIGHUP, SIG_DFL);	/* 1: terminal line hangup */
 	signal(SIGINT, SIG_DFL);	/* 2: interrupt program */
@@ -4143,5 +4144,12 @@
 	signal(SIGCHLD, SIG_DFL);	/* 20: child status has changed */
 	signal(SIGXCPU, SIG_DFL);	/* 24: exceeded CPU time limit */
 	signal(SIGXFSZ, SIG_DFL);	/* 25: exceeded file size limit */	
+<<<<<<< variant A
 #endif /* HAVE_SIGNAL_H */
+#endif /* !_WIN32 */
+>>>>>>> variant B
+#endif /* HAVE_SIGNAL_H */
+####### Ancestor
+#endif
+======= end
 }
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/gaimstock.c
--- a/pidgin/gaimstock.c	Mon Feb 19 04:55:48 2007 +0000
+++ b/pidgin/gaimstock.c	Fri Feb 23 05:16:50 2007 +0000
@@ -69,12 +69,6 @@
 	{ PIDGIN_STOCK_FILE_CANCELED,   NULL,      GTK_STOCK_CANCEL           },
 	{ PIDGIN_STOCK_FILE_DONE,       NULL,      GTK_STOCK_APPLY            },
 	{ PIDGIN_STOCK_FILE_TRANSFER,   NULL,      GTK_STOCK_REVERT_TO_SAVED  },
-	{ PIDGIN_STOCK_ICON_AWAY,       "icons",   "away.png"                 },
-	{ PIDGIN_STOCK_ICON_AWAY_MSG,   "icons",   "msgpend.png"              },
-	{ PIDGIN_STOCK_ICON_CONNECT,    "icons",   "connect.png"              },
-	{ PIDGIN_STOCK_ICON_OFFLINE,    "icons",   "offline.png"              },
-	{ PIDGIN_STOCK_ICON_ONLINE,     "icons",   "online.png"               },
-	{ PIDGIN_STOCK_ICON_ONLINE_MSG, "icons",   "msgunread.png"            },
 	{ PIDGIN_STOCK_IGNORE,          NULL,      GTK_STOCK_DIALOG_ERROR     },
 	{ PIDGIN_STOCK_INVITE,          NULL,      GTK_STOCK_JUMP_TO          },
 	{ PIDGIN_STOCK_MODIFY,          NULL,      GTK_STOCK_PREFERENCES      },
@@ -128,6 +122,7 @@
 	{ PIDGIN_STOCK_STATUS_PERSON, 	"status", "person.png",		TRUE, TRUE, TRUE, FALSE },
 	{ PIDGIN_STOCK_STATUS_OPERATOR,	"status", "operator.png",	TRUE, FALSE, FALSE, FALSE },
 	{ PIDGIN_STOCK_STATUS_HALFOP, 	"status", "half-operator.png",	TRUE, FALSE, FALSE, FALSE },
+	{ PIDGIN_STOCK_STATUS_VOICE, 	"status", "voice.png",		TRUE, FALSE, FALSE, FALSE },
 	{ PIDGIN_STOCK_STATUS_MESSAGE, 	"status", "message-pending.png",TRUE, FALSE, FALSE, FALSE },
 
 	{ PIDGIN_STOCK_DIALOG_AUTH,	"dialogs", "auth.png",		TRUE, FALSE, FALSE, TRUE },
@@ -142,10 +137,16 @@
 	{ PIDGIN_STOCK_ANIMATION_CONNECT1, "animations", "connect1.png",TRUE, FALSE, FALSE, FALSE },
 	{ PIDGIN_STOCK_ANIMATION_CONNECT2, "animations", "connect2.png",TRUE, FALSE, FALSE, FALSE },
 	{ PIDGIN_STOCK_ANIMATION_CONNECT3, "animations", "connect3.png",TRUE, FALSE, FALSE, FALSE },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT4, "animations", "connect4.png",TRUE, FALSE, FALSE, FALSE },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT5, "animations", "connect5.png",TRUE, FALSE, FALSE, FALSE },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT6, "animations", "connect6.png",TRUE, FALSE, FALSE, FALSE },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT7, "animations", "connect7.png",TRUE, FALSE, FALSE, FALSE },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT8, "animations", "connect8.png",TRUE, FALSE, FALSE, FALSE },
 	{ PIDGIN_STOCK_ANIMATION_TYPING0,  "animations", "typing0.png",TRUE, FALSE, FALSE, FALSE },
 	{ PIDGIN_STOCK_ANIMATION_TYPING1,  "animations", "typing1.png",TRUE, FALSE, FALSE, FALSE },
 	{ PIDGIN_STOCK_ANIMATION_TYPING2,  "animations", "typing2.png",TRUE, FALSE, FALSE, FALSE },
 	{ PIDGIN_STOCK_ANIMATION_TYPING3,  "animations", "typing3.png",TRUE, FALSE, FALSE, FALSE },
+	{ PIDGIN_STOCK_ANIMATION_TYPING4,  "animations", "typing4.png",TRUE, FALSE, FALSE, FALSE },
 
 	{ PIDGIN_STOCK_TOOLBAR_ACCOUNTS, "toolbar", "accounts.png", TRUE, FALSE, FALSE, FALSE },
 	{ PIDGIN_STOCK_TOOLBAR_BGCOLOR, "toolbar", "change-bgcolor.png", TRUE, FALSE, FALSE, FALSE },
@@ -159,6 +160,14 @@
 	{ PIDGIN_STOCK_TOOLBAR_PLUGINS, "toolbar", "plugins.png", TRUE, FALSE, FALSE, FALSE },
 	{ PIDGIN_STOCK_TOOLBAR_TYPING, "toolbar", "typing.png", TRUE, FALSE, FALSE, FALSE },
 	{ PIDGIN_STOCK_TOOLBAR_PENDING, "status", "message-pending.png", TRUE, FALSE, FALSE, FALSE },
+	
+	{ PIDGIN_STOCK_TRAY_AVAILABLE, "tray", "tray-online.png", TRUE, FALSE, FALSE, FALSE },
+	{ PIDGIN_STOCK_TRAY_AWAY, "tray", "tray-away.png", TRUE, FALSE, FALSE, FALSE },
+	{ PIDGIN_STOCK_TRAY_BUSY, "tray", "tray-busy.png", TRUE, FALSE, FALSE, FALSE },
+	{ PIDGIN_STOCK_TRAY_XA, "tray", "tray-extended-away.png", TRUE, FALSE, FALSE, FALSE },
+	{ PIDGIN_STOCK_TRAY_OFFLINE, "tray", "tray-offline.png", TRUE, FALSE, FALSE, FALSE },
+	{ PIDGIN_STOCK_TRAY_CONNECT, "tray", "tray-online.png", TRUE, FALSE, FALSE, FALSE },
+	{ PIDGIN_STOCK_TRAY_PENDING, "tray", "tray-message.png", TRUE, FALSE, FALSE, FALSE }
 };
 
 static gchar *
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/gaimstock.h
--- a/pidgin/gaimstock.h	Mon Feb 19 04:55:48 2007 +0000
+++ b/pidgin/gaimstock.h	Fri Feb 23 05:16:50 2007 +0000
@@ -49,12 +49,6 @@
 #define PIDGIN_STOCK_FILE_CANCELED   "pidgin-file-canceled"
 #define PIDGIN_STOCK_FILE_DONE       "pidgin-file-done"
 #define PIDGIN_STOCK_FILE_TRANSFER   "pidgin-file-transfer"
-#define PIDGIN_STOCK_ICON_AWAY       "pidgin-icon-away"
-#define PIDGIN_STOCK_ICON_AWAY_MSG   "pidgin-icon-away-msg"
-#define PIDGIN_STOCK_ICON_CONNECT    "pidgin-icon-away-connect"
-#define PIDGIN_STOCK_ICON_OFFLINE    "pidgin-icon-offline"
-#define PIDGIN_STOCK_ICON_ONLINE     "pidgin-icon-online"
-#define PIDGIN_STOCK_ICON_ONLINE_MSG "pidgin-icon-online-msg"
 #define PIDGIN_STOCK_IGNORE          "pidgin-ignore"
 #define PIDGIN_STOCK_INVITE          "pidgin-invite"
 #define PIDGIN_STOCK_MODIFY          "pidgin-modify"
@@ -83,6 +77,7 @@
 #define PIDGIN_STOCK_STATUS_PERSON     "pidgin-status-person"
 #define PIDGIN_STOCK_STATUS_OPERATOR   "pidgin-status-operator"
 #define PIDGIN_STOCK_STATUS_HALFOP     "pidgin-status-halfop"
+#define PIDGIN_STOCK_STATUS_VOICE      "pidgin-status-voice"
 #define PIDGIN_STOCK_STATUS_MESSAGE    "pidgin-status-message"
 
 /* Dialog icons */
@@ -99,10 +94,16 @@
 #define PIDGIN_STOCK_ANIMATION_CONNECT1 "pidgin-anim-connect1"
 #define PIDGIN_STOCK_ANIMATION_CONNECT2 "pidgin-anim-connect2"
 #define PIDGIN_STOCK_ANIMATION_CONNECT3 "pidgin-anim-connect3"
+#define PIDGIN_STOCK_ANIMATION_CONNECT4 "pidgin-anim-connect4"
+#define PIDGIN_STOCK_ANIMATION_CONNECT5 "pidgin-anim-connect5"
+#define PIDGIN_STOCK_ANIMATION_CONNECT6 "pidgin-anim-connect6"
+#define PIDGIN_STOCK_ANIMATION_CONNECT7 "pidgin-anim-connect7"
+#define PIDGIN_STOCK_ANIMATION_CONNECT8 "pidgin-anim-connect8"
 #define PIDGIN_STOCK_ANIMATION_TYPING0	"pidgin-anim-typing0"
 #define PIDGIN_STOCK_ANIMATION_TYPING1	"pidgin-anim-typing1"
 #define PIDGIN_STOCK_ANIMATION_TYPING2	"pidgin-anim-typing2"
 #define PIDGIN_STOCK_ANIMATION_TYPING3	"pidgin-anim-typing3"
+#define PIDGIN_STOCK_ANIMATION_TYPING4	"pidgin-anim-typing4"
 
 /* Toolbar (and menu) icons */
 #define PIDGIN_STOCK_TOOLBAR_ACCOUNTS     "pidgin-accounts"
@@ -118,6 +119,17 @@
 #define PIDGIN_STOCK_TOOLBAR_TYPING       "pidgin-typing"
 #define PIDGIN_STOCK_TOOLBAR_USER_INFO    "pidgin-info"
 #define PIDGIN_STOCK_TOOLBAR_PENDING      "pidgin-pending"
+
+/* Tray icons */
+#define PIDGIN_STOCK_TRAY_AVAILABLE       "pidgin-tray-available"
+#define PIDGIN_STOCK_TRAY_AWAY	  	  "pidgin-tray-away"
+#define PIDGIN_STOCK_TRAY_BUSY            "pidgin-tray-busy"
+#define PIDGIN_STOCK_TRAY_XA              "pidgin-tray-xa"
+#define PIDGIN_STOCK_TRAY_OFFLINE         "pidgin-tray-offline"
+#define PIDGIN_STOCK_TRAY_CONNECT         "pidgin-tray-connect"
+#define PIDGIN_STOCK_TRAY_PENDING         "pidgin-tray-pending"
+
+
 /*@}*/
 
 /**
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Mon Feb 19 04:55:48 2007 +0000
+++ b/pidgin/gtkconv.c	Fri Feb 23 05:16:50 2007 +0000
@@ -3338,6 +3338,7 @@
 static GdkPixbuf *
 get_chat_buddy_status_icon(GaimConvChat *chat, const char *name, GaimConvChatBuddyFlags flags)
 {
+        PidginConversation *gtkconv = PIDGIN_CONVERSATION(chat->conv);
 	GdkPixbuf *pixbuf, *scale, *scale2;
 	char *filename;
 	const char *image = NULL;
@@ -3345,21 +3346,20 @@
 	if (flags & GAIM_CBFLAGS_FOUNDER) {
 		image = "founder.png";
 	} else if (flags & GAIM_CBFLAGS_OP) {
-		image = "op.png";
+		image = PIDGIN_STOCK_STATUS_OPERATOR;
 	} else if (flags & GAIM_CBFLAGS_HALFOP) {
-		image = "halfop.png";
+		image = PIDGIN_STOCK_STATUS_HALFOP;
 	} else if (flags & GAIM_CBFLAGS_VOICE) {
-		image = "voice.png";
+		image = PIDGIN_STOCK_STATUS_VOICE;
 	} else if ((!flags) && gaim_conv_chat_is_user_ignored(chat, name)) {
 		image = "ignored.png";
 	} else {
 		return NULL;
 	}
 
-	filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", image, NULL);
-	pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
-	g_free(filename);
-
+	pixbuf = gtk_widget_render_icon (gtkconv->tab_cont, image, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL),
+				 	 "GtkTreeView");
+	
 	if (!pixbuf)
 		return NULL;
 
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/gtkdocklet-x11.c
--- a/pidgin/gtkdocklet-x11.c	Mon Feb 19 04:55:48 2007 +0000
+++ b/pidgin/gtkdocklet-x11.c	Fri Feb 23 05:16:50 2007 +0000
@@ -93,27 +93,30 @@
 
 	switch (icon) {
 		case DOCKLET_STATUS_OFFLINE:
-			icon_name = PIDGIN_STOCK_ICON_OFFLINE;
+			icon_name = PIDGIN_STOCK_TRAY_OFFLINE;
 			break;
 		case DOCKLET_STATUS_CONNECTING:
-			icon_name = PIDGIN_STOCK_ICON_CONNECT;
+			icon_name = PIDGIN_STOCK_TRAY_CONNECT;
 			break;
-		case DOCKLET_STATUS_ONLINE:
-			icon_name = PIDGIN_STOCK_ICON_ONLINE;
+		case DOCKLET_STATUS_AVAILABLE:
+			icon_name = PIDGIN_STOCK_TRAY_AVAILABLE;
 			break;
-		case DOCKLET_STATUS_ONLINE_PENDING:
-			icon_name = PIDGIN_STOCK_ICON_ONLINE_MSG;
+		case DOCKLET_STATUS_PENDING:
+			icon_name = PIDGIN_STOCK_TRAY_PENDING;
 			break;
 		case DOCKLET_STATUS_AWAY:
-			icon_name = PIDGIN_STOCK_ICON_AWAY;
+			icon_name = PIDGIN_STOCK_TRAY_AWAY;
 			break;
-		case DOCKLET_STATUS_AWAY_PENDING:
-			icon_name = PIDGIN_STOCK_ICON_AWAY_MSG;
+		case DOCKLET_STATUS_BUSY:
+			icon_name = PIDGIN_STOCK_TRAY_BUSY;
+			break;
+		case DOCKLET_STATUS_XA:
+			icon_name = PIDGIN_STOCK_TRAY_XA;
 			break;
 	}
 
 	if(icon_name)
-		gtk_image_set_from_stock(GTK_IMAGE(image), icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR);
+		gtk_image_set_from_stock(GTK_IMAGE(image), icon_name, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL));
 
 #if 0
 	GdkPixbuf *p;
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/gtkdocklet.c
--- a/pidgin/gtkdocklet.c	Mon Feb 19 04:55:48 2007 +0000
+++ b/pidgin/gtkdocklet.c	Fri Feb 23 05:16:50 2007 +0000
@@ -67,8 +67,7 @@
 	blinked = !blinked;
 
 	switch (status) {
-		case DOCKLET_STATUS_ONLINE_PENDING:
-		case DOCKLET_STATUS_AWAY_PENDING:
+		case DOCKLET_STATUS_PENDING:
 			if (blinked) {
 				if (ui_ops && ui_ops->blank_icon)
 					ui_ops->blank_icon();
@@ -114,8 +113,10 @@
 {
 	GList *convs, *l;
 	int count;
+	GaimSavedStatus *saved_status;
+	GaimStatusPrimitive prim;
 	DockletStatus newstatus = DOCKLET_STATUS_OFFLINE;
-	gboolean pending = FALSE;
+	gboolean pending = FALSE, connecting = FALSE;
 
 	/* determine if any ims have unseen messages */
 	convs = get_pending_list(DOCKLET_TOOLTIP_LINE_LIMIT);
@@ -170,19 +171,7 @@
 		ui_ops->set_tooltip(NULL);
 	}
 
-	/* iterate through all accounts and determine which
-	 * status to show in the tray icon based on the following
-	 * ranks (highest encountered rank will be used):
-	 *
-	 *     1) OFFLINE
-	 *     2) ONLINE
-	 *     3) ONLINE_PENDING
-	 *     4) AWAY
-	 *     5) AWAY_PENDING
-	 *     6) CONNECTING
-	 */
 	for(l = gaim_accounts_get_all(); l != NULL; l = l->next) {
-		DockletStatus tmpstatus = DOCKLET_STATUS_OFFLINE;
 
 		GaimAccount *account = (GaimAccount*)l->data;
 		GaimStatus *account_status;
@@ -194,28 +183,26 @@
 			continue;
 
 		account_status = gaim_account_get_active_status(account);
-
-		if (gaim_account_is_connecting(account)) {
-			tmpstatus = DOCKLET_STATUS_CONNECTING;
-		} else if (gaim_status_is_online(account_status)) {
-			if (!gaim_status_is_available(account_status)) {
-				if (pending)
-					tmpstatus = DOCKLET_STATUS_AWAY_PENDING;
-				else
-					tmpstatus = DOCKLET_STATUS_AWAY;
-			}
-			else {
-				if (pending)
-					tmpstatus = DOCKLET_STATUS_ONLINE_PENDING;
-				else
-					tmpstatus = DOCKLET_STATUS_ONLINE;
-			}
-		}
-
-		if (tmpstatus > newstatus)
-			newstatus = tmpstatus;
+		if (gaim_account_is_connecting(account))
+			connecting = TRUE;
 	}
-
+	
+	saved_status = gaim_savedstatus_get_current();
+        prim = gaim_savedstatus_get_type(saved_status);
+	
+	if (connecting)
+		newstatus = DOCKLET_STATUS_CONNECTING;
+	else if (prim == GAIM_STATUS_UNAVAILABLE)
+		newstatus = DOCKLET_STATUS_BUSY;
+	else if (prim == GAIM_STATUS_AWAY)
+		newstatus = DOCKLET_STATUS_AWAY;
+	else if (prim == GAIM_STATUS_EXTENDED_AWAY)
+        	newstatus = DOCKLET_STATUS_XA;
+        else if (prim == GAIM_STATUS_OFFLINE)
+        	newstatus = DOCKLET_STATUS_OFFLINE;
+	else
+		newstatus = DOCKLET_STATUS_AVAILABLE;
+			      
 	/* update the icon if we changed status */
 	if (status != newstatus) {
 		status = newstatus;
@@ -225,8 +212,7 @@
 
 		/* and schedule the blinker function if messages are pending */
 		if (gaim_prefs_get_bool("/gaim/gtk/docklet/blink") &&
-		    (status == DOCKLET_STATUS_ONLINE_PENDING
-		     || status == DOCKLET_STATUS_AWAY_PENDING)
+		    status == DOCKLET_STATUS_PENDING
 		    && docklet_blinking_timer == 0) {
 			docklet_blinking_timer = g_timeout_add(500, docklet_blink_icon, NULL);
 		}
@@ -512,7 +498,7 @@
 
 	menuitem = gtk_menu_item_new_with_label(_("Unread Messages"));
 
-	if (status == DOCKLET_STATUS_ONLINE_PENDING || status == DOCKLET_STATUS_AWAY_PENDING) {
+	if (status == DOCKLET_STATUS_PENDING) {
 		GtkWidget *submenu = gtk_menu_new();
 		GList *l = get_pending_list(0);
 		if (l == NULL) {
@@ -584,7 +570,7 @@
 {
 	switch (button_type) {
 		case 1:
-			if (status == DOCKLET_STATUS_ONLINE_PENDING || status == DOCKLET_STATUS_AWAY_PENDING) {
+			if (status == DOCKLET_STATUS_PENDING) {
 				GList *l = get_pending_list(1);
 				if (l != NULL) {
 					gaim_conversation_present((GaimConversation *)l->data);
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/gtkdocklet.h
--- a/pidgin/gtkdocklet.h	Mon Feb 19 04:55:48 2007 +0000
+++ b/pidgin/gtkdocklet.h	Fri Feb 23 05:16:50 2007 +0000
@@ -28,10 +28,11 @@
 typedef enum
 {
 	DOCKLET_STATUS_OFFLINE,
-	DOCKLET_STATUS_ONLINE,
-	DOCKLET_STATUS_ONLINE_PENDING,
+	DOCKLET_STATUS_AVAILABLE,
+	DOCKLET_STATUS_PENDING,
 	DOCKLET_STATUS_AWAY,
-	DOCKLET_STATUS_AWAY_PENDING,
+	DOCKLET_STATUS_BUSY,
+	DOCKLET_STATUS_XA,
 	DOCKLET_STATUS_CONNECTING
 } DockletStatus;
 
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/gtkeventloop.c
--- a/pidgin/gtkeventloop.c	Mon Feb 19 04:55:48 2007 +0000
+++ b/pidgin/gtkeventloop.c	Fri Feb 23 05:16:50 2007 +0000
@@ -116,9 +116,9 @@
 static GaimEventLoopUiOps eventloop_ops =
 {
 	g_timeout_add,
-	(guint (*)(guint))g_source_remove,
+	g_source_remove,
 	pidgin_input_add,
-	(guint (*)(guint))g_source_remove
+	g_source_remove
 };
 
 GaimEventLoopUiOps *
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/gtkmain.c
--- a/pidgin/gtkmain.c	Mon Feb 19 04:55:48 2007 +0000
+++ b/pidgin/gtkmain.c	Fri Feb 23 05:16:50 2007 +0000
@@ -242,7 +242,7 @@
 
 #ifndef _WIN32
 	/* use the nice PNG icon for all the windows */
-	icon_path = g_build_filename(DATADIR, "pixmaps", "gaim", "icons", "online.png", NULL);
+	icon_path = g_build_filename(DATADIR, "pixmaps", "pidgin", "icons", "window-icon.png", NULL);
 	icon = gdk_pixbuf_new_from_file(icon_path, NULL);
 	g_free(icon_path);
 	if (icon) {
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/gtkstatusbox.c
--- a/pidgin/gtkstatusbox.c	Mon Feb 19 04:55:48 2007 +0000
+++ b/pidgin/gtkstatusbox.c	Fri Feb 23 05:16:50 2007 +0000
@@ -1168,6 +1168,16 @@
 								     icon_size, "PidginStatusBox");
 	status_box->connecting_pixbufs[3] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_ANIMATION_CONNECT3,
 								     icon_size, "PidginStatusBox");
+	status_box->connecting_pixbufs[4] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_ANIMATION_CONNECT4,
+								     icon_size, "PidginStatusBox");
+	status_box->connecting_pixbufs[5] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_ANIMATION_CONNECT5,
+								     icon_size, "PidginStatusBox");
+	status_box->connecting_pixbufs[6] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_ANIMATION_CONNECT6,
+								     icon_size, "PidginStatusBox");
+	status_box->connecting_pixbufs[7] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_ANIMATION_CONNECT7,
+								     icon_size, "PidginStatusBox");
+	status_box->connecting_pixbufs[8] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_ANIMATION_CONNECT8,
+								     icon_size, "PidginStatusBox");
 
 	if (status_box->typing_pixbufs[0] != NULL)
 		gdk_pixbuf_unref(status_box->typing_pixbufs[0]);
@@ -1187,6 +1197,8 @@
 								     icon_size, "PidginStatusBox");
 	status_box->typing_pixbufs[3] =  gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_ANIMATION_TYPING3,
 								     icon_size, "PidginStatusBox");
+	status_box->typing_pixbufs[4] =  gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_ANIMATION_TYPING4,
+								     icon_size, "PidginStatusBox");
 }
 
 static void account_enabled_cb(GaimAccount *acct, PidginStatusBox *status_box) {
@@ -2043,7 +2055,7 @@
 {
 	if (!status_box)
 		return;
-	if (status_box->connecting_index == 3)
+	if (status_box->connecting_index == 8)
 		status_box->connecting_index = 0;
 	else
 		status_box->connecting_index++;
@@ -2053,7 +2065,7 @@
 static void
 pidgin_status_box_pulse_typing(PidginStatusBox *status_box)
 {
-	if (status_box->typing_index == 3)
+	if (status_box->typing_index == 4)
 		status_box->typing_index = 0;
 	else
 		status_box->typing_index++;
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/gtkstatusbox.h
--- a/pidgin/gtkstatusbox.h	Mon Feb 19 04:55:48 2007 +0000
+++ b/pidgin/gtkstatusbox.h	Fri Feb 23 05:16:50 2007 +0000
@@ -108,9 +108,9 @@
 
 	GdkPixbuf *error_pixbuf;
 	int connecting_index;
-	GdkPixbuf *connecting_pixbufs[4];
+	GdkPixbuf *connecting_pixbufs[9];
 	int typing_index;
-	GdkPixbuf *typing_pixbufs[4];
+	GdkPixbuf *typing_pixbufs[6];
 
 	gboolean network_available;
 	gboolean connecting;
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/Makefile.am
--- a/pidgin/pixmaps/Makefile.am	Mon Feb 19 04:55:48 2007 +0000
+++ b/pidgin/pixmaps/Makefile.am	Fri Feb 23 05:16:50 2007 +0000
@@ -1,4 +1,4 @@
-SUBDIRS = animations buddy_icons dialogs emblems emotes protocols status toolbar
+SUBDIRS = animations buddy_icons dialogs emblems emotes protocols status toolbar tray
 
 EXTRA_DIST = \
 		about_menu.png			\
@@ -8,7 +8,7 @@
 		change-fgcolor-small.png	\
 		connect.png			\
 		edit.png			\
-		gaim.png			\
+		pidgin.png			\
 		gaim.svg			\
 		info.png 			\
 		insert-image.png		\
@@ -65,12 +65,13 @@
 gaimbuttonpixdir = $(datadir)/pixmaps/gaim/buttons
 gaimbuttonpix_DATA = about_menu.png accounts.png change-bgcolor-small.png change-fgcolor-small.png edit.png info.png insert-image-small.png insert-link-small.png insert-smiley-small.png pause.png text_bigger.png text_normal.png text_smaller.png send-im.png
 
-gaimiconpixdir = $(datadir)/pixmaps/gaim/icons
-gaimiconpix_DATA = away.png connect.png msgpend.png offline.png online.png msgunread.png stock_connect_16.png stock_disconnect_16.png
+gaimiconpixdir = $(datadir)/pixmaps/pidgin/icons
+gaimiconpix_DATA = window-icon.png
 
 gaimdistpixdir = $(datadir)/pixmaps/gaim
 gaimdistpix_DATA = logo.png tb_drag_arrow_down.xpm tb_drag_arrow_left.xpm tb_drag_arrow_right.xpm tb_drag_arrow_up.xpm typed.png typing.png status-online.png status-offline.png status-away.png status-invisible.png status-typing0.png status-typing1.png status-typing2.png status-typing3.png status-connect0.png status-connect1.png status-connect2.png status-connect3.png phone.png insert-image.png
 
+
 distpixmapdir = $(datadir)/pixmaps
-distpixmap_DATA = gaim.png gaim.svg
+distpixmap_DATA = pidgin.png gaim.svg
 
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/animations/16/Makefile.am
--- a/pidgin/pixmaps/animations/16/Makefile.am	Mon Feb 19 04:55:48 2007 +0000
+++ b/pidgin/pixmaps/animations/16/Makefile.am	Fri Feb 23 05:16:50 2007 +0000
@@ -2,10 +2,16 @@
 		connect1.png \
 		connect2.png \
 		connect3.png \
+		connect4.png \
+		connect5.png \
+		connect6.png \
+		connect7.png \
+		connect8.png
 		typing0.png \
 		typing1.png \
 		typing2.png \
-		typing3.png
+		typing3.png \
+		typing4.png
 
 pidginanimpixdir = $(datadir)/pixmaps/pidgin/animations/16
 pidginanimpix_DATA = $(EXTRA_DIST)
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/animations/16/connect0.png
Binary file pidgin/pixmaps/animations/16/connect0.png has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/animations/16/connect1.png
Binary file pidgin/pixmaps/animations/16/connect1.png has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/animations/16/connect2.png
Binary file pidgin/pixmaps/animations/16/connect2.png has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/animations/16/connect3.png
Binary file pidgin/pixmaps/animations/16/connect3.png has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/animations/16/connect4.png
Binary file pidgin/pixmaps/animations/16/connect4.png has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/animations/16/connect5.png
Binary file pidgin/pixmaps/animations/16/connect5.png has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/animations/16/connect6.png
Binary file pidgin/pixmaps/animations/16/connect6.png has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/animations/16/connect7.png
Binary file pidgin/pixmaps/animations/16/connect7.png has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/animations/16/connect8.png
Binary file pidgin/pixmaps/animations/16/connect8.png has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/animations/16/connect9.png
Binary file pidgin/pixmaps/animations/16/connect9.png has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/animations/16/typing0.png
Binary file pidgin/pixmaps/animations/16/typing0.png has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/animations/16/typing1.png
Binary file pidgin/pixmaps/animations/16/typing1.png has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/animations/16/typing2.png
Binary file pidgin/pixmaps/animations/16/typing2.png has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/animations/16/typing3.png
Binary file pidgin/pixmaps/animations/16/typing3.png has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/animations/16/typing4.png
Binary file pidgin/pixmaps/animations/16/typing4.png has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/emblems/16/blocked.png
Binary file pidgin/pixmaps/emblems/16/blocked.png has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/emblems/16/female.png
Binary file pidgin/pixmaps/emblems/16/female.png has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/emblems/16/voice.png
Binary file pidgin/pixmaps/emblems/16/voice.png has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/pidgin.png
Binary file pidgin/pixmaps/pidgin.png has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/status/16/Makefile.am
--- a/pidgin/pixmaps/status/16/Makefile.am	Mon Feb 19 04:55:48 2007 +0000
+++ b/pidgin/pixmaps/status/16/Makefile.am	Fri Feb 23 05:16:50 2007 +0000
@@ -15,7 +15,8 @@
 		message-pending.png \
 		offline.png \
 		operator.png \
-		person.png
+		person.png \
+		voice.png
 
 pidginstatuspixdir = $(datadir)/pixmaps/pidgin/status/16
 
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/status/16/message-pending.png
Binary file pidgin/pixmaps/status/16/message-pending.png has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/status/16/voice.png
Binary file pidgin/pixmaps/status/16/voice.png has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/toolbar/16/message-new.png
Binary file pidgin/pixmaps/toolbar/16/message-new.png has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/tray/16/Makefile.am
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pixmaps/tray/16/Makefile.am	Fri Feb 23 05:16:50 2007 +0000
@@ -0,0 +1,16 @@
+TRAY_ICONS =	tray-away.png \
+		tray-busy.png \
+		tray-extended-away.png \
+		tray-message.png \
+		tray-offline.png \
+		tray-online.png
+
+EXTRA_DIST = 	tray-away.ico \
+		tray-busy.ico \
+		tray-extended-away.ico \
+		tray-message.ico \
+		tray-offline.ico \
+		tray-online.ico 
+
+pidgintraypixdir = $(datadir)/pixmaps/pidgin/tray/16
+pidgintraypix_DATA = $(TRAY_ICONS)
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/tray/16/tray-away.ico
Binary file pidgin/pixmaps/tray/16/tray-away.ico has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/tray/16/tray-away.png
Binary file pidgin/pixmaps/tray/16/tray-away.png has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/tray/16/tray-busy.ico
Binary file pidgin/pixmaps/tray/16/tray-busy.ico has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/tray/16/tray-busy.png
Binary file pidgin/pixmaps/tray/16/tray-busy.png has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/tray/16/tray-extended-away.ico
Binary file pidgin/pixmaps/tray/16/tray-extended-away.ico has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/tray/16/tray-extended-away.png
Binary file pidgin/pixmaps/tray/16/tray-extended-away.png has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/tray/16/tray-message.ico
Binary file pidgin/pixmaps/tray/16/tray-message.ico has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/tray/16/tray-message.png
Binary file pidgin/pixmaps/tray/16/tray-message.png has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/tray/16/tray-offline.ico
Binary file pidgin/pixmaps/tray/16/tray-offline.ico has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/tray/16/tray-offline.png
Binary file pidgin/pixmaps/tray/16/tray-offline.png has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/tray/16/tray-online.ico
Binary file pidgin/pixmaps/tray/16/tray-online.ico has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/tray/16/tray-online.png
Binary file pidgin/pixmaps/tray/16/tray-online.png has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/tray/Makefile.am
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pixmaps/tray/Makefile.am	Fri Feb 23 05:16:50 2007 +0000
@@ -0,0 +1,1 @@
+SUBDIRS = 16
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/pixmaps/window-icon.png
Binary file pidgin/pixmaps/window-icon.png has changed
diff -r fc981ec147a6 -r f344b5cc2fc9 pidgin/plugins/perl/common/GtkFt.xs
--- a/pidgin/plugins/perl/common/GtkFt.xs	Mon Feb 19 04:55:48 2007 +0000
+++ b/pidgin/plugins/perl/common/GtkFt.xs	Fri Feb 23 05:16:50 2007 +0000
@@ -4,11 +4,11 @@
 PROTOTYPES: ENABLE
 
 void
-gaim_set_gtkxfer_dialog(dialog)
+pidgin_set_xfer_dialog(dialog)
 	Pidgin::Xfer::Dialog dialog
 
 Pidgin::Xfer::Dialog
-gaim_get_gtkxfer_dialog()
+pidgin_get_xfer_dialog()
 
 MODULE = Pidgin::Xfer  PACKAGE = Pidgin::Xfer::Dialog  PREFIX = pidginxfer_dialog_
 PROTOTYPES: ENABLE