Mercurial > pidgin.yaz
changeset 26760:78ef23551355
merge of '18a763ca3d80ae60e586ade3456b8d59196a7b8f'
and '54b44cf23dd4b4d1e79d9c5b04a1496758072127'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Mon, 20 Apr 2009 00:05:54 +0000 |
| parents | d58fa4c34987 (diff) fc8c1933bc22 (current diff) |
| children | 872d30754311 |
| files | ChangeLog.API libpurple/protocols/toc/Makefile.am libpurple/protocols/toc/Makefile.mingw libpurple/protocols/toc/PROTOCOL libpurple/protocols/toc/toc.c libpurple/smiley.h |
| diffstat | 3 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog.API Fri Apr 03 02:42:38 2009 +0000 +++ b/ChangeLog.API Mon Apr 20 00:05:54 2009 +0000 @@ -38,7 +38,6 @@ Deprecated: * purple_buddy_get_local_alias * purple_notify_user_info_remove_entry - * purple_smiley_get_storing_dir * purple_status_type_set_primary_attr * purple_status_type_add_attr * purple_status_type_add_attrs
--- a/libpurple/smiley.c Fri Apr 03 02:42:38 2009 +0000 +++ b/libpurple/smiley.c Mon Apr 20 00:05:54 2009 +0000 @@ -57,7 +57,9 @@ static guint save_timer = 0; static gboolean smileys_loaded = FALSE; +static char *smileys_dir = NULL; +#define SMILEYS_DEFAULT_FOLDER "custom_smiley" #define SMILEYS_LOG_ID "smileys" #define XML_FILE_NAME "smileys.xml" @@ -870,7 +872,7 @@ const char * purple_smileys_get_storing_dir(void) { - return ""; + return smileys_dir; } void @@ -879,6 +881,8 @@ smiley_shortcut_index = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); smiley_checksum_index = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); + smileys_dir = g_build_filename(purple_user_dir(), SMILEYS_DEFAULT_FOLDER, NULL); + purple_smileys_load(); } @@ -893,5 +897,6 @@ g_hash_table_destroy(smiley_shortcut_index); g_hash_table_destroy(smiley_checksum_index); + g_free(smileys_dir); }
--- a/libpurple/smiley.h Fri Apr 03 02:42:38 2009 +0000 +++ b/libpurple/smiley.h Mon Apr 20 00:05:54 2009 +0000 @@ -236,10 +236,10 @@ /** * Returns the directory used to store custom smiley cached files. * - * @return The directory to store custom smyles cached files to. + * The default directory is PURPLEDIR/custom_smiley, unless otherwise specified + * by purple_buddy_icons_set_cache_dir(). * - * @deprecated This function isn't used and does nothing and will be - * removed in 3.0.0. + * @return The directory in which to store custom smileys cached files. */ const char *purple_smileys_get_storing_dir(void);