qulogic/pidgin

Move e2ee icons to status directory of the icon theme specification

2018-05-08, Mike Ruprecht
837015ba2923
Parents 51a3433434aa
Children 6586193474f2
Move e2ee icons to status directory of the icon theme specification

This patch moves the e2ee icons to the status directory of the icon
theme specification. It prefixes the icons with 'e2ee-' to keep them
clearly namespaced. It also updates code which directly accesses them.
10 files changed, 3 insertions(+), 5 deletions(-)
  • +0 -0
    pidgin/data/icons/hicolor/16x16/status/e2ee-finished.png
  • +0 -0
    pidgin/data/icons/hicolor/16x16/status/e2ee-not-private.png
  • +0 -0
    pidgin/data/icons/hicolor/16x16/status/e2ee-private.png
  • +0 -0
    pidgin/data/icons/hicolor/16x16/status/e2ee-unverified.png
  • +3 -3
    pidgin/gtkconv.c
  • +0 -0
    pidgin/pixmaps/e2ee/16/finished.png
  • +0 -0
    pidgin/pixmaps/e2ee/16/not-private.png
  • +0 -0
    pidgin/pixmaps/e2ee/16/private.png
  • +0 -0
    pidgin/pixmaps/e2ee/16/unverified.png
  • +0 -2
    pidgin/pixmaps/meson.build
    • Binary file pidgin/data/icons/hicolor/16x16/status/e2ee-finished.png has changed
    Binary file pidgin/data/icons/hicolor/16x16/status/e2ee-not-private.png has changed
    Binary file pidgin/data/icons/hicolor/16x16/status/e2ee-private.png has changed
    Binary file pidgin/data/icons/hicolor/16x16/status/e2ee-unverified.png has changed
    --- a/pidgin/gtkconv.c Tue May 08 21:33:59 2018 -0500
    +++ b/pidgin/gtkconv.c Tue May 08 21:59:25 2018 -0500
    @@ -4179,9 +4179,9 @@
    if (g_hash_table_lookup_extended(e2ee_stock, stock_name, NULL, (gpointer*)&image))
    return image;
    - g_snprintf(filename, sizeof(filename), "%s.png", stock_name);
    - path = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin",
    - "e2ee", "16", filename, NULL);
    + g_snprintf(filename, sizeof(filename), "e2ee-%s.png", stock_name);
    + path = g_build_filename(PURPLE_DATADIR, "pidgin", "icons",
    + "hicolor", "16x16", "status", filename, NULL);
    image = purple_image_new_from_file(path, NULL);
    g_free(path);
    Binary file pidgin/pixmaps/e2ee/16/finished.png has changed
    Binary file pidgin/pixmaps/e2ee/16/not-private.png has changed
    Binary file pidgin/pixmaps/e2ee/16/private.png has changed
    Binary file pidgin/pixmaps/e2ee/16/unverified.png has changed
    --- a/pidgin/pixmaps/meson.build Tue May 08 21:33:59 2018 -0500
    +++ b/pidgin/pixmaps/meson.build Tue May 08 21:59:25 2018 -0500
    @@ -13,7 +13,5 @@
    # extra stuff in our directories we don't want to install.
    install_data('edit.png', 'info.png', 'pause.png',
    install_dir : join_paths(pidginpixmapdir, 'buttons'))
    - install_subdir('e2ee',
    - install_dir : pidginpixmapdir)
    subdir('tray')
    endif