Mercurial > pidgin.yaz

changeset 20331:233c423d40d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
applied changes from 83245b7ca93e546927c19472b74cf4dff6d1a96b through c8fe7b18f7d5a479e1de5001268c686e5426049d applied changes from c8fe7b18f7d5a479e1de5001268c686e5426049d through 067c06f2c33e5371796629696a9aad6afa4e9ead
author Luke Schierer <lschiere@pidgin.im>
date Fri, 19 Oct 2007 18:24:58 +0000
parents 4ab7551d9626
children 3a9709bfde65
files libpurple/protocols/oscar/oscar.c pidgin/gtkblist.c
diffstat 2 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/oscar/oscar.c	Fri Oct 19 18:23:28 2007 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Fri Oct 19 18:24:58 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 *);
--- a/pidgin/gtkblist.c	Fri Oct 19 18:23:28 2007 +0000
+++ b/pidgin/gtkblist.c	Fri Oct 19 18:24:58 2007 +0000
@@ -4065,7 +4065,6 @@
                                 gpointer user_data)
 {
 	PurpleAccount *account;
-	PurpleStatusType *status_type;
 	gchar *escaped, *text;
 	GtkWidget *button, *label, *image, *hbox;
 	GdkPixbuf *pixbuf;
@@ -4080,8 +4079,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);