# HG changeset patch # User Mark Doliner # Date 1084691996 0 # Node ID 80b4c956d7aecfbcc60679ca858de245547d867b # Parent dfa1cd98d1c7041da0a3d7759e5aa86b28c59774 [gaim-migrate @ 9722] Remove the prpl callbacks set_dir, get_dir and dir_search. These 1) Were not called by anything 2) Are AIM-centric 3) Should be Account Actions, if implemented committer: Tailor Script diff -r dfa1cd98d1c7 -r 80b4c956d7ae src/protocols/gg/gg.c --- a/src/protocols/gg/gg.c Sun May 16 06:50:45 2004 +0000 +++ b/src/protocols/gg/gg.c Sun May 16 07:19:56 2004 +0000 @@ -1,6 +1,6 @@ /* * gaim - Gadu-Gadu Protocol Plugin - * $Id: gg.c 9665 2004-05-06 22:38:01Z thekingant $ + * $Id: gg.c 9722 2004-05-16 07:19:56Z thekingant $ * * Copyright (C) 2001 Arkadiusz Mi¶kiewicz * @@ -1304,6 +1304,7 @@ } #endif +#if 0 static void agg_dir_search(GaimConnection *gc, const char *first, const char *middle, const char *last, const char *maiden, const char *city, const char *state, const char *country, const char *email) @@ -1353,6 +1354,7 @@ return; } } +#endif static void agg_change_passwd(GaimConnection *gc, const char *old, const char *new) { @@ -1551,9 +1553,6 @@ agg_get_info, agg_set_away, NULL, - NULL, - agg_dir_search, - NULL, agg_change_passwd, agg_add_buddy, agg_add_buddies, diff -r dfa1cd98d1c7 -r 80b4c956d7ae src/protocols/irc/irc.c --- a/src/protocols/irc/irc.c Sun May 16 06:50:45 2004 +0000 +++ b/src/protocols/irc/irc.c Sun May 16 07:19:56 2004 +0000 @@ -559,9 +559,6 @@ irc_set_away, NULL, NULL, - NULL, - NULL, - NULL, irc_add_buddy, NULL, irc_remove_buddy, diff -r dfa1cd98d1c7 -r 80b4c956d7ae src/protocols/jabber/jabber.c --- a/src/protocols/jabber/jabber.c Sun May 16 06:50:45 2004 +0000 +++ b/src/protocols/jabber/jabber.c Sun May 16 07:19:56 2004 +0000 @@ -1309,9 +1309,6 @@ jabber_send_typing, jabber_buddy_get_info, jabber_presence_send, - NULL, - NULL, - NULL, jabber_idle_set, NULL, jabber_roster_add_buddy, diff -r dfa1cd98d1c7 -r 80b4c956d7ae src/protocols/msn/msn.c --- a/src/protocols/msn/msn.c Sun May 16 06:50:45 2004 +0000 +++ b/src/protocols/msn/msn.c Sun May 16 07:19:56 2004 +0000 @@ -1645,9 +1645,6 @@ msn_send_typing, msn_get_info, msn_set_away, - NULL, - NULL, - NULL, msn_set_idle, NULL, msn_add_buddy, diff -r dfa1cd98d1c7 -r 80b4c956d7ae src/protocols/napster/napster.c --- a/src/protocols/napster/napster.c Sun May 16 06:50:45 2004 +0000 +++ b/src/protocols/napster/napster.c Sun May 16 07:19:56 2004 +0000 @@ -584,9 +584,6 @@ NULL, NULL, NULL, - NULL, - NULL, - NULL, nap_add_buddy, nap_add_buddies, nap_remove_buddy, diff -r dfa1cd98d1c7 -r 80b4c956d7ae src/protocols/novell/novell.c --- a/src/protocols/novell/novell.c Sun May 16 06:50:45 2004 +0000 +++ b/src/protocols/novell/novell.c Sun May 16 07:19:56 2004 +0000 @@ -3308,9 +3308,6 @@ novell_send_typing, novell_get_info, novell_set_away, - NULL, /* set_dir */ - NULL, /* get_dir */ - NULL, /* dir_search */ novell_set_idle, NULL, /* change pwd */ novell_add_buddy, diff -r dfa1cd98d1c7 -r 80b4c956d7ae src/protocols/oscar/oscar.c --- a/src/protocols/oscar/oscar.c Sun May 16 06:50:45 2004 +0000 +++ b/src/protocols/oscar/oscar.c Sun May 16 07:19:56 2004 +0000 @@ -4665,6 +4665,7 @@ aim_locate_getinfoshort(od->sess, name, 0x00000003); } +#if 0 static void oscar_set_dir(GaimConnection *gc, const char *first, const char *middle, const char *last, const char *maiden, const char *city, const char *state, const char *country, int web) { /* XXX - some of these things are wrong, but i'm lazy */ @@ -4672,6 +4673,7 @@ aim_locate_setdirinfo(od->sess, first, middle, last, maiden, NULL, NULL, city, state, NULL, 0, web); } +#endif static void oscar_set_idle(GaimConnection *gc, int time) { OscarData *od = (OscarData *)gc->proto_data; @@ -4872,13 +4874,6 @@ aim_im_warn(od->sess, od->conn, name, anon ? AIM_WARN_ANON : 0); } -static void oscar_dir_search(GaimConnection *gc, const char *first, const char *middle, const char *last, - const char *maiden, const char *city, const char *state, const char *country, const char *email) { - OscarData *od = (OscarData *)gc->proto_data; - if (strlen(email)) - aim_search_address(od->sess, od->conn, email); -} - static void oscar_add_buddy(GaimConnection *gc, const char *name, GaimGroup *g) { OscarData *od = (OscarData *)gc->proto_data; GaimBuddy *b; @@ -6687,7 +6682,9 @@ static void search_by_email_cb(GaimConnection *gc, const char *email) { - serv_dir_search(gc, "", "", "", "", "", "", "", email); + OscarData *od = (OscarData *)gc->proto_data; + + aim_search_address(od->sess, od->conn, email); } static void oscar_show_find_email(GaimConnection *gc) @@ -6941,9 +6938,6 @@ oscar_send_typing, oscar_get_info, oscar_set_away, - oscar_set_dir, - NULL, - oscar_dir_search, oscar_set_idle, oscar_change_passwd, oscar_add_buddy, diff -r dfa1cd98d1c7 -r 80b4c956d7ae src/protocols/silc/silc.c --- a/src/protocols/silc/silc.c Sun May 16 06:50:45 2004 +0000 +++ b/src/protocols/silc/silc.c Sun May 16 07:19:56 2004 +0000 @@ -961,9 +961,6 @@ NULL, silcgaim_get_info, silcgaim_set_away, - NULL, - NULL, - NULL, silcgaim_idle_set, NULL, silcgaim_add_buddy, diff -r dfa1cd98d1c7 -r 80b4c956d7ae src/protocols/toc/toc.c --- a/src/protocols/toc/toc.c Sun May 16 06:50:45 2004 +0000 +++ b/src/protocols/toc/toc.c Sun May 16 07:19:56 2004 +0000 @@ -1118,6 +1118,7 @@ sflap_send(gc, buf, -1, TYPE_DATA); } +/* Should be implemented as an Account Action? */ static void toc_get_dir(GaimConnection *gc, const char *name) { char buf[BUF_LEN * 2]; @@ -1125,6 +1126,8 @@ sflap_send(gc, buf, -1, TYPE_DATA); } +#if 0 +/* Should be implemented as an Account Action */ static void toc_set_dir(GaimConnection *g, const char *first, const char *middle, const char *last, const char *maiden, const char *city, const char *state, const char *country, int web) { @@ -1136,7 +1139,10 @@ g_free(buf3); sflap_send(g, buf, -1, TYPE_DATA); } +#endif +#if 0 +/* Should be implemented as an Account Action */ static void toc_dir_search(GaimConnection *g, const char *first, const char *middle, const char *last, const char *maiden, const char *city, const char *state, const char *country, const char *email) { @@ -1149,6 +1155,7 @@ city, state, country); sflap_send(g, buf, -1, TYPE_DATA); } +#endif static void toc_set_away(GaimConnection *g, const char *state, const char *message) { @@ -2110,9 +2117,6 @@ NULL, toc_get_info, toc_set_away, - toc_set_dir, - toc_get_dir, - toc_dir_search, toc_set_idle, toc_change_passwd, toc_add_buddy, diff -r dfa1cd98d1c7 -r 80b4c956d7ae src/protocols/trepia/trepia.c --- a/src/protocols/trepia/trepia.c Sun May 16 06:50:45 2004 +0000 +++ b/src/protocols/trepia/trepia.c Sun May 16 07:19:56 2004 +0000 @@ -1227,9 +1227,6 @@ NULL, NULL, NULL, - NULL, - NULL, - NULL, trepia_add_buddy, NULL, trepia_rem_buddy, diff -r dfa1cd98d1c7 -r 80b4c956d7ae src/protocols/yahoo/yahoo.c --- a/src/protocols/yahoo/yahoo.c Sun May 16 06:50:45 2004 +0000 +++ b/src/protocols/yahoo/yahoo.c Sun May 16 07:19:56 2004 +0000 @@ -3232,9 +3232,6 @@ yahoo_send_typing, yahoo_get_info, yahoo_set_away, - NULL, /* set_dir */ - NULL, /* get_dir */ - NULL, /* dir_search */ yahoo_set_idle, NULL, /* change_passwd*/ yahoo_add_buddy, diff -r dfa1cd98d1c7 -r 80b4c956d7ae src/protocols/zephyr/zephyr.c --- a/src/protocols/zephyr/zephyr.c Sun May 16 06:50:45 2004 +0000 +++ b/src/protocols/zephyr/zephyr.c Sun May 16 07:19:56 2004 +0000 @@ -1328,9 +1328,6 @@ NULL, NULL, NULL, - NULL, - NULL, - NULL, zephyr_join_chat, NULL, /* reject chat invite */ NULL, diff -r dfa1cd98d1c7 -r 80b4c956d7ae src/prpl.h --- a/src/prpl.h Sun May 16 06:50:45 2004 +0000 +++ b/src/prpl.h Sun May 16 07:19:56 2004 +0000 @@ -244,14 +244,6 @@ GList *(*chat_info)(GaimConnection *); /* All the server-related functions */ - - /* - * A lot of these (like get_dir) are protocol-dependent and should - * be removed. ones like set_dir (which is also protocol-dependent) - * can stay though because there's a dialog (i.e. the prpl says you - * can set your dir info, the ui shows a dialog and needs to call - * set_dir in order to set it) - */ void (*login)(GaimAccount *); void (*close)(GaimConnection *); int (*send_im)(GaimConnection *, const char *who, @@ -261,16 +253,6 @@ int (*send_typing)(GaimConnection *, const char *name, int typing); void (*get_info)(GaimConnection *, const char *who); void (*set_away)(GaimConnection *, const char *state, const char *message); - void (*set_dir)(GaimConnection *, const char *first, - const char *middle, const char *last, - const char *maiden, const char *city, - const char *state, const char *country, int web); - void (*get_dir)(GaimConnection *, const char *who); - void (*dir_search)(GaimConnection *, const char *first, - const char *middle, const char *last, - const char *maiden, const char *city, - const char *state, const char *country, - const char *email); void (*set_idle)(GaimConnection *, int idletime); void (*change_passwd)(GaimConnection *, const char *old_pass, const char *new_pass); diff -r dfa1cd98d1c7 -r 80b4c956d7ae src/server.c --- a/src/server.c Sun May 16 06:50:45 2004 +0000 +++ b/src/server.c Sun May 16 07:19:56 2004 +0000 @@ -303,48 +303,6 @@ prpl_info->get_info(g, name); } -void serv_get_dir(GaimConnection *g, const char *name) -{ - GaimPluginProtocolInfo *prpl_info = NULL; - - if (g != NULL && g->prpl != NULL) - prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(g->prpl); - - if (prpl_info && g_list_find(gaim_connections_get_all(), g) && prpl_info->get_dir) - prpl_info->get_dir(g, name); -} - -void serv_set_dir(GaimConnection *g, const char *first, - const char *middle, const char *last, const char *maiden, - const char *city, const char *state, const char *country, - int web) -{ - GaimPluginProtocolInfo *prpl_info = NULL; - - if (g != NULL && g->prpl != NULL) - prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(g->prpl); - - if (prpl_info && g_list_find(gaim_connections_get_all(), g) && prpl_info->set_dir) - prpl_info->set_dir(g, first, middle, last, maiden, city, state, - country, web); -} - -void serv_dir_search(GaimConnection *g, const char *first, - const char *middle, const char *last, const char *maiden, - const char *city, const char *state, const char *country, - const char *email) -{ - GaimPluginProtocolInfo *prpl_info = NULL; - - if (g != NULL && g->prpl != NULL) - prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(g->prpl); - - if (prpl_info && g_list_find(gaim_connections_get_all(), g) && prpl_info->dir_search) - prpl_info->dir_search(g, first, middle, last, maiden, city, state, - country, email); -} - - void serv_set_away(GaimConnection *gc, const char *state, const char *message) { GaimPluginProtocolInfo *prpl_info = NULL;