Changeset 509cf60

Timestamp:

2012-10-20T00:02:45Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

3cd37d7

Parents:

6042a54

Message:

Some more removals. Using ifdefs instead of read deletions in Yahoo! dir to
not make merges too complicated (although upstream really seems dead at this
point :-/).

Location:

protocols

Files:

• msn/msn.h (modified) (1 diff)
• msn/msn_util.c (modified) (1 diff)
• yahoo/libyahoo2.c (modified) (17 diffs)

protocols/msn/msn.h

@@ -242 +242 @@
 
 /* msn_util.c */
-int msn_logged_in( struct im_connection *ic );
 int msn_buddy_list_add( struct im_connection *ic, msn_buddy_flags_t list, const char *who, const char *realname_, const char *group );
 int msn_buddy_list_remove( struct im_connection *ic, msn_buddy_flags_t list, const char *who, const char *group );

protocols/msn/msn_util.c

@@ -29 +29 @@
 #include "soap.h"
 #include <ctype.h>
-
-int msn_logged_in( struct im_connection *ic )
-{
-        imcb_connected( ic );
-        
-        return( 0 );
-}
 
 static char *adlrml_entry( const char *handle_, msn_buddy_flags_t list )

protocols/yahoo/libyahoo2.c

@@ -374 +374 @@
 */
 
+#if 0
 static struct yahoo_input_data *find_input_by_id_and_webcam_user(int id,
         const char *who)
@@ -390 +391 @@
         return NULL;
 }
+#endif
 
 static struct yahoo_input_data *find_input_by_id_and_type(int id,
@@ -2640 +2642 @@
 }
 
+#if 0
 static struct yab *yahoo_yab_read(unsigned char *d, int len)
 {
@@ -2790 +2793 @@
         return yab;
 }
+#endif
 
 static char *yahoo_getwebcam_master(struct yahoo_input_data *yid)
@@ -3097 +3101 @@
 }
 
+#if 0
 static void yahoo_process_yab_connection(struct yahoo_input_data *yid, int over)
 {
@@ -3156 +3161 @@
                         yd->buddies);
 }
+#endif
 
 static void yahoo_process_search_connection(struct yahoo_input_data *yid,
@@ -3411 +3417 @@
         int over) = {
 yahoo_process_pager_connection, yahoo_process_ft_connection,
-                yahoo_process_yab_connection,
+                NULL, /*yahoo_process_yab_connection, */
                 yahoo_process_webcam_master_connection,
                 yahoo_process_webcam_connection,
@@ -3755 +3761 @@
 }
 
+#if 0
 /* FIXME Get address book from address.yahoo.com instead */
 void yahoo_get_yab(int id)
@@ -3856 +3863 @@
                 _yahoo_http_post_connected, yad);
 }
+#endif
 
 void yahoo_set_identity_status(int id, const char *identity, int active)
@@ -4287 +4295 @@
 }
 
+#if 0
 void yahoo_get_chatrooms(int id, int chatroomid)
 {
@@ -4729 +4738 @@
         /* Not Implemented */
 }
+#endif
 
 /* File Transfer */
@@ -4756 +4766 @@
 };
 
+#if 0
 static char *yahoo_get_random(void)
 {
@@ -4785 +4796 @@
         return strdup(out);
 }
+#endif
 
 static int _are_same_id(const void *sfd1, const void *id)
@@ -5165 +5177 @@
 }
 
+#if 0
 void yahoo_send_file(int id, const char *who, const char *msg,
         const char *name, unsigned long size,
@@ -5243 +5256 @@
                 yahoo_remove_active_transfer(sfd);
 }
+#endif
 
 static void yahoo_process_ft_connection(struct yahoo_input_data *yid, int over)
@@ -5356 +5370 @@
 /* End File Transfer */
 
+#if 0
 enum yahoo_status yahoo_current_status(int id)
 {
@@ -5405 +5420 @@
         return NULL;
 }
+#endif
 
 const char *yahoo_get_profile_url(void)