Mercurial > pidgin.yaz

changeset 32514:c6943fd38d44

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove deprecated and unused PurplePluginProtocolInfo.get_cb_away.
author andrew.victor@mxit.com
date Mon, 05 Sep 2011 21:11:07 +0000
parents 06e0b6be6432
children cc55df4702aa
files ChangeLog.API libpurple/protocols/bonjour/bonjour.c libpurple/protocols/gg/gg.c libpurple/protocols/irc/irc.c libpurple/protocols/jabber/libxmpp.c libpurple/protocols/msn/msn.c libpurple/protocols/mxit/mxit.c libpurple/protocols/myspace/myspace.c libpurple/protocols/novell/novell.c libpurple/protocols/null/nullprpl.c libpurple/protocols/oscar/libaim.c libpurple/protocols/oscar/libicq.c libpurple/protocols/sametime/sametime.c libpurple/protocols/silc/silc.c libpurple/protocols/simple/simple.c libpurple/protocols/yahoo/libyahoo.c libpurple/protocols/yahoo/libyahoojp.c libpurple/protocols/zephyr/zephyr.c libpurple/prpl.h pidgin/gtkconv.c
diffstat 20 files changed, 1 insertions(+), 58 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog.API	Mon Sep 05 20:37:04 2011 +0000
+++ b/ChangeLog.API	Mon Sep 05 21:11:07 2011 +0000
@@ -149,6 +149,7 @@
 		* 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
--- a/libpurple/protocols/bonjour/bonjour.c	Mon Sep 05 20:37:04 2011 +0000
+++ b/libpurple/protocols/bonjour/bonjour.c	Mon Sep 05 21:11:07 2011 +0000
@@ -525,7 +525,6 @@
 	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 */
--- a/libpurple/protocols/gg/gg.c	Mon Sep 05 20:37:04 2011 +0000
+++ b/libpurple/protocols/gg/gg.c	Mon Sep 05 21:11:07 2011 +0000
@@ -2696,7 +2696,6 @@
 	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 */
--- a/libpurple/protocols/irc/irc.c	Mon Sep 05 20:37:04 2011 +0000
+++ b/libpurple/protocols/irc/irc.c	Mon Sep 05 21:11:07 2011 +0000
@@ -959,7 +959,6 @@
 	irc_keepalive,		/* keepalive */
 	NULL,					/* register_user */
 	NULL,					/* get_cb_info */
-	NULL,					/* get_cb_away */
 	NULL,					/* alias_buddy */
 	NULL,					/* group_buddy */
 	NULL,					/* rename_group */
--- a/libpurple/protocols/jabber/libxmpp.c	Mon Sep 05 20:37:04 2011 +0000
+++ b/libpurple/protocols/jabber/libxmpp.c	Mon Sep 05 21:11:07 2011 +0000
@@ -98,7 +98,6 @@
 	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 */
--- a/libpurple/protocols/msn/msn.c	Mon Sep 05 20:37:04 2011 +0000
+++ b/libpurple/protocols/msn/msn.c	Mon Sep 05 21:11:07 2011 +0000
@@ -2971,7 +2971,6 @@
 	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 */
--- a/libpurple/protocols/mxit/mxit.c	Mon Sep 05 20:37:04 2011 +0000
+++ b/libpurple/protocols/mxit/mxit.c	Mon Sep 05 21:11:07 2011 +0000
@@ -716,7 +716,6 @@
 	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] */
--- a/libpurple/protocols/myspace/myspace.c	Mon Sep 05 20:37:04 2011 +0000
+++ b/libpurple/protocols/myspace/myspace.c	Mon Sep 05 21:11:07 2011 +0000
@@ -3052,7 +3052,6 @@
 	NULL,              /* keepalive */
 	NULL,              /* register_user */
 	NULL,              /* get_cb_info */
-	NULL,              /* get_cb_away */
 	NULL,              /* alias_buddy */
 	NULL,              /* group_buddy */
 	NULL,              /* rename_group */
--- a/libpurple/protocols/novell/novell.c	Mon Sep 05 20:37:04 2011 +0000
+++ b/libpurple/protocols/novell/novell.c	Mon Sep 05 21:11:07 2011 +0000
@@ -3515,7 +3515,6 @@
 	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 */
--- a/libpurple/protocols/null/nullprpl.c	Mon Sep 05 20:37:04 2011 +0000
+++ b/libpurple/protocols/null/nullprpl.c	Mon Sep 05 21:11:07 2011 +0000
@@ -1101,7 +1101,6 @@
   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 */
--- a/libpurple/protocols/oscar/libaim.c	Mon Sep 05 20:37:04 2011 +0000
+++ b/libpurple/protocols/oscar/libaim.c	Mon Sep 05 21:11:07 2011 +0000
@@ -70,7 +70,6 @@
 	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 */
--- a/libpurple/protocols/oscar/libicq.c	Mon Sep 05 20:37:04 2011 +0000
+++ b/libpurple/protocols/oscar/libicq.c	Mon Sep 05 21:11:07 2011 +0000
@@ -79,7 +79,6 @@
 	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 */
--- a/libpurple/protocols/sametime/sametime.c	Mon Sep 05 20:37:04 2011 +0000
+++ b/libpurple/protocols/sametime/sametime.c	Mon Sep 05 21:11:07 2011 +0000
@@ -5195,7 +5195,6 @@
   .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,
--- a/libpurple/protocols/silc/silc.c	Mon Sep 05 20:37:04 2011 +0000
+++ b/libpurple/protocols/silc/silc.c	Mon Sep 05 21:11:07 2011 +0000
@@ -2093,7 +2093,6 @@
 	silcpurple_keepalive,			/* keepalive */
 	NULL,					/* register_user */
 	NULL,					/* get_cb_info */
-	NULL,					/* get_cb_away */
 	NULL,					/* alias_buddy */
 	NULL,					/* group_buddy */
 	NULL,					/* rename_group */
--- a/libpurple/protocols/simple/simple.c	Mon Sep 05 20:37:04 2011 +0000
+++ b/libpurple/protocols/simple/simple.c	Mon Sep 05 21:11:07 2011 +0000
@@ -2087,7 +2087,6 @@
 	simple_keep_alive,		/* keepalive */
 	NULL,					/* register_user */
 	NULL,					/* get_cb_info */
-	NULL,					/* get_cb_away */
 	NULL,					/* alias_buddy */
 	NULL,					/* group_buddy */
 	NULL,					/* rename_group */
--- a/libpurple/protocols/yahoo/libyahoo.c	Mon Sep 05 20:37:04 2011 +0000
+++ b/libpurple/protocols/yahoo/libyahoo.c	Mon Sep 05 21:11:07 2011 +0000
@@ -235,7 +235,6 @@
 	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,
--- a/libpurple/protocols/yahoo/libyahoojp.c	Mon Sep 05 20:37:04 2011 +0000
+++ b/libpurple/protocols/yahoo/libyahoojp.c	Mon Sep 05 21:11:07 2011 +0000
@@ -131,7 +131,6 @@
 	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,
--- a/libpurple/protocols/zephyr/zephyr.c	Mon Sep 05 20:37:04 2011 +0000
+++ b/libpurple/protocols/zephyr/zephyr.c	Mon Sep 05 21:11:07 2011 +0000
@@ -2894,7 +2894,6 @@
 	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 */
--- a/libpurple/prpl.h	Mon Sep 05 20:37:04 2011 +0000
+++ b/libpurple/prpl.h	Mon Sep 05 21:11:07 2011 +0000
@@ -448,11 +448,6 @@
 	 * @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,
--- a/pidgin/gtkconv.c	Mon Sep 05 20:37:04 2011 +0000
+++ b/pidgin/gtkconv.c	Mon Sep 05 21:11:07 2011 +0000
@@ -1579,32 +1579,6 @@
 }
 
 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 @@
 			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,