# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1137654118 0
# Node ID 82e9184449658ee097fcceaa04fafee24a3c9e08
# Parent  432894b3bdad973d1ed85754af6d8e4742382ff5
[gaim-migrate @ 15296]
Passing the 'full' condition to the prpls when building tooltips.

committer: Tailor Script <tailor@pidgin.im>

diff -r 432894b3bdad -r 82e918444965 plugins/ChangeLog.API
--- a/plugins/ChangeLog.API	Thu Jan 19 06:55:22 2006 +0000
+++ b/plugins/ChangeLog.API	Thu Jan 19 07:01:58 2006 +0000
@@ -82,6 +82,7 @@
 	* GaimPluginProtocolInfo: Added offline_message
 	* GaimPluginProtocolInfo: Added whiteboard_prpl_ops
 	* GaimPluginProtocolInfo: Added media_prpl_ops
+	* GaimPluginProtocolInfo: Added "full" argument to tooltip_text
 	* gaim_pounce_new(): Added option argument for pounce options
 	* gaim_network_listen() and gaim_network_listen_range(): Added
 	  socket_type parameter to allow creation of UDP listening. Modified
diff -r 432894b3bdad -r 82e918444965 src/gtkblist.c
--- a/src/gtkblist.c	Thu Jan 19 06:55:22 2006 +0000
+++ b/src/gtkblist.c	Thu Jan 19 07:01:58 2006 +0000
@@ -2706,7 +2706,7 @@
 		{
 			/* Additional text from the PRPL */
 			const char *end;
-			tmp = prpl_info->tooltip_text(b);
+			tmp = prpl_info->tooltip_text(b, full);
 
 			if (tmp && !g_utf8_validate(tmp, -1, &end))
 			{
diff -r 432894b3bdad -r 82e918444965 src/protocols/bonjour/bonjour.c
--- a/src/protocols/bonjour/bonjour.c	Thu Jan 19 06:55:22 2006 +0000
+++ b/src/protocols/bonjour/bonjour.c	Thu Jan 19 07:01:58 2006 +0000
@@ -307,7 +307,7 @@
 }
 
 static char *
-bonjour_tooltip_text(GaimBuddy *buddy)
+bonjour_tooltip_text(GaimBuddy *buddy, gboolean full)
 {
 	GString *ret;
 	GaimPresence *presence;
diff -r 432894b3bdad -r 82e918444965 src/protocols/gg/gg.c
--- a/src/protocols/gg/gg.c	Thu Jan 19 06:55:22 2006 +0000
+++ b/src/protocols/gg/gg.c	Thu Jan 19 07:01:58 2006 +0000
@@ -1385,8 +1385,8 @@
 }
 /* }}} */
 
-/* static char *ggp_tooltip_text(GaimBuddy *b) {{{ */
-static char *ggp_tooltip_text(GaimBuddy *b)
+/* static char *ggp_tooltip_text(GaimBuddy *b, gboolean full) {{{ */
+static char *ggp_tooltip_text(GaimBuddy *b, gboolean full)
 {
 	GaimStatus *status;
 	char *text;
diff -r 432894b3bdad -r 82e918444965 src/protocols/jabber/jabber.c
--- a/src/protocols/jabber/jabber.c	Thu Jan 19 06:55:22 2006 +0000
+++ b/src/protocols/jabber/jabber.c	Thu Jan 19 07:01:58 2006 +0000
@@ -1001,7 +1001,7 @@
 	return ret;
 }
 
-static char *jabber_tooltip_text(GaimBuddy *b)
+static char *jabber_tooltip_text(GaimBuddy *b, gboolean full)
 {
 	JabberBuddy *jb;
 	GString *ret;
diff -r 432894b3bdad -r 82e918444965 src/protocols/msn/msn.c
--- a/src/protocols/msn/msn.c	Thu Jan 19 06:55:22 2006 +0000
+++ b/src/protocols/msn/msn.c	Thu Jan 19 07:01:58 2006 +0000
@@ -537,7 +537,7 @@
 }
 
 static char *
-msn_tooltip_text(GaimBuddy *buddy)
+msn_tooltip_text(GaimBuddy *buddy, gboolean full)
 {
 	MsnUser *user;
 	GaimPresence *presence = gaim_buddy_get_presence(buddy);
@@ -1353,7 +1353,7 @@
 	if (b)
 	{
 		GaimPresence *presence;
-		char *statustext = msn_tooltip_text(b);
+		char *statustext = msn_tooltip_text(b, TRUE);
 
 		presence = gaim_buddy_get_presence(b);
 
diff -r 432894b3bdad -r 82e918444965 src/protocols/novell/novell.c
--- a/src/protocols/novell/novell.c	Thu Jan 19 06:55:22 2006 +0000
+++ b/src/protocols/novell/novell.c	Thu Jan 19 07:01:58 2006 +0000
@@ -2818,7 +2818,7 @@
 }
 
 static char *
-novell_tooltip_text(GaimBuddy * buddy)
+novell_tooltip_text(GaimBuddy * buddy, gboolean full)
 {
 	NMUserRecord *user_record = NULL;
 	GaimConnection *gc;
diff -r 432894b3bdad -r 82e918444965 src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Thu Jan 19 06:55:22 2006 +0000
+++ b/src/protocols/oscar/oscar.c	Thu Jan 19 07:01:58 2006 +0000
@@ -7715,7 +7715,7 @@
 	*ne = emblems[3];
 }
 
-static char *oscar_tooltip_text(GaimBuddy *b) {
+static char *oscar_tooltip_text(GaimBuddy *b, gboolean full) {
 	GaimConnection *gc = b->account->gc;
 	OscarData *od = gc->proto_data;
 	aim_userinfo_t *userinfo = aim_locate_finduserinfo(od->sess, b->name);
diff -r 432894b3bdad -r 82e918444965 src/protocols/sametime/sametime.c
--- a/src/protocols/sametime/sametime.c	Thu Jan 19 06:55:22 2006 +0000
+++ b/src/protocols/sametime/sametime.c	Thu Jan 19 07:01:58 2006 +0000
@@ -3213,7 +3213,7 @@
 }
 
 
-static char *mw_prpl_tooltip_text(GaimBuddy *b) {
+static char *mw_prpl_tooltip_text(GaimBuddy *b, gboolean full) {
   GaimConnection *gc;
   struct mwGaimPluginData *pd;
   struct mwAwareIdBlock idb = { mwAware_USER, b->name, NULL };
diff -r 432894b3bdad -r 82e918444965 src/protocols/silc/buddy.c
--- a/src/protocols/silc/buddy.c	Thu Jan 19 06:55:22 2006 +0000
+++ b/src/protocols/silc/buddy.c	Thu Jan 19 07:01:58 2006 +0000
@@ -1509,7 +1509,7 @@
 	return NULL;
 }
 
-char *silcgaim_tooltip_text(GaimBuddy *b)
+char *silcgaim_tooltip_text(GaimBuddy *b, gboolean full)
 {
 	SilcGaim sg = b->account->gc->proto_data;
 	SilcClient client = sg->client;
diff -r 432894b3bdad -r 82e918444965 src/protocols/silc/silcgaim.h
--- a/src/protocols/silc/silcgaim.h	Thu Jan 19 06:55:22 2006 +0000
+++ b/src/protocols/silc/silcgaim.h	Thu Jan 19 07:01:58 2006 +0000
@@ -107,7 +107,7 @@
 				   SilcClientEntry client_entry,
 				   const char *hostname, SilcUInt16 port);
 void silcgaim_idle_set(GaimConnection *gc, int idle);
-char *silcgaim_tooltip_text(GaimBuddy *b);
+char *silcgaim_tooltip_text(GaimBuddy *b, gboolean full);
 char *silcgaim_status_text(GaimBuddy *b);
 gboolean silcgaim_ip_is_private(const char *ip);
 void silcgaim_ftp_send_file(GaimConnection *gc, const char *name, const char *file);
diff -r 432894b3bdad -r 82e918444965 src/protocols/yahoo/yahoo.c
--- a/src/protocols/yahoo/yahoo.c	Thu Jan 19 06:55:22 2006 +0000
+++ b/src/protocols/yahoo/yahoo.c	Thu Jan 19 07:01:58 2006 +0000
@@ -2778,7 +2778,7 @@
 	}
 }
 
-char *yahoo_tooltip_text(GaimBuddy *b)
+char *yahoo_tooltip_text(GaimBuddy *b, gboolean full)
 {
 	YahooFriend *f;
 	char *escaped, *status = NULL, *presence = NULL;
diff -r 432894b3bdad -r 82e918444965 src/protocols/yahoo/yahoo.h
--- a/src/protocols/yahoo/yahoo.h	Thu Jan 19 06:55:22 2006 +0000
+++ b/src/protocols/yahoo/yahoo.h	Thu Jan 19 07:01:58 2006 +0000
@@ -177,7 +177,7 @@
 char *yahoo_string_decode(GaimConnection *gc, const char *str, gboolean utf8);
 
 /* previously-static functions, now needed for yahoo_profile.c */
-char *yahoo_tooltip_text(GaimBuddy *b);
+char *yahoo_tooltip_text(GaimBuddy *b, gboolean full);
 
 /* yahoo_profile.c */
 void yahoo_get_info(GaimConnection *gc, const char *name);
diff -r 432894b3bdad -r 82e918444965 src/protocols/yahoo/yahoo_profile.c
--- a/src/protocols/yahoo/yahoo_profile.c	Thu Jan 19 06:55:22 2006 +0000
+++ b/src/protocols/yahoo/yahoo_profile.c	Thu Jan 19 07:01:58 2006 +0000
@@ -668,7 +668,7 @@
 			info_data->name);
 
 	if (b) {
-		char *statustext = yahoo_tooltip_text(b);
+		char *statustext = yahoo_tooltip_text(b, TRUE);
 		if(b->alias && b->alias[0]) {
 			char *aliastext = g_markup_escape_text(b->alias, -1);
 			g_string_append_printf(s, _("<b>Alias:</b> %s<br>"), aliastext);
diff -r 432894b3bdad -r 82e918444965 src/prpl.h
--- a/src/prpl.h	Thu Jan 19 06:55:22 2006 +0000
+++ b/src/prpl.h	Thu Jan 19 07:01:58 2006 +0000
@@ -191,7 +191,7 @@
 	/**
 	 * Gets a string to put in the buddy list tooltip.
 	 */
-	char *(*tooltip_text)(GaimBuddy *buddy);
+	char *(*tooltip_text)(GaimBuddy *buddy, gboolean full);
 
 	/**
 	 * This must be implemented, and must add at least the offline