[Ayttm-commits] CVS: ayttm/modules/jabber jabber.c,1.59,1.60

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

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

Modified Files:
	jabber.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: jabber.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/jabber/jabber.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- jabber.c	6 Sep 2009 13:36:27 -0000	1.59
+++ jabber.c	6 Sep 2009 18:23:08 -0000	1.60
@@ -654,13 +654,13 @@
 static GdkPixbuf *jabber_icon_online = NULL;
 static GdkPixbuf *jabber_icon_away = NULL;
 
-void eb_jabber_init_pixbufs()
+static void eb_jabber_init_pixbufs()
 {
 	jabber_icon_online = gdk_pixbuf_new_from_xpm_data((const char **)jabber_online_xpm);
 	jabber_icon_away = gdk_pixbuf_new_from_xpm_data((const char **)jabber_away_xpm);
 }
 
-static const void *eb_jabber_get_status_pixbuf(eb_account *account)
+static void *eb_jabber_get_status_pixbuf(eb_account *account)
 {
 	eb_jabber_account_data *jad = account->protocol_account_data;
 
@@ -673,18 +673,6 @@
 		return (void *)jabber_icon_away;
 }
 
-static const char ** eb_jabber_get_status_pixmap( eb_account * account)
-{
-	eb_jabber_account_data * jad;
-	
-	jad = account->protocol_account_data;
-	
-	if(jad->status == JABBER_ONLINE)
-		return jabber_online_xpm;
-	else
-		return jabber_away_xpm;
-}
-
 static const char *eb_jabber_get_status_string(eb_account *account)
 {
 	eb_jabber_account_data *jad = account->protocol_account_data;
@@ -912,7 +900,6 @@
 	sc->new_account = eb_jabber_new_account;
 	sc->get_status_string = eb_jabber_get_status_string;
 	sc->get_state_string = eb_jabber_get_state_string;
-	sc->get_status_pixmap = eb_jabber_get_status_pixmap;
 	sc->get_status_pixbuf = eb_jabber_get_status_pixbuf;
 	sc->set_idle = eb_jabber_set_idle;
 	sc->set_away = eb_jabber_set_away;