pidgin-twitter: icon.c comparison

comparison icon.c @ 264:b7ac562d758c

- changed the pattern for twitter icons so that it may match to protected user's icon link too. - when pixbuf is null, pidgin-twitter will renew icon even if new and old URLs are same. - will fall back to default icon if pixbuf couldn't be made from retrieved data. - code cleanup.

author	Yoshiki Yazawa <yaz@honeyplanet.jp>
date	Thu, 04 Dec 2008 18:24:06 +0900
parents	b2c64cd550da
children	c2944685ac8e

comparison

equal deleted inserted replaced

-:b2c64cd550da
+:b7ac562d758c
 GMatchInfo *match_info = NULL;
 icon_data *data = NULL;
 gchar *url = NULL;
 gint regp_id = -1;
+twitter_debug("called\n");
 if(service == twitter_service) {
 data = (icon_data *)g_hash_table_lookup(
 icon_hash[service], user_name);
 regp_id = IMAGE_TWITTER;
 }
 data = (icon_data *)g_hash_table_lookup(
 icon_hash[service], user_name);
 regp_id = IMAGE_JISKO;
 }
-if(!url_text) {
+/* retrieved nothing or got a bad response */
+if(!url_text ||
+(!strstr(url_text, "HTTP/1.1 200 OK") &&
+!strstr(url_text, "HTTP/1.0 200 OK"))) {
 if(data) {
 data->requested = FALSE;
 data->fetch_data = NULL;
 }
 g_free(gotdata->user_name);
 g_free(gotdata);
 return;
 }
-/* if we receive bad response */
+/* setup image url */
-if(!strstr(url_text, "HTTP/1.1 200 OK") &&
-!strstr(url_text, "HTTP/1.0 200 OK")) {
-if(data) {
-data->requested = FALSE;
-data->fetch_data = NULL;
-}
-g_free(gotdata->user_name);
-g_free(gotdata);
-return;
-}
-/* setup image url */ /* xxx need simplify --yaz */
 g_regex_match(regp[regp_id], url_text, 0, &match_info);
 if(!g_match_info_matches(match_info)) {
 g_match_info_free(match_info);
 if(service == twitter_service) {
 g_free(url);
 url = tmp;
 /* if requesting icon url is the same as old, return. */
-if(url && data->icon_url && !strcmp(data->icon_url, url)) {
+if(data && data->pixbuf &&
+url && data->icon_url && !strcmp(data->icon_url, url)) {
 twitter_debug("old url = %s new url = %s\n", data->icon_url, url);
 data->requested = FALSE;
 data->fetch_data = NULL;
 g_free(url);
 return;
 /* request fetch image */
 if(url) {
 /* reuse gotdata. just pass given one */
 /* gotdata will be released in got_icon_cb */
-data->fetch_data = purple_util_fetch_url(url,
+data->fetch_data =
-TRUE, NULL, TRUE,
+purple_util_fetch_url_request(url, TRUE, NULL, TRUE, NULL,
-got_icon_cb, gotdata);
+FALSE, got_icon_cb, gotdata);
 twitter_debug("request %s's icon\n", user_name);
 g_free(url);
 }
 }
 }
 if(hash)
 data = (icon_data *)g_hash_table_lookup(hash, user_name);
+if(!data) {
+twitter_debug("cannot retrieve icon_data from hash (should not be called)\n");
+goto fin_got_icon_cb;
+}
 /* return if download failed */
 if(!url_text) {
 twitter_debug("downloading %s's icon failed : %s\n",
 user_name, error_message);
-if(data)
 data->requested = FALSE;
 goto fin_got_icon_cb;
 }
-if(data) {
+/* remove download request */
-/* remove download request */
+data->requested = FALSE;
-data->requested = FALSE;
+data->fetch_data = NULL;
-data->fetch_data = NULL;
+/* return if user's icon has been downloaded */
-/* return if user's icon has been downloaded */
+if(data->pixbuf) {
-if(data->pixbuf) {
+twitter_debug("%s's icon has already been downloaded\n",
-twitter_debug("%s's icon has already been downloaded\n",
+user_name);
-user_name);
+goto fin_got_icon_cb;
-goto fin_got_icon_cb;
-}
 }
 pixbuf = make_scaled_pixbuf(url_text, len);
-if(!pixbuf)
+if(!pixbuf) {
+twitter_debug("cannot make pixbuf from downloaded data\n");
+/* ask to download default icon instead */
+got_icon_data *gotdata2 = g_new0(got_icon_data, 1);
+const gchar *url = NULL;
+gotdata2->user_name = g_strdup(gotdata->user_name);
+gotdata2->service = service;
+switch(service) {
+case twitter_service:
+url = TWITTER_DEFAULT_ICON_URL;
+break;
+case identica_service:
+url = IDENTICA_DEFAULT_ICON_URL;
+break;
+case jisko_service:
+url = JISKO_DEFAULT_ICON_URL;
+break;
+}
+g_free(data->icon_url);
+data->icon_url = g_strdup(url);
+data->requested = TRUE;
+data->fetch_data =
+purple_util_fetch_url_request(url, TRUE, NULL, TRUE, NULL,
+FALSE, got_icon_cb, gotdata2);
 goto fin_got_icon_cb;
-if(!data) {
-twitter_debug("allocate icon_data (shouldn't be called)\n");
-data = g_new0(icon_data, 1);
 }
 data->pixbuf = pixbuf;
 twitter_debug("new icon pixbuf = %p size = %d\n",
 GHashTable *hash = NULL;
 const gchar *suffix = NULL;
 switch(service) {
 case twitter_service:
-hash = icon_hash[twitter_service];
+hash = icon_hash[service];
 suffix = "twitter";
 break;
 case wassr_service:
-hash = icon_hash[wassr_service];
+hash = icon_hash[service];
 suffix = "wassr";
 break;
 case identica_service:
-hash = icon_hash[identica_service];
+hash = icon_hash[service];
 suffix = "identica";
 break;
 case jisko_service:
-hash = icon_hash[jisko_service];
+hash = icon_hash[service];
 suffix = "jisko";
 break;
 default:
 twitter_debug("unknown service\n");
 break;
 /* gotdata will be released in got_icon_cb */
 if(service == twitter_service ||
 service == wassr_service ||
 service == identica_service ||
 service == jisko_service) {
-data->fetch_data = purple_util_fetch_url(url, TRUE, NULL, TRUE,
+data->fetch_data =
-got_page_cb, gotdata);
+purple_util_fetch_url_request(url, TRUE, NULL, TRUE, NULL,
-}
+TRUE, got_page_cb, gotdata);
-else {
+}
-data->fetch_data = purple_util_fetch_url(url, TRUE, NULL, TRUE,
+else { /* unused */
-got_icon_cb, gotdata);
+data->fetch_data =
+purple_util_fetch_url_request(url, TRUE, NULL, TRUE, NULL,
+FALSE, got_icon_cb, gotdata);
 }
 g_free(url); url = NULL;
 twitter_debug("request %s's icon\n", user_name);
 }

Mercurial > pidgin-twitter

comparison icon.c @ 264:b7ac562d758c