pidgin: bff50ecd: Make our profile text a little cleaner a...
markdoliner at pidgin.im
markdoliner at pidgin.im
Mon Dec 8 22:06:19 EST 2008
-----------------------------------------------------------------
Revision: bff50ecd56f0f881f81b5d087f566ecbf74aa4cd
Ancestor: 08fd5918978aecbd045771fb72fd0d80c7fcf941
Author: markdoliner at pidgin.im
Date: 2008-12-09T02:59:29
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/bff50ecd56f0f881f81b5d087f566ecbf74aa4cd
Modified files:
libpurple/protocols/msn/msn.c
libpurple/protocols/myspace/user.c
libpurple/protocols/oscar/oscar.c
libpurple/protocols/yahoo/yahoo_profile.c
ChangeLog:
Make our profile text a little cleaner and more uniform across the protocols.
They all have a "View web profile" link at the bottom that opens the user's
profile in a browser. I'm open to suggestions on the wording. I also wasn't
sure if it was better for the link to be at the bottom of the profile or the
top.
-------------- next part --------------
============================================================
--- libpurple/protocols/msn/msn.c 8bc2a50c5b624babd3562ec8eaa2c9801005f867
+++ libpurple/protocols/msn/msn.c aff7bd383cf347fac5121ab81b2d01373077d5f8
@@ -1811,7 +1811,7 @@ msn_tooltip_extract_info_text(PurpleNoti
if (b->server_alias)
{
char *nicktext = g_markup_escape_text(b->server_alias, -1);
- tmp = g_strdup_printf("<font sml=\"msn\">%s</font><br>", nicktext);
+ tmp = g_strdup_printf("<font sml=\"msn\">%s</font>", nicktext);
purple_notify_user_info_add_pair(user_info, _("Nickname"), tmp);
g_free(tmp);
g_free(nicktext);
@@ -1917,9 +1917,8 @@ msn_got_info(PurpleUtilFetchUrlData *url
if (error_message != NULL || url_text == NULL || strcmp(url_text, "") == 0)
{
- tmp = g_strdup_printf("<b>%s</b>", _("Error retrieving profile"));
- purple_notify_user_info_add_pair(user_info, NULL, tmp);
- g_free(tmp);
+ purple_notify_user_info_add_pair(user_info,
+ _("Error retrieving profile"), NULL);
purple_notify_userinfo(info_data->gc, info_data->name, user_info, NULL, NULL);
purple_notify_user_info_destroy(user_info);
@@ -2260,21 +2259,24 @@ msn_got_info(PurpleUtilFetchUrlData *url
char *p = strstr(url_buffer, "<form id=\"profile_form\" name=\"profile_form\" action=\"http://spaces.live.com/profile.aspx?cid=0\"");
PurpleBuddy *b = purple_find_buddy
(purple_connection_get_account(info_data->gc), info_data->name);
- purple_notify_user_info_add_pair(user_info, _("Error retrieving profile"),
- ((p && b) ? _("The user has not created a public profile.") :
- (p ? _("MSN reported not being able to find the user's profile. "
- "This either means that the user does not exist, "
- "or that the user exists "
- "but has not created a public profile.") :
- _("Could not find " /* This should never happen */
- "any information in the user's profile. "
- "The user most likely does not exist."))));
+ purple_notify_user_info_add_pair(user_info,
+ _("Error retrieving profile"), NULL);
+ purple_notify_user_info_add_pair(user_info, NULL,
+ ((p && b) ? _("The user has not created a public profile.") :
+ (p ? _("MSN reported not being able to find the user's profile. "
+ "This either means that the user does not exist, "
+ "or that the user exists "
+ "but has not created a public profile.") :
+ _("Could not find " /* This should never happen */
+ "any information in the user's profile. "
+ "The user most likely does not exist."))));
}
/* put a link to the actual profile URL */
- tmp = g_strdup_printf("<a href=\"%s%s\">%s%s</a>",
- PROFILE_URL, info_data->name, PROFILE_URL, info_data->name);
- purple_notify_user_info_add_pair(user_info, _("Profile URL"), tmp);
+ purple_notify_user_info_add_section_break(user_info);
+ tmp = g_strdup_printf("<a href=\"%s%s\">%s</a>",
+ PROFILE_URL, info_data->name, _("View web profile"));
+ purple_notify_user_info_add_pair(user_info, NULL, tmp);
g_free(tmp);
#if PHOTO_SUPPORT
============================================================
--- libpurple/protocols/myspace/user.c 7d4e32a3eea84ba8adaf25b7df39ecd355a5aa12
+++ libpurple/protocols/myspace/user.c 801fecf4d8e08f68b1bbf3100a9e4732eef288b7
@@ -107,17 +107,6 @@ msim_append_user_info(MsimSession *sessi
uid = purple_blist_node_get_int(&user->buddy->node, "UserID");
- if (full) {
- /* TODO: link to username, if available */
- if (uid) {
- char *profile = g_strdup_printf("<a href=\"http://myspace.com/%d\">http://myspace.com/%d</a>",
- uid, uid);
- purple_notify_user_info_add_pair(user_info, _("Profile"), profile);
- g_free(profile);
- }
- }
-
-
/* a/s/l...the vitals */
if (user->age) {
char age[16];
@@ -180,6 +169,16 @@ msim_append_user_info(MsimSession *sessi
purple_notify_user_info_add_pair(user_info, _("Client Version"), client);
g_free(client);
}
+
+ if (full && uid) {
+ /* TODO: link to username, if available */
+ char *profile;
+ purple_notify_user_info_add_section_break(user_info);
+ profile = g_strdup_printf("<a href=\"http://myspace.com/%d\">%s</a>",
+ uid, _("View web profile"));
+ purple_notify_user_info_add_pair(user_info, NULL, profile);
+ g_free(profile);
+ }
}
/** Set the currently playing song artist and or title.
============================================================
--- libpurple/protocols/oscar/oscar.c 12ac5215674a804204d59d2d238e660ee826f4f9
+++ libpurple/protocols/oscar/oscar.c 6454ece0e31365bec6d3967499b30a822161e7c2
@@ -3187,6 +3187,12 @@ static int purple_parse_userinfo(OscarDa
}
}
+ purple_notify_user_info_add_section_break(user_info);
+ tmp = g_strdup_printf("<a href=\"http://profiles.aim.com/%s\">%s</a>",
+ purple_normalize(account, userinfo->sn), _("View web profile"));
+ purple_notify_user_info_add_pair(user_info, NULL, tmp);
+ g_free(tmp);
+
purple_notify_userinfo(gc, userinfo->sn, user_info, NULL, NULL);
purple_notify_user_info_destroy(user_info);
============================================================
--- libpurple/protocols/yahoo/yahoo_profile.c e97dfd619ed4abfce3dd8ecbf04c729a76d18342
+++ libpurple/protocols/yahoo/yahoo_profile.c e307ae999cd4cf46974c3a5ad6646e7a17952c68
@@ -807,7 +807,7 @@ static void yahoo_got_info(PurpleUtilFet
*/
if (error_message != NULL || url_text == NULL || strcmp(url_text, "") == 0) {
purple_notify_user_info_add_pair(user_info, _("Error retrieving profile"), NULL);
- purple_notify_userinfo(info_data->gc, info_data->name,
+ purple_notify_userinfo(info_data->gc, info_data->name,
user_info, NULL, NULL);
purple_notify_user_info_destroy(user_info);
g_free(profile_url_text);
@@ -841,10 +841,10 @@ static void yahoo_got_info(PurpleUtilFet
_("If you wish to view this profile, "
"you will need to visit this link in your web browser:"),
profile_url_text, profile_url_text);
- purple_notify_user_info_add_pair(user_info, NULL, tmp);
+ purple_notify_user_info_add_pair(user_info, NULL, tmp);
g_free(tmp);
- purple_notify_userinfo(info_data->gc, info_data->name,
+ purple_notify_userinfo(info_data->gc, info_data->name,
user_info, NULL, NULL);
g_free(profile_url_text);
@@ -1193,17 +1193,15 @@ yahoo_got_photo(PurpleUtilFetchUrlData *
if(!found)
{
- GString *str = g_string_new("");
+ const gchar *str;
- g_string_append_printf(str, "<br><b>");
- g_string_append_printf(str, _("User information for %s unavailable"),
- info_data->name);
- g_string_append_printf(str, "</b><br>");
+ purple_notify_user_info_add_section_break(user_info);
+ purple_notify_user_info_add_pair(user_info,
+ _("Error retrieving profile"), NULL);
if (profile_state == PROFILE_STATE_UNKNOWN_LANGUAGE) {
- g_string_append_printf(str, "%s<br><br>",
- _("Sorry, this profile seems to be in a language "
- "or format that is not supported at this time."));
+ str = _("This profile is in a language "
+ "or format that is not supported at this time.");
} else if (profile_state == PROFILE_STATE_NOT_FOUND) {
PurpleBuddy *b = purple_find_buddy
@@ -1217,27 +1215,26 @@ yahoo_got_photo(PurpleUtilFetchUrlData *
*/
f = yahoo_friend_find(b->account->gc, b->name);
}
- g_string_append_printf(str, "%s<br><br>",
- f? _("Could not retrieve the user's profile. "
+ str = f ? _("Could not retrieve the user's profile. "
"This most likely is a temporary server-side problem. "
- "Please try again later."):
+ "Please try again later.") :
_("Could not retrieve the user's profile. "
"This most likely means that the user does not exist; "
"however, Yahoo! sometimes does fail to find a user's "
"profile. If you know that the user exists, "
- "please try again later."));
+ "please try again later.");
} else {
- g_string_append_printf(str, "%s<br><br>",
- _("The user's profile is empty."));
+ str = _("The user's profile is empty.");
}
-
- purple_notify_user_info_add_pair(user_info, NULL, str->str);
- g_string_free(str, TRUE);
+
+ purple_notify_user_info_add_pair(user_info, NULL, str);
}
/* put a link to the actual profile URL */
- tmp = g_strdup_printf("<a href=\"%s\">%s</a>", profile_url_text, profile_url_text);
- purple_notify_user_info_add_pair(user_info, _("Profile URL"), tmp);
+ purple_notify_user_info_add_section_break(user_info);
+ tmp = g_strdup_printf("<a href=\"%s\">%s</a>",
+ profile_url_text, _("View web profile"));
+ purple_notify_user_info_add_pair(user_info, NULL, tmp);
g_free(tmp);
g_free(stripped);
More information about the Commits
mailing list