[Ayttm-commits] CVS: ayttm/modules/yahoo2 yahoo.c,1.115,1.116

[Siddhesh P. <sid...@us...>]

Update of /cvsroot/ayttm/ayttm/modules/yahoo2
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12886/modules/yahoo2

Modified Files:
	yahoo.c 
Log Message:

 * MSN: Added missing headers in Makefile.am
 * MSN: Response to FQY (Federated Queries)
 * MSN: Clean up. Third party messenger buddies have type 1 << 5.
 * CORE: Replaced status_pixmap with status_pixbuf in irc and aim-oscar
 * CORE: Removed deprecated icq, aim-toc and icq-toc from build
 * CORE: Updated plugin writing howto with status_pixbuf instead of 
 status_pixmap
 * CORE: Updated messages in .po files
 * CORE: Fixed some build warnings 
 * SMTP: Fixed build failure. It still won't work though


Index: yahoo.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/yahoo2/yahoo.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- yahoo.c	6 Sep 2009 13:36:28 -0000	1.115
+++ yahoo.c	6 Sep 2009 18:23:08 -0000	1.116
@@ -2995,7 +2995,7 @@
 	yahoo_icon_sms = gdk_pixbuf_new_from_xpm_data((const char **)yahoo_sms_xpm);
 }
 
-static const void *eb_yahoo_get_status_pixbuf(eb_account *ea)
+static void *eb_yahoo_get_status_pixbuf(eb_account *ea)
 {
 	eb_yahoo_account_data *yad = ea->protocol_account_data;
 
@@ -3014,23 +3014,6 @@
 		return (void *)yahoo_icon_online;
 }
 
-static const char **eb_yahoo_get_status_pixmap(eb_account * ea)
-{
-	eb_yahoo_account_data *yad;
-
-	yad = ea->protocol_account_data;
-
-	if(yad->away < 0)
-		WARNING(("%s->away is %d", ea->handle, yad->away));
-
-	/* Don't translate this string */
-	if (yad->status_message && !strcmp(yad->status_message, "I'm on SMS"))
-		return yahoo_sms_xpm;
-	else if (yad->away )
-		return yahoo_away_xpm;
-	else
-		return yahoo_online_xpm;
-}
 
 static const char *eb_yahoo_get_status_string(eb_account * ea)
 {
@@ -3715,7 +3698,6 @@
 	sc->new_account 		= eb_yahoo_new_account;
 
 	sc->get_status_string 		= eb_yahoo_get_status_string;
-	sc->get_status_pixmap 		= eb_yahoo_get_status_pixmap;
 	sc->get_status_pixbuf 		= eb_yahoo_get_status_pixbuf;
 
 	sc->set_idle 			= eb_yahoo_set_idle;