Mercurial > pidgin.yaz
comparison libpurple/protocols/qq/utils.c @ 24046:bcfc98c7a55f
merge of '546bf87105ac5b97c3962c083dfab015d37d9b05'
and 'e21702f98a100a93853bc53855b25488f2f9dbf7'
author | Daniel Atallah <daniel.atallah@gmail.com> |
---|---|
date | Mon, 15 Sep 2008 03:06:03 +0000 |
parents | 967344bc404d 25f62d21b3f8 |
children | dbc7a9742f8d |
comparison
equal
deleted
inserted
replaced
23757:69c218fd5d54 | 24046:bcfc98c7a55f |
---|---|
379 const char *qq_buddy_icon_dir(void) | 379 const char *qq_buddy_icon_dir(void) |
380 { | 380 { |
381 if (purple_prefs_exists("/prpl/qq/buddy_icon_dir")) | 381 if (purple_prefs_exists("/prpl/qq/buddy_icon_dir")) |
382 return purple_prefs_get_string("/prpl/qq/buddy_icon_dir"); | 382 return purple_prefs_get_string("/prpl/qq/buddy_icon_dir"); |
383 else | 383 else |
384 return QQ_BUDDY_ICON_DIR; | 384 return NULL; |
385 } | 385 } |
386 | |
387 #ifdef _WIN32 | |
388 const char *qq_win32_buddy_icon_dir(void) | |
389 { | |
390 static char *dir = NULL; | |
391 if (dir == NULL) | |
392 dir = g_build_filename(wpurple_install_dir(), "pixmaps", | |
393 "purple", "buddy_icons", "qq", NULL); | |
394 return dir; | |
395 } | |
396 #endif |