# HG changeset patch
# User Yoshiki Yazawa <yaz@honeyplanet.jp>
# Date 1253292851 -32400
# Node ID f021bd3431a63f5802ee3fa75e824a3b4dd94373
# Parent  c5b2c6bc281590f24e27afbcd9360d9a9bab7403
fixed breakage of twitter icon retrieval.

diff -r c5b2c6bc2815 -r f021bd3431a6 icon.c
--- a/icon.c	Wed Sep 02 02:48:55 2009 +0900
+++ b/icon.c	Sat Sep 19 01:54:11 2009 +0900
@@ -602,7 +602,7 @@
     /* Create the URL for an user's icon. */
     switch(service) {
     case twitter_service:
-        url = g_strdup_printf("http://twitter.com/%s", user_name);
+        url = g_strdup_printf("http://twitter.com/users/show/%s.xml", user_name);
         break;
     case wassr_service:
         url = g_strdup_printf("http://wassr.jp/user/%s", user_name);
@@ -638,7 +638,7 @@
                                               TRUE, got_page_cb, gotdata);
             twitter_debug("requested url = %s\n", url);
         }
-        else { /* probably it is unnecessary */
+        else { /* used by ffeed */
             data->fetch_data =
                 purple_util_fetch_url_request(url, TRUE, NULL, TRUE, NULL,
                                               FALSE, got_icon_cb, gotdata);
diff -r c5b2c6bc2815 -r f021bd3431a6 pidgin-twitter.h
--- a/pidgin-twitter.h	Wed Sep 02 02:48:55 2009 +0900
+++ b/pidgin-twitter.h	Sat Sep 19 01:54:11 2009 +0900
@@ -186,7 +186,7 @@
 #define P_TAG_TWITTER       "(^|\\s+)#([-A-Za-z0-9_]+)"
 #define P_TAG_IDENTICA      "#([-A-Za-z0-9_]+)"
 #define P_GROUP_IDENTICA    "!([-A-Za-z0-9_]+)"
-#define P_IMAGE_TWITTER     "<img .*=\"profile-(?:image|img)\".*src=\"(https?://.+?)\".*/>"
+#define P_IMAGE_TWITTER     "<profile_image_url>(https?://.+?)</profile_image_url>"
 #define P_IMAGE_WASSR       "<div class=\"image\"><a href=\".+\"><img src=\"(.+)\" width=\".+?\" /></a></div>"
 #define P_IMAGE_IDENTICA    "<img src=\"(https?://.+.identi.ca/.+)\" class=\"photo avatar\""
 #define P_IMAGE_JISKO       "<img src=\"(https?://jisko.net/.+/img/avatar/.+_side\\..+)\" alt=\"Avatar\" />"