Mercurial > pidgin.yaz
changeset 8568:88988327a4e0
[gaim-migrate @ 9316]
Remove the get_away prpl function. Nada used it.
Pink elephants on parade.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sat, 03 Apr 2004 01:33:45 +0000 |
| parents | d92a7574473c |
| children | ee13d1befabe |
| files | src/gtkimhtml.c src/protocols/gg/gg.c src/protocols/irc/irc.c src/protocols/jabber/jabber.c src/protocols/msn/msn.c src/protocols/napster/napster.c src/protocols/oscar/oscar.c src/protocols/toc/toc.c src/protocols/trepia/trepia.c src/protocols/yahoo/yahoo.c src/protocols/zephyr/zephyr.c src/prpl.h src/server.c src/server.h |
| diffstat | 14 files changed, 35 insertions(+), 76 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkimhtml.c Sat Apr 03 00:11:49 2004 +0000 +++ b/src/gtkimhtml.c Sat Apr 03 01:33:45 2004 +0000 @@ -364,7 +364,7 @@ else gdk_window_set_cursor(event->window, GTK_IMHTML(imhtml)->arrow_cursor); - /* propogate the event normally */ + /* propagate the event normally */ return FALSE; } @@ -1316,9 +1316,8 @@ } g_free(val); - val = ret->str; - g_string_free(ret, FALSE); - return val; + + return g_string_free(ret, FALSE); } /* Inline CSS Support - Douglas Thrift */ @@ -2670,7 +2669,8 @@ span = imhtml->edit.bold; span->end = gtk_text_buffer_create_mark(imhtml->text_buffer, NULL, &iter, TRUE); gtk_text_buffer_get_iter_at_mark(imhtml->text_buffer, &start, span->start); - if (gtk_text_iter_equal(&start, &iter)) { /* Format turned off before any text was entered, so remove the tag */ + if (gtk_text_iter_equal(&start, &iter)) { + /* Format turned off before any text was entered, so remove the tag */ imhtml->format_spans = g_list_remove(imhtml->format_spans, span); if (span->start_tag) g_free(span->start_tag);
--- a/src/protocols/gg/gg.c Sat Apr 03 00:11:49 2004 +0000 +++ b/src/protocols/gg/gg.c Sat Apr 03 01:33:45 2004 +0000 @@ -1,6 +1,6 @@ /* * gaim - Gadu-Gadu Protocol Plugin - * $Id: gg.c 9306 2004-04-02 06:54:52Z lschiere $ + * $Id: gg.c 9316 2004-04-03 01:33:45Z thekingant $ * * Copyright (C) 2001 Arkadiusz Mi¶kiewicz <misiek@pld.ORG.PL> * @@ -1326,7 +1326,6 @@ agg_set_away, NULL, NULL, - NULL, agg_dir_search, NULL, agg_change_passwd,
--- a/src/protocols/irc/irc.c Sat Apr 03 00:11:49 2004 +0000 +++ b/src/protocols/irc/irc.c Sat Apr 03 01:33:45 2004 +0000 @@ -559,7 +559,6 @@ NULL, NULL, NULL, - NULL, irc_add_buddy, NULL, irc_remove_buddy,
--- a/src/protocols/jabber/jabber.c Sat Apr 03 00:11:49 2004 +0000 +++ b/src/protocols/jabber/jabber.c Sat Apr 03 01:33:45 2004 +0000 @@ -1294,7 +1294,6 @@ NULL, NULL, NULL, - NULL, jabber_idle_set, NULL, jabber_roster_add_buddy,
--- a/src/protocols/msn/msn.c Sat Apr 03 00:11:49 2004 +0000 +++ b/src/protocols/msn/msn.c Sat Apr 03 01:33:45 2004 +0000 @@ -1619,7 +1619,6 @@ NULL, NULL, NULL, - NULL, msn_set_idle, NULL, msn_add_buddy,
--- a/src/protocols/napster/napster.c Sat Apr 03 00:11:49 2004 +0000 +++ b/src/protocols/napster/napster.c Sat Apr 03 01:33:45 2004 +0000 @@ -587,7 +587,6 @@ NULL, NULL, NULL, - NULL, nap_add_buddy, nap_add_buddies, nap_remove_buddy,
--- a/src/protocols/oscar/oscar.c Sat Apr 03 00:11:49 2004 +0000 +++ b/src/protocols/oscar/oscar.c Sat Apr 03 01:33:45 2004 +0000 @@ -4589,23 +4589,6 @@ aim_locate_getinfoshort(od->sess, name, 0x00000003); } -static void oscar_get_away(GaimConnection *gc, const char *who) { - OscarData *od = (OscarData *)gc->proto_data; - if (od->icq) { - GaimBuddy *budlight = gaim_find_buddy(gc->account, who); - if (budlight) - if ((budlight->uc & 0xffff0000) >> 16) - aim_im_sendch2_geticqaway(od->sess, who, (budlight->uc & 0xffff0000) >> 16); - else - gaim_debug(GAIM_DEBUG_ERROR, "oscar", - "Error: The user %s has no status message, therefore not requesting.\n", who); - else - gaim_debug(GAIM_DEBUG_ERROR, "oscar", - "Error: Could not find %s in local buddy list, therefore unable to request status message.\n", who); - } else - aim_locate_getinfoshort(od->sess, who, 0x00000002); -} - 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 */ @@ -6930,7 +6913,6 @@ oscar_send_typing, oscar_get_info, oscar_set_away, - oscar_get_away, oscar_set_dir, NULL, oscar_dir_search,
--- a/src/protocols/toc/toc.c Sat Apr 03 00:11:49 2004 +0000 +++ b/src/protocols/toc/toc.c Sat Apr 03 01:33:45 2004 +0000 @@ -2110,7 +2110,6 @@ NULL, toc_get_info, toc_set_away, - NULL, toc_set_dir, toc_get_dir, toc_dir_search,
--- a/src/protocols/trepia/trepia.c Sat Apr 03 00:11:49 2004 +0000 +++ b/src/protocols/trepia/trepia.c Sat Apr 03 01:33:45 2004 +0000 @@ -1281,7 +1281,6 @@ NULL, NULL, NULL, - NULL, trepia_add_buddy, NULL, trepia_rem_buddy,
--- a/src/protocols/yahoo/yahoo.c Sat Apr 03 00:11:49 2004 +0000 +++ b/src/protocols/yahoo/yahoo.c Sat Apr 03 01:33:45 2004 +0000 @@ -3231,7 +3231,6 @@ yahoo_send_typing, yahoo_get_info, yahoo_set_away, - NULL, /* get_away */ NULL, /* set_dir */ NULL, /* get_dir */ NULL, /* dir_search */
--- a/src/protocols/zephyr/zephyr.c Sat Apr 03 00:11:49 2004 +0000 +++ b/src/protocols/zephyr/zephyr.c Sat Apr 03 01:33:45 2004 +0000 @@ -127,15 +127,15 @@ } static const char* gaim_zephyr_get_sender() { - /* will be useful once this plugin can use a backend other - than libzephyr */ - return ZGetSender(); + /* will be useful once this plugin can use a backend other + than libzephyr */ + return ZGetSender(); } static const char* gaim_zephyr_get_realm() { - /* will be useful once this plugin can use a backend other - than libzephyr */ - return ZGetRealm(); + /* will be useful once this plugin can use a backend other + than libzephyr */ + return ZGetRealm(); } /* returns true if zt1 is a subset of zt2, i.e. zt2 has the same thing or @@ -188,18 +188,18 @@ gchar *utf8; GError *err = NULL; if (g_utf8_validate(string,len,NULL)) { - return g_strdup(string); - } else { - utf8 = g_convert(string, len, "UTF-8", - gaim_account_get_string(zgc->account, "encoding", ZEPHYR_FALLBACK_CHARSET), - NULL, NULL, &err); - if (err) { - gaim_debug(GAIM_DEBUG_ERROR, "zephyr", "recv conversion error: %s\n", err->message); - utf8 = g_strdup(_("(There was an error converting this message. Check the 'Encoding' option in the Account Editor)")); - } - - return utf8; - } + return g_strdup(string); + } else { + utf8 = g_convert(string, len, "UTF-8", + gaim_account_get_string(zgc->account, "encoding", ZEPHYR_FALLBACK_CHARSET), + NULL, NULL, &err); + if (err) { + gaim_debug(GAIM_DEBUG_ERROR, "zephyr", "recv conversion error: %s\n", err->message); + utf8 = g_strdup(_("(There was an error converting this message. Check the 'Encoding' option in the Account Editor)")); + } + + return utf8; + } } /* utility macros that are useful for zephyr_to_html */ @@ -418,8 +418,7 @@ new_f->closing = "</font>"; new_f->has_closer = FALSE; frames = new_f; - - } else if (!g_ascii_strcasecmp(buf, "color")) { + } else if (!g_ascii_strcasecmp(buf, "color")) { cnt += end+1; new_f = g_new(zframe, 1); new_f->enclosing = frames; @@ -1348,7 +1347,6 @@ NULL, NULL, NULL, - NULL, zephyr_add_buddy, zephyr_add_buddies, zephyr_remove_buddy, @@ -1360,7 +1358,7 @@ NULL, NULL, zephyr_join_chat, - NULL, /* reject chat invite */ + NULL, /* reject chat invite */ NULL, zephyr_chat_leave, NULL, @@ -1373,12 +1371,12 @@ NULL, NULL, NULL, - NULL, + NULL, zephyr_normalize, - NULL, - NULL, - NULL, - zephyr_chat_set_topic + NULL, + NULL, + NULL, + zephyr_chat_set_topic }; static GaimPluginInfo info = @@ -1419,11 +1417,11 @@ option = gaim_account_option_bool_new(_("Export to .zephyr.subs"),"write_zsubs",FALSE); prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,option); - option = gaim_account_option_string_new(_("Exposure"),"exposure_level",tmp?tmp:EXPOSE_REALMVIS); - prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,option); + option = gaim_account_option_string_new(_("Exposure"),"exposure_level",tmp?tmp:EXPOSE_REALMVIS); + prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,option); - option = gaim_account_option_string_new(_("Encoding"),"encoding",ZEPHYR_FALLBACK_CHARSET); - prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,option); + option = gaim_account_option_string_new(_("Encoding"),"encoding",ZEPHYR_FALLBACK_CHARSET); + prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,option); my_protocol = plugin; }
--- a/src/prpl.h Sat Apr 03 00:11:49 2004 +0000 +++ b/src/prpl.h Sat Apr 03 01:33:45 2004 +0000 @@ -254,7 +254,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 (*get_away)(GaimConnection *, const char *who); void (*set_dir)(GaimConnection *, const char *first, const char *middle, const char *last, const char *maiden, const char *city,
--- a/src/server.c Sat Apr 03 00:11:49 2004 +0000 +++ b/src/server.c Sat Apr 03 01:33:45 2004 +0000 @@ -306,17 +306,6 @@ prpl_info->get_info(g, name); } -void serv_get_away(GaimConnection *g, const char *name) -{ - GaimPluginProtocolInfo *prpl_info = NULL; - - if (g != NULL && g->prpl != NULL) - prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(g->prpl); - - if (g && prpl_info && prpl_info->get_away) - prpl_info->get_away(g, name); -} - void serv_get_dir(GaimConnection *g, const char *name) { GaimPluginProtocolInfo *prpl_info = NULL;
--- a/src/server.h Sat Apr 03 00:11:49 2004 +0000 +++ b/src/server.h Sat Apr 03 01:33:45 2004 +0000 @@ -73,7 +73,6 @@ void serv_chat_leave(GaimConnection *, int); void serv_chat_whisper(GaimConnection *, int, const char *, const char *); int serv_chat_send(GaimConnection *, int, const char *); -void serv_get_away(GaimConnection *, const char *); void serv_alias_buddy(GaimBuddy *); void serv_got_alias(GaimConnection *gc, const char *who, const char *alias); void serv_move_buddy(GaimBuddy *, GaimGroup *, GaimGroup *);