grim/pidgin

Move custom smileys to XDG directories.

2019-02-21, Elliott Sales de Andrade
5cd3c1c79e7a
Parents 06b7620caea2
Children c5f2f262afab
Move custom smileys to XDG directories.

Smileys themselves go into data, and the xml goes in config.
2 files changed, 4 insertions(+), 2 deletions(-)
  • +2 -0
    libpurple/core.c
  • +2 -2
    libpurple/smiley-custom.c
    • --- a/libpurple/core.c Thu Feb 21 23:13:34 2019 -0500
    +++ b/libpurple/core.c Thu Feb 21 23:32:27 2019 -0500
    @@ -362,6 +362,7 @@
    xdg_dir_exists = g_file_test(purple_data_dir(), G_FILE_TEST_EXISTS);
    if (!xdg_dir_exists) {
    MIGRATE_TO_XDG_DIR(purple_data_dir(), "certificates");
    + MIGRATE_TO_XDG_DIR(purple_data_dir(), "custom_smiley");
    MIGRATE_TO_XDG_DIR(purple_data_dir(), "logs");
    MIGRATE_TO_XDG_DIR(purple_config_dir(), "accounts.xml");
    MIGRATE_TO_XDG_DIR(purple_config_dir(), "blist.xml");
    @@ -369,6 +370,7 @@
    MIGRATE_TO_XDG_DIR(purple_config_dir(), "fs-element.conf");
    MIGRATE_TO_XDG_DIR(purple_config_dir(), "pounces.xml");
    MIGRATE_TO_XDG_DIR(purple_config_dir(), "prefs.xml");
    + MIGRATE_TO_XDG_DIR(purple_config_dir(), "smileys.xml");
    MIGRATE_TO_XDG_DIR(purple_config_dir(), "status.xml");
    }
    --- a/libpurple/smiley-custom.c Thu Feb 21 23:13:34 2019 -0500
    +++ b/libpurple/smiley-custom.c Thu Feb 21 23:32:27 2019 -0500
    @@ -300,9 +300,9 @@
    {
    gint ret;
    - smileys_dir = g_build_filename(purple_user_dir(),
    + smileys_dir = g_build_filename(purple_data_dir(),
    SMILEYS_DEFAULT_FOLDER, NULL);
    - smileys_index = g_build_filename(purple_user_dir(),
    + smileys_index = g_build_filename(purple_config_dir(),
    SMILEYS_INDEX_FILE, NULL);
    smileys_list = purple_smiley_list_new();