im.pidgin.pidgin.2.2.2: 1c3546a40030afadd1a63a06c540082ba1acb320

[lschiere at pidgin.im]

-----------------------------------------------------------------
Revision: 1c3546a40030afadd1a63a06c540082ba1acb320
Ancestor: d00e8eecf3b9bb711a6557347853d72428cde777
Author: lschiere at pidgin.im
Date: 2007-10-19T18:24:58
Branch: im.pidgin.pidgin.2.2.2

Modified files:
        libpurple/protocols/oscar/oscar.c pidgin/gtkblist.c

ChangeLog: 

applied changes from 83245b7ca93e546927c19472b74cf4dff6d1a96b
             through c8fe7b18f7d5a479e1de5001268c686e5426049d

applied changes from c8fe7b18f7d5a479e1de5001268c686e5426049d
             through 067c06f2c33e5371796629696a9aad6afa4e9ead

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/oscar.c	802a4c029208b50d5ffab805d7306a80a6286210
+++ libpurple/protocols/oscar/oscar.c	8df1c7a8fd7714a246180992e01a7bda48f43a61
@@ -1721,7 +1721,6 @@ static int purple_parse_oncoming(OscarDa
 {
 	PurpleConnection *gc;
 	PurpleAccount *account;
-	PurplePresence *presence;
 	struct buddyinfo *bi;
 	time_t time_idle = 0, signon = 0;
 	int type = 0;
@@ -1734,7 +1733,6 @@ static int purple_parse_oncoming(OscarDa
 
 	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 *);
============================================================
--- pidgin/gtkblist.c	1a17e62a64935dca9768f531e07c4418aafaac8d
+++ pidgin/gtkblist.c	459e5885e9a01a7944e98c4366911f9ff397d6fb
@@ -4065,7 +4065,6 @@ create_connection_error_buttons(gpointer
                                 gpointer user_data)
 {
 	PurpleAccount *account;
-	PurpleStatusType *status_type;
 	gchar *escaped, *text;
 	GtkWidget *button, *label, *image, *hbox;
 	GdkPixbuf *pixbuf;
@@ -4080,8 +4079,8 @@ create_connection_error_buttons(gpointer
 	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);