Mercurial > pidgin.yaz
diff 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 |
line wrap: on
line diff
--- a/libpurple/protocols/qq/utils.c Mon Sep 15 03:03:11 2008 +0000 +++ b/libpurple/protocols/qq/utils.c Mon Sep 15 03:06:03 2008 +0000 @@ -381,16 +381,5 @@ if (purple_prefs_exists("/prpl/qq/buddy_icon_dir")) return purple_prefs_get_string("/prpl/qq/buddy_icon_dir"); else - return QQ_BUDDY_ICON_DIR; + return NULL; } - -#ifdef _WIN32 -const char *qq_win32_buddy_icon_dir(void) -{ - static char *dir = NULL; - if (dir == NULL) - dir = g_build_filename(wpurple_install_dir(), "pixmaps", - "purple", "buddy_icons", "qq", NULL); - return dir; -} -#endif