5 files changed, 18 insertions, 20 deletions
diff --git a/protocols/yahoo/libyahoo2.c b/protocols/yahoo/libyahoo2.c
index 63302908..da427279 100644
--- a/protocols/yahoo/libyahoo2.c
+++ b/protocols/yahoo/libyahoo2.c
@@ -120,11 +120,6 @@ int yahoo_log_message(char *fmt, ...)
 	return YAHOO_CALLBACK(ext_yahoo_log) ("%s", out);
 }
 
-int yahoo_connect(char *host, int port)
-{
-	return YAHOO_CALLBACK(ext_yahoo_connect) (host, port);
-}
-
 static enum yahoo_log_level log_level = YAHOO_LOG_NONE;
 
 enum yahoo_log_level yahoo_get_log_level()
@@ -3580,10 +3575,12 @@ void *yahoo_get_fd(int id)
 		return yid->fd;
 }
 
+#if 0
 void yahoo_send_buzz(int id, const char *from, const char *who)
 {
 	yahoo_send_im(id, from, who, "<ding>", 1, 0);
 }
+#endif
 
 void yahoo_send_im(int id, const char *from, const char *who, const char *what,
 	int utf8, int picture)
@@ -3725,6 +3722,7 @@ void yahoo_logoff(int id)
 
 }
 
+#if 0
 void yahoo_get_list(int id)
 {
 	struct yahoo_input_data *yid =
@@ -3744,6 +3742,7 @@ void yahoo_get_list(int id)
 		yahoo_packet_free(pkt);
 	}
 }
+#endif
 
 static void _yahoo_http_connected(int id, void *fd, int error, void *data)
 {
@@ -3862,7 +3861,6 @@ void yahoo_set_yab(int id, struct yab *yab)
 	yahoo_http_post(yid->yd->client_id, url, buff, size,
 		_yahoo_http_post_connected, yad);
 }
-#endif
 
 void yahoo_set_identity_status(int id, const char *identity, int active)
 {
@@ -3902,6 +3900,7 @@ void yahoo_refresh(int id)
 		yahoo_packet_free(pkt);
 	}
 }
+#endif
 
 void yahoo_keepalive(int id)
 {
@@ -3919,6 +3918,7 @@ void yahoo_keepalive(int id)
 	yahoo_packet_free(pkt);
 }
 
+#if 0
 void yahoo_chat_keepalive(int id)
 {
 	struct yahoo_input_data *yid =
@@ -3936,6 +3936,7 @@ void yahoo_chat_keepalive(int id)
 	yahoo_send_packet(yid, pkt, 0);
 	yahoo_packet_free(pkt);
 }
+#endif
 
 void yahoo_add_buddy(int id, const char *who, const char *group,
 	const char *msg)
@@ -4028,6 +4029,7 @@ void yahoo_confirm_buddy(int id, const char *who, int reject, const char *msg)
 	yahoo_packet_free(pkt);
 }
 
+#if 0
 void yahoo_ignore_buddy(int id, const char *who, int unignore)
 {
 	struct yahoo_input_data *yid =
@@ -4074,6 +4076,7 @@ void yahoo_stealth_buddy(int id, const char *who, int unstealth)
 	yahoo_send_packet(yid, pkt, 0);
 	yahoo_packet_free(pkt);
 }
+#endif
 
 void yahoo_change_buddy_group(int id, const char *who, const char *old_group,
 	const char *new_group)
@@ -4102,6 +4105,7 @@ void yahoo_change_buddy_group(int id, const char *who, const char *old_group,
 	yahoo_packet_free(pkt);
 }
 
+#if 0
 void yahoo_group_rename(int id, const char *old_group, const char *new_group)
 {
 	struct yahoo_input_data *yid =
@@ -4153,6 +4157,7 @@ void yahoo_conference_addinvite(int id, const char *from, const char *who,
 
 	yahoo_packet_free(pkt);
 }
+#endif
 
 void yahoo_conference_invite(int id, const char *from, YList *who,
 	const char *room, const char *msg)
diff --git a/protocols/yahoo/yahoo.c b/protocols/yahoo/yahoo.c
index 8b3b0c05..608e124b 100644
--- a/protocols/yahoo/yahoo.c
+++ b/protocols/yahoo/yahoo.c
@@ -569,10 +569,6 @@ void ext_yahoo_got_buddies( int id, YList *buds )
 	}
 }
 
-void ext_yahoo_got_ignore( int id, YList *igns )
-{
-}
-
 void ext_yahoo_got_identities( int id, YList *ids )
 {
 }
@@ -813,13 +809,6 @@ void ext_yahoo_got_buddy_change_group( int id, const char *me, const char *who,
 	imcb_add_buddy( ic, who, new_group );
 }
 
-/* Because we don't want asynchronous connects in BitlBee, and because
-   libyahoo doesn't seem to use this one anyway, this one is now defunct. */
-int ext_yahoo_connect(const char *host, int port)
-{
-	return -1;
-}
-
 static void byahoo_accept_conf( void *data )
 {
 	struct byahoo_conf_invitation *inv = data;
diff --git a/protocols/yahoo/yahoo2.h b/protocols/yahoo/yahoo2.h
index 589aaa5a..b9e6665b 100644
--- a/protocols/yahoo/yahoo2.h
+++ b/protocols/yahoo/yahoo2.h
@@ -120,7 +120,7 @@ extern "C" {
 /* utf8 is whether msg is a utf8 string or not. */
 	void yahoo_send_im(int id, const char *from, const char *who,
 		const char *msg, int utf8, int picture);
-	void yahoo_send_buzz(int id, const char *from, const char *who);
+//	void yahoo_send_buzz(int id, const char *from, const char *who);
 /* if type is true, send typing notice, else send stopped typing notice */
 	void yahoo_send_typing(int id, const char *from, const char *who,
 		int typ);
diff --git a/protocols/yahoo/yahoo2_callbacks.h b/protocols/yahoo/yahoo2_callbacks.h
index 0dccf188..0a3aab46 100644
--- a/protocols/yahoo/yahoo2_callbacks.h
+++ b/protocols/yahoo/yahoo2_callbacks.h
@@ -112,7 +112,7 @@ struct yahoo_callbacks {
  * 	id   - the id that identifies the server connection
  * 	igns - the ignore list
  */
-	void YAHOO_CALLBACK_TYPE(ext_yahoo_got_ignore) (int id, YList *igns);
+//	void YAHOO_CALLBACK_TYPE(ext_yahoo_got_ignore) (int id, YList *igns);
 
 /*
  * Name: ext_yahoo_got_identities
@@ -677,7 +677,7 @@ struct yahoo_callbacks {
  * Returns:
  * 	a unix file descriptor to the socket
  */
-	int YAHOO_CALLBACK_TYPE(ext_yahoo_connect) (const char *host, int port);
+//	int YAHOO_CALLBACK_TYPE(ext_yahoo_connect) (const char *host, int port);
 
 /*
  * Name: ext_yahoo_connect_async
diff --git a/protocols/yahoo/yahoo_httplib.c b/protocols/yahoo/yahoo_httplib.c
index 6bb8923d..fd63d507 100644
--- a/protocols/yahoo/yahoo_httplib.c
+++ b/protocols/yahoo/yahoo_httplib.c
@@ -61,6 +61,7 @@ extern struct yahoo_callbacks *yc;
 
 extern enum yahoo_log_level log_level;
 
+#if 0
 int yahoo_tcp_readline(char *ptr, int maxlen, void *fd)
 {
 	int n, rc;
@@ -92,6 +93,7 @@ int yahoo_tcp_readline(char *ptr, int maxlen, void *fd)
 	*ptr = 0;
 	return (n);
 }
+#endif
 
 static int url_to_host_port_path(const char *url,
 	char *host, int *port, char *path, int *ssl)
@@ -182,6 +184,7 @@ char *yahoo_urlencode(const char *instr)
 	return (str);
 }
 
+#if 0
 char *yahoo_urldecode(const char *instr)
 {
 	int ipos = 0, bpos = 0;
@@ -278,6 +281,7 @@ char *yahoo_xmldecode(const char *instr)
 
 	return (str);
 }
+#endif
 
 typedef void (*http_connected) (int id, void *fd, int error);