Mercurial > pidgin.yaz
comparison pidgin/gtkstatusbox.c @ 29692:fb99a0067812
propagate from branch 'im.pidgin.pidgin' (head 70d69397ed952b26b453423c381c70d6783eb66d)
to branch 'im.pidgin.cpw.attention_ui' (head 1cf0dea282a0d0e4aeac4770e0150d6d0c10830a)
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Thu, 13 Aug 2009 17:42:44 +0000 |
| parents | 6e1a582ae629 |
| children | e35043e96a1a 2dcff225172e |
comparison
equal
deleted
inserted
replaced
| 29691:338d6a211055 | 29692:fb99a0067812 |
|---|---|
| 464 else | 464 else |
| 465 { | 465 { |
| 466 const char *filename = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/accounts/buddyicon"); | 466 const char *filename = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/accounts/buddyicon"); |
| 467 PurpleStoredImage *img = NULL; | 467 PurpleStoredImage *img = NULL; |
| 468 | 468 |
| 469 if (filename != NULL) | 469 if (filename && *filename) |
| 470 img = purple_imgstore_new_from_file(filename); | 470 img = purple_imgstore_new_from_file(filename); |
| 471 | 471 |
| 472 pidgin_status_box_set_buddy_icon(status_box, img); | 472 pidgin_status_box_set_buddy_icon(status_box, img); |
| 473 if (img) | 473 if (img) |
| 474 /* | 474 /* |