# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1191937271 0
# Node ID a2b2fc59b57178c7e2971388df65cfdf1acc43bc
# Parent  58b9a33968e10fe14078adff8d48eb258ccad7f4# Parent  9da2ac85ce813bd690eb63a663f6681acda801f6
merge of '067c06f2c33e5371796629696a9aad6afa4e9ead'
     and 'e7a18c70a00a0534e1e6f7956970e10d6d0b69ec'

diff -r 9da2ac85ce81 -r a2b2fc59b571 libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Tue Oct 09 07:37:26 2007 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Tue Oct 09 13:41:11 2007 +0000
@@ -1721,7 +1721,6 @@
 {
 	PurpleConnection *gc;
 	PurpleAccount *account;
-	PurplePresence *presence;
 	struct buddyinfo *bi;
 	time_t time_idle = 0, signon = 0;
 	int type = 0;
@@ -1734,7 +1733,6 @@
 
 	gc = od->gc;
 	account = purple_connection_get_account(gc);
-	presence = purple_account_get_presence(account);
 
 	va_start(ap, fr);
 	info = va_arg(ap, aim_userinfo_t *);
diff -r 9da2ac85ce81 -r a2b2fc59b571 pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Tue Oct 09 07:37:26 2007 +0000
+++ b/pidgin/gtkblist.c	Tue Oct 09 13:41:11 2007 +0000
@@ -4347,7 +4347,6 @@
                                 gpointer user_data)
 {
 	PurpleAccount *account;
-	PurpleStatusType *status_type;
 	gchar *escaped, *text;
 	GtkWidget *button, *label, *image, *hbox;
 	GdkPixbuf *pixbuf;
@@ -4362,8 +4361,8 @@
 	hbox = gtk_hbox_new(FALSE, 6);
 
 	/* Create the icon */
-	if ((status_type = purple_account_get_status_type_with_primitive(account,
-							PURPLE_STATUS_OFFLINE))) {
+	if (purple_account_get_status_type_with_primitive(account,
+							PURPLE_STATUS_OFFLINE) != NULL) {
 		pixbuf = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_SMALL);
 		if (pixbuf != NULL) {
 			image = gtk_image_new_from_pixbuf(pixbuf);