diff options
| -rw-r--r-- | ChangeLog.API | 1 | ||||
| -rw-r--r-- | libpurple/smiley.c | 7 | ||||
| -rw-r--r-- | libpurple/smiley.h | 6 |
3 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog.API b/ChangeLog.API index 6fdba25018..6c49b978b8 100644 --- a/ChangeLog.API +++ b/ChangeLog.API @@ -38,7 +38,6 @@ version 2.6.0 (??/??/2009): 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 diff --git a/libpurple/smiley.c b/libpurple/smiley.c index 2b05c55d17..2c08b5994b 100644 --- a/libpurple/smiley.c +++ b/libpurple/smiley.c @@ -57,7 +57,9 @@ static GHashTable *smiley_checksum_index = NULL; /* checksum (char *) => smiley 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 @@ purple_smileys_find_by_checksum(const char *checksum) const char * purple_smileys_get_storing_dir(void) { - return ""; + return smileys_dir; } void @@ -879,6 +881,8 @@ purple_smileys_init() 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 @@ purple_smileys_uninit() g_hash_table_destroy(smiley_shortcut_index); g_hash_table_destroy(smiley_checksum_index); + g_free(smileys_dir); } diff --git a/libpurple/smiley.h b/libpurple/smiley.h index cb951b6cbf..cfd2c0bb43 100644 --- a/libpurple/smiley.h +++ b/libpurple/smiley.h @@ -236,10 +236,10 @@ purple_smileys_find_by_checksum(const char *checksum); /** * 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); |