pidgin: 1db344c1: Remove deprecated and unused PurplePlugi...
andrew.victor at mxit.com
andrew.victor at mxit.com
Mon Sep 5 17:50:48 EDT 2011
----------------------------------------------------------------------
Revision: 1db344c18f0cadda5acb7c1b12e34357fb242255
Parent: 14e162f6f36739152c4d5594bd144d7d0c8553e8
Author: andrew.victor at mxit.com
Date: 09/05/11 17:11:07
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1db344c18f0cadda5acb7c1b12e34357fb242255
Changelog:
Remove deprecated and unused PurplePluginProtocolInfo.get_cb_away.
Changes against parent 14e162f6f36739152c4d5594bd144d7d0c8553e8
patched ChangeLog.API
patched libpurple/protocols/bonjour/bonjour.c
patched libpurple/protocols/gg/gg.c
patched libpurple/protocols/irc/irc.c
patched libpurple/protocols/jabber/libxmpp.c
patched libpurple/protocols/msn/msn.c
patched libpurple/protocols/mxit/mxit.c
patched libpurple/protocols/myspace/myspace.c
patched libpurple/protocols/novell/novell.c
patched libpurple/protocols/null/nullprpl.c
patched libpurple/protocols/oscar/libaim.c
patched libpurple/protocols/oscar/libicq.c
patched libpurple/protocols/sametime/sametime.c
patched libpurple/protocols/silc/silc.c
patched libpurple/protocols/simple/simple.c
patched libpurple/protocols/yahoo/libyahoo.c
patched libpurple/protocols/yahoo/libyahoojp.c
patched libpurple/protocols/zephyr/zephyr.c
patched libpurple/prpl.h
patched pidgin/gtkconv.c
-------------- next part --------------
============================================================
--- libpurple/prpl.h 3cc67f2d68294e7554862d17c4da0873d33ace02
+++ libpurple/prpl.h f6cd833266d7310b6ecc264cc56828195aa38393
@@ -448,11 +448,6 @@ struct _PurplePluginProtocolInfo
* @deprecated Use #PurplePluginProtocolInfo.get_info instead.
*/
void (*get_cb_info)(PurpleConnection *, int, const char *who);
- /**
- * @deprecated Use #PurplePluginProtocolInfo.get_cb_real_name and
- * #PurplePluginProtocolInfo.status_text instead.
- */
- void (*get_cb_away)(PurpleConnection *, int, const char *who);
/** save/store buddy's alias on server list/roster */
void (*alias_buddy)(PurpleConnection *, const char *who,
============================================================
--- libpurple/protocols/irc/irc.c 29ed48dded6085c8cbac569543e29fa419de47cb
+++ libpurple/protocols/irc/irc.c 058933ba7cb9cac743f20bef042a5d59a39b5e82
@@ -959,7 +959,6 @@ static PurplePluginProtocolInfo prpl_inf
irc_keepalive, /* keepalive */
NULL, /* register_user */
NULL, /* get_cb_info */
- NULL, /* get_cb_away */
NULL, /* alias_buddy */
NULL, /* group_buddy */
NULL, /* rename_group */
============================================================
--- libpurple/protocols/msn/msn.c d58d97d9cab025233d2cb9b11670e7709bd44060
+++ libpurple/protocols/msn/msn.c 6155ea3236393f04fb2845b78f6dc9ffbf6134f3
@@ -2971,7 +2971,6 @@ static PurplePluginProtocolInfo prpl_inf
msn_keepalive, /* keepalive */
NULL, /* register_user */
NULL, /* get_cb_info */
- NULL, /* get_cb_away */
msn_alias_buddy, /* alias_buddy */
msn_group_buddy, /* group_buddy */
msn_rename_group, /* rename_group */
============================================================
--- libpurple/protocols/zephyr/zephyr.c 32d7db8e45e6820b4d1853a51c88671d5749fda0
+++ libpurple/protocols/zephyr/zephyr.c c3673c54018f2f157090872961a266e9ec750ee9
@@ -2894,7 +2894,6 @@ static PurplePluginProtocolInfo prpl_inf
NULL, /* keepalive -- Not necessary*/
NULL, /* register_user -- Not supported*/
NULL, /* XXX get_cb_info */
- NULL, /* get_cb_away */
NULL, /* alias_buddy */
NULL, /* group_buddy */
NULL, /* rename_group */
============================================================
--- libpurple/protocols/gg/gg.c 474d78a2ee570335bb8e6c93c3c0dc46b8ea64ac
+++ libpurple/protocols/gg/gg.c 8817be333b47457e3484b61ef5ba484df4059395
@@ -2696,7 +2696,6 @@ static PurplePluginProtocolInfo prpl_inf
ggp_keepalive, /* keepalive */
ggp_register_user, /* register_user */
NULL, /* get_cb_info */
- NULL, /* get_cb_away */
NULL, /* alias_buddy */
NULL, /* group_buddy */
NULL, /* rename_group */
============================================================
--- pidgin/gtkconv.c 2825603f7d0827acfaf81a418d7298de759365b0
+++ pidgin/gtkconv.c 46343632e6178f6528455f2f4af985b9b3322471
@@ -1579,32 +1579,6 @@ static void
}
static void
-menu_chat_get_away_cb(GtkWidget *w, PidginConversation *gtkconv)
-{
- PurpleConversation *conv = gtkconv->active_conv;
- PurplePluginProtocolInfo *prpl_info = NULL;
- PurpleConnection *gc;
- char *who;
-
- gc = purple_conversation_get_gc(conv);
- who = g_object_get_data(G_OBJECT(w), "user_data");
-
- if (gc != NULL) {
- prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl);
-
- /*
- * May want to expand this to work similarly to menu_info_cb?
- */
-
- if (prpl_info->get_cb_away != NULL)
- {
- prpl_info->get_cb_away(gc,
- purple_conv_chat_get_id(PURPLE_CONV_CHAT(conv)), who);
- }
- }
-}
-
-static void
menu_chat_add_remove_cb(GtkWidget *w, PidginConversation *gtkconv)
{
PurpleConversation *conv = gtkconv->active_conv;
@@ -1735,16 +1709,6 @@ create_chat_menu(PurpleConversation *con
g_object_set_data_full(G_OBJECT(button), "user_data", g_strdup(who), g_free);
}
- if (prpl_info && prpl_info->get_cb_away) {
- button = pidgin_new_item_from_stock(menu, _("Get Away Message"), PIDGIN_STOCK_AWAY,
- G_CALLBACK(menu_chat_get_away_cb), PIDGIN_CONVERSATION(conv), 0, 0, NULL);
-
- if (gc == NULL)
- gtk_widget_set_sensitive(button, FALSE);
- else
- g_object_set_data_full(G_OBJECT(button), "user_data", g_strdup(who), g_free);
- }
-
if (!is_me && prpl_info && !(prpl_info->options & OPT_PROTO_UNIQUE_CHATNAME)) {
if ((buddy = purple_find_buddy(conv->account, who)) != NULL)
button = pidgin_new_item_from_stock(menu, _("Remove"), GTK_STOCK_REMOVE,
============================================================
--- libpurple/protocols/novell/novell.c 3d1faa12262d0130d7f6ed2b39a7bd0d996153b8
+++ libpurple/protocols/novell/novell.c d3edd8dc8b43dd2f85553cfa2d3b37fc12dd4ea7
@@ -3515,7 +3515,6 @@ static PurplePluginProtocolInfo prpl_inf
novell_keepalive, /* keepalive */
NULL, /* register_user */
NULL, /* get_cb_info */
- NULL, /* get_cb_away */
novell_alias_buddy, /* alias_buddy */
novell_group_buddy, /* group_buddy */
novell_rename_group, /* rename_group */
============================================================
--- libpurple/protocols/silc/silc.c 057b46d51afe4dbc21a1a4d4d516ab6d41212fb3
+++ libpurple/protocols/silc/silc.c cec8a40b3c80dfe7cb2a82d4ca52cb5727ecc701
@@ -2093,7 +2093,6 @@ static PurplePluginProtocolInfo prpl_inf
silcpurple_keepalive, /* keepalive */
NULL, /* register_user */
NULL, /* get_cb_info */
- NULL, /* get_cb_away */
NULL, /* alias_buddy */
NULL, /* group_buddy */
NULL, /* rename_group */
============================================================
--- ChangeLog.API 47e1a880ab1c499813d371e53cc6c473c4873219
+++ ChangeLog.API ac854bdeceb6bfc9b12fb931eefb65e557b1efca
@@ -149,6 +149,7 @@ version 3.0.0 (??/??/????):
* PurpleConnectionUiOps.report_disconnect_reason
* PurplePluginProtocolInfo.add_buddy_with_invite
* PurplePluginProtocolInfo.add_buddies_with_invite
+ * PurplePluginProtocolInfo.get_cb_away
* serv_got_attention
* serv_send_attention
* struct _GtkIMHtmlFontDetail
============================================================
--- libpurple/protocols/sametime/sametime.c b7d9a430648cd95b6dade658e516a02920102b13
+++ libpurple/protocols/sametime/sametime.c 0519678ad498dd1e9d4475dca6c86ccfbe5cd60d
@@ -5195,7 +5195,6 @@ static PurplePluginProtocolInfo mw_prpl_
.keepalive = mw_prpl_keepalive,
.register_user = NULL,
.get_cb_info = NULL,
- .get_cb_away = NULL,
.alias_buddy = mw_prpl_alias_buddy,
.group_buddy = mw_prpl_group_buddy,
.rename_group = mw_prpl_rename_group,
============================================================
--- libpurple/protocols/simple/simple.c af69f3218a3bdd9cfe8eccc3cf71d035e38a3ed2
+++ libpurple/protocols/simple/simple.c 6a3f2a43898745ccb735d7a7142864747ffd0d48
@@ -2087,7 +2087,6 @@ static PurplePluginProtocolInfo prpl_inf
simple_keep_alive, /* keepalive */
NULL, /* register_user */
NULL, /* get_cb_info */
- NULL, /* get_cb_away */
NULL, /* alias_buddy */
NULL, /* group_buddy */
NULL, /* rename_group */
============================================================
--- libpurple/protocols/bonjour/bonjour.c 608930293765e2aaaa1d02489473e876d0a12214
+++ libpurple/protocols/bonjour/bonjour.c 9f813028d6110417afc4ad797896eed95b947881
@@ -525,7 +525,6 @@ static PurplePluginProtocolInfo prpl_inf
NULL, /* keepalive */
NULL, /* register_user */
NULL, /* get_cb_info */
- NULL, /* get_cb_away */
NULL, /* alias_buddy */
bonjour_group_buddy, /* group_buddy */
bonjour_rename_group, /* rename_group */
============================================================
--- libpurple/protocols/oscar/libaim.c d2b7278d20a96b8afc32f08c437b75c460071ba2
+++ libpurple/protocols/oscar/libaim.c 515df8c8d042449a3bf49ffe0ac67ca78da8ce82
@@ -70,7 +70,6 @@ static PurplePluginProtocolInfo prpl_inf
oscar_keepalive, /* keepalive */
NULL, /* register_user */
NULL, /* get_cb_info */
- NULL, /* get_cb_away */
oscar_alias_buddy, /* alias_buddy */
oscar_move_buddy, /* group_buddy */
oscar_rename_group, /* rename_group */
============================================================
--- libpurple/protocols/oscar/libicq.c 5d9b147d4c96c32b38b2878634f2e7a147bf4055
+++ libpurple/protocols/oscar/libicq.c a5937e015658a7c02ab3caa5e0d38ef41837c087
@@ -79,7 +79,6 @@ static PurplePluginProtocolInfo prpl_inf
oscar_keepalive, /* keepalive */
NULL, /* register_user */
NULL, /* get_cb_info */
- NULL, /* get_cb_away */
oscar_alias_buddy, /* alias_buddy */
oscar_move_buddy, /* group_buddy */
oscar_rename_group, /* rename_group */
============================================================
--- libpurple/protocols/jabber/libxmpp.c 15347a1b7f547807edf5d0a2a71eec54e8bbca17
+++ libpurple/protocols/jabber/libxmpp.c a42def1a81147c14fed99115ecc3d0f5e8dc2ff9
@@ -98,7 +98,6 @@ static PurplePluginProtocolInfo prpl_inf
jabber_keepalive, /* keepalive */
jabber_register_account, /* register_user */
NULL, /* get_cb_info */
- NULL, /* get_cb_away */
jabber_roster_alias_change, /* alias_buddy */
jabber_roster_group_change, /* group_buddy */
jabber_roster_group_rename, /* rename_group */
============================================================
--- libpurple/protocols/myspace/myspace.c 9123f3dc1c127fb04a484cf5cafd93d9ce5753ec
+++ libpurple/protocols/myspace/myspace.c cc8306b386094c2f5ad4eb4a5668922f16ff9b8e
@@ -3052,7 +3052,6 @@ static PurplePluginProtocolInfo prpl_inf
NULL, /* keepalive */
NULL, /* register_user */
NULL, /* get_cb_info */
- NULL, /* get_cb_away */
NULL, /* alias_buddy */
NULL, /* group_buddy */
NULL, /* rename_group */
============================================================
--- libpurple/protocols/null/nullprpl.c a1195e402a3aa53cdbc67fb5cd00622ef2a444dd
+++ libpurple/protocols/null/nullprpl.c c2017ffb1332faede86d814448652a6113e79e15
@@ -1101,7 +1101,6 @@ static PurplePluginProtocolInfo prpl_inf
NULL, /* keepalive */
nullprpl_register_user, /* register_user */
nullprpl_get_cb_info, /* get_cb_info */
- NULL, /* get_cb_away */
nullprpl_alias_buddy, /* alias_buddy */
nullprpl_group_buddy, /* group_buddy */
nullprpl_rename_group, /* rename_group */
============================================================
--- libpurple/protocols/yahoo/libyahoo.c d7d59925c82b555f075c998b505a3e867c0ec233
+++ libpurple/protocols/yahoo/libyahoo.c 6479939357f99ccd243616f5ac21e90413e22805
@@ -235,7 +235,6 @@ static PurplePluginProtocolInfo prpl_inf
yahoo_keepalive,
NULL, /* register_user */
NULL, /* get_cb_info */
- NULL, /* get_cb_away */
yahoo_update_alias, /* alias_buddy */
yahoo_change_buddys_group,
yahoo_rename_group,
============================================================
--- libpurple/protocols/yahoo/libyahoojp.c 7e8629a3f9e86d986345912f413ee7a97c5f1c5e
+++ libpurple/protocols/yahoo/libyahoojp.c 6fefdbe13ac6664fbfb55ba28971792d4bdb866a
@@ -131,7 +131,6 @@ static PurplePluginProtocolInfo prpl_inf
yahoo_keepalive,
NULL, /* register_user */
NULL, /* get_cb_info */
- NULL, /* get_cb_away */
yahoo_update_alias, /* alias_buddy */
yahoo_change_buddys_group,
yahoo_rename_group,
============================================================
--- libpurple/protocols/mxit/mxit.c 9275355f92c6e11f0076e7a8dfd7f60ba9551dc1
+++ libpurple/protocols/mxit/mxit.c 7f9aabeef487156d7a33e0051fca12ff09206050
@@ -716,7 +716,6 @@ static PurplePluginProtocolInfo proto_in
mxit_keepalive, /* keepalive */
mxit_register, /* register_user */
NULL, /* get_cb_info */
- NULL, /* get_cb_away */
mxit_buddy_alias, /* alias_buddy [roster.c] */
mxit_buddy_group, /* group_buddy [roster.c] */
mxit_rename_group, /* rename_group [roster.c] */
More information about the Commits
mailing list