HGKeeper

Move status icons to the status icon theme specification directory

2018-05-08, Mike Ruprecht

5014cd8d58e3

Parents ced50832d0c7
Children 036994f402eb

Move status icons to the status icon theme specification directory

This patch moves the status icons into a location which can be used
by GtkIconTheme. It also renames a few of them ('available' =>
'user-available' and similar) to more closely follow the freedesktop
icon theme specification.

'user-extended-away' and 'user-busy' aren't technically standard,
but I changed them as well to be more consistent with the pattern.
A couple more of them may be good to change, but I wasn't sure, so
they can be changed in a later commit if desired.

It also updates code which directly accesses the icon files.

136 files changed, 35 insertions(+), 14 deletions(-)

+0 -0

pidgin/data/icons/hicolor/11x11/status/chat.png

+0 -0

pidgin/data/icons/hicolor/11x11/status/log-in.png

+0 -0

pidgin/data/icons/hicolor/11x11/status/log-out.png

+0 -0

pidgin/data/icons/hicolor/11x11/status/person.png

+0 -0

pidgin/data/icons/hicolor/11x11/status/rtl/log-in.png

+0 -0

pidgin/data/icons/hicolor/11x11/status/rtl/log-out.png

+0 -0

pidgin/data/icons/hicolor/11x11/status/rtl/user-extended-away.png

+0 -0

pidgin/data/icons/hicolor/11x11/status/user-available.png

+0 -0

pidgin/data/icons/hicolor/11x11/status/user-away.png

+0 -0

pidgin/data/icons/hicolor/11x11/status/user-busy.png

+0 -0

pidgin/data/icons/hicolor/11x11/status/user-extended-away.png

+0 -0

pidgin/data/icons/hicolor/11x11/status/user-invisible.png

+0 -0

pidgin/data/icons/hicolor/11x11/status/user-offline.png

+0 -0

pidgin/data/icons/hicolor/16x16/status/chat.png

+0 -0

pidgin/data/icons/hicolor/16x16/status/log-in.png

+0 -0

pidgin/data/icons/hicolor/16x16/status/log-out.png

+0 -0

pidgin/data/icons/hicolor/16x16/status/person.png

+0 -0

pidgin/data/icons/hicolor/16x16/status/rtl/log-in.png

+0 -0

pidgin/data/icons/hicolor/16x16/status/rtl/log-out.png

+0 -0

pidgin/data/icons/hicolor/16x16/status/rtl/user-extended-away.png

+0 -0

pidgin/data/icons/hicolor/16x16/status/user-available.png

+0 -0

pidgin/data/icons/hicolor/16x16/status/user-away.png

+0 -0

pidgin/data/icons/hicolor/16x16/status/user-busy.png

+0 -0

pidgin/data/icons/hicolor/16x16/status/user-extended-away.png

+0 -0

pidgin/data/icons/hicolor/16x16/status/user-invisible.png

+0 -0

pidgin/data/icons/hicolor/16x16/status/user-offline.png

+0 -0

pidgin/data/icons/hicolor/22x22/status/chat.png

+0 -0

pidgin/data/icons/hicolor/22x22/status/log-in.png

+0 -0

pidgin/data/icons/hicolor/22x22/status/log-out.png

+0 -0

pidgin/data/icons/hicolor/22x22/status/person.png

+0 -0

pidgin/data/icons/hicolor/22x22/status/rtl/log-in.png

+0 -0

pidgin/data/icons/hicolor/22x22/status/rtl/log-out.png

+0 -0

pidgin/data/icons/hicolor/22x22/status/rtl/user-extended-away.png

+0 -0

pidgin/data/icons/hicolor/22x22/status/user-available.png

+0 -0

pidgin/data/icons/hicolor/22x22/status/user-away.png

+0 -0

pidgin/data/icons/hicolor/22x22/status/user-busy.png

+0 -0

pidgin/data/icons/hicolor/22x22/status/user-extended-away.png

+0 -0

pidgin/data/icons/hicolor/22x22/status/user-invisible.png

+0 -0

pidgin/data/icons/hicolor/22x22/status/user-offline.png

+0 -0

pidgin/data/icons/hicolor/32x32/status/chat.png

+0 -0

pidgin/data/icons/hicolor/32x32/status/log-in.png

+0 -0

pidgin/data/icons/hicolor/32x32/status/log-out.png

+0 -0

pidgin/data/icons/hicolor/32x32/status/person.png

+0 -0

pidgin/data/icons/hicolor/32x32/status/rtl/log-in.png

+0 -0

pidgin/data/icons/hicolor/32x32/status/rtl/log-out.png

+0 -0

pidgin/data/icons/hicolor/32x32/status/rtl/user-extended-away.png

+0 -0

pidgin/data/icons/hicolor/32x32/status/user-available.png

+0 -0

pidgin/data/icons/hicolor/32x32/status/user-away.png

+0 -0

pidgin/data/icons/hicolor/32x32/status/user-busy.png

+0 -0

pidgin/data/icons/hicolor/32x32/status/user-extended-away.png

+0 -0

pidgin/data/icons/hicolor/32x32/status/user-invisible.png

+0 -0

pidgin/data/icons/hicolor/32x32/status/user-offline.png

+0 -0

pidgin/data/icons/hicolor/48x48/status/chat.png

+0 -0

pidgin/data/icons/hicolor/48x48/status/log-in.png

+0 -0

pidgin/data/icons/hicolor/48x48/status/log-out.png

+0 -0

pidgin/data/icons/hicolor/48x48/status/person.png

+0 -0

pidgin/data/icons/hicolor/48x48/status/rtl/log-in.png

+0 -0

pidgin/data/icons/hicolor/48x48/status/rtl/log-out.png

+0 -0

pidgin/data/icons/hicolor/48x48/status/rtl/user-extended-away.png

+0 -0

pidgin/data/icons/hicolor/48x48/status/user-available.png

+0 -0

pidgin/data/icons/hicolor/48x48/status/user-away.png

+0 -0

pidgin/data/icons/hicolor/48x48/status/user-busy.png

+0 -0

pidgin/data/icons/hicolor/48x48/status/user-extended-away.png

+0 -0

pidgin/data/icons/hicolor/48x48/status/user-invisible.png

+0 -0

pidgin/data/icons/hicolor/48x48/status/user-offline.png

+20 -0

pidgin/data/icons/meson.build

+2 -2

pidgin/gtkblist.c

+6 -6

pidgin/pidginstock.c

+0 -1

pidgin/pixmaps/meson.build

+0 -0

pidgin/pixmaps/status/11/available.png

+0 -0

pidgin/pixmaps/status/11/away.png

+0 -0

pidgin/pixmaps/status/11/busy.png

+0 -0

pidgin/pixmaps/status/11/chat.png

+0 -0

pidgin/pixmaps/status/11/extended-away.png

+0 -0

pidgin/pixmaps/status/11/invisible.png

+0 -0

pidgin/pixmaps/status/11/log-in.png

+0 -0

pidgin/pixmaps/status/11/log-out.png

+0 -0

pidgin/pixmaps/status/11/offline.png

+0 -0

pidgin/pixmaps/status/11/person.png

+0 -0

pidgin/pixmaps/status/11/rtl/extended-away.png

+0 -0

pidgin/pixmaps/status/11/rtl/log-in.png

+0 -0

pidgin/pixmaps/status/11/rtl/log-out.png

+0 -0

pidgin/pixmaps/status/16/available.png

+0 -0

pidgin/pixmaps/status/16/away.png

+0 -0

pidgin/pixmaps/status/16/busy.png

+0 -0

pidgin/pixmaps/status/16/chat.png

+0 -0

pidgin/pixmaps/status/16/extended-away.png

+0 -0

pidgin/pixmaps/status/16/invisible.png

+0 -0

pidgin/pixmaps/status/16/log-in.png

+0 -0

pidgin/pixmaps/status/16/log-out.png

+0 -0

pidgin/pixmaps/status/16/offline.png

+0 -0

pidgin/pixmaps/status/16/person.png

+0 -0

pidgin/pixmaps/status/16/rtl/extended-away.png

+0 -0

pidgin/pixmaps/status/16/rtl/log-in.png

+0 -0

pidgin/pixmaps/status/16/rtl/log-out.png

+0 -0

pidgin/pixmaps/status/22/available.png

+0 -0

pidgin/pixmaps/status/22/away.png

+0 -0

pidgin/pixmaps/status/22/busy.png

+0 -0

pidgin/pixmaps/status/22/chat.png

+0 -0

pidgin/pixmaps/status/22/extended-away.png

+0 -0

pidgin/pixmaps/status/22/invisible.png

+0 -0

pidgin/pixmaps/status/22/log-in.png

+0 -0

pidgin/pixmaps/status/22/log-out.png

+0 -0

pidgin/pixmaps/status/22/offline.png

+0 -0

pidgin/pixmaps/status/22/person.png

+0 -0

pidgin/pixmaps/status/22/rtl/extended-away.png

+0 -0

pidgin/pixmaps/status/22/rtl/log-in.png

+0 -0

pidgin/pixmaps/status/22/rtl/log-out.png

+0 -0

pidgin/pixmaps/status/32/available.png

+0 -0

pidgin/pixmaps/status/32/away.png

+0 -0

pidgin/pixmaps/status/32/busy.png

+0 -0

pidgin/pixmaps/status/32/chat.png

+0 -0

pidgin/pixmaps/status/32/extended-away.png

+0 -0

pidgin/pixmaps/status/32/invisible.png

+0 -0

pidgin/pixmaps/status/32/log-in.png

+0 -0

pidgin/pixmaps/status/32/log-out.png

+0 -0

pidgin/pixmaps/status/32/offline.png

+0 -0

pidgin/pixmaps/status/32/person.png

+0 -0

pidgin/pixmaps/status/32/rtl/extended-away.png

+0 -0

pidgin/pixmaps/status/32/rtl/log-in.png

+0 -0

pidgin/pixmaps/status/32/rtl/log-out.png

+0 -0

pidgin/pixmaps/status/48/available.png

+0 -0

pidgin/pixmaps/status/48/away.png

+0 -0

pidgin/pixmaps/status/48/busy.png

+0 -0

pidgin/pixmaps/status/48/chat.png

+0 -0

pidgin/pixmaps/status/48/extended-away.png

+0 -0

pidgin/pixmaps/status/48/invisible.png

+0 -0

pidgin/pixmaps/status/48/log-in.png

+0 -0

pidgin/pixmaps/status/48/log-out.png

+0 -0

pidgin/pixmaps/status/48/offline.png

+0 -0

pidgin/pixmaps/status/48/person.png

+0 -0

pidgin/pixmaps/status/48/rtl/extended-away.png

+0 -0

pidgin/pixmaps/status/48/rtl/log-in.png

+0 -0

pidgin/pixmaps/status/48/rtl/log-out.png

+0 -4

pidgin/pixmaps/status/meson.build

+7 -1

pidgin/plugins/disco/gtkdisco.c

Binary file pidgin/data/icons/hicolor/11x11/status/chat.png has changed

Binary file pidgin/data/icons/hicolor/11x11/status/log-in.png has changed

Binary file pidgin/data/icons/hicolor/11x11/status/log-out.png has changed

Binary file pidgin/data/icons/hicolor/11x11/status/person.png has changed

Binary file pidgin/data/icons/hicolor/11x11/status/rtl/log-in.png has changed

Binary file pidgin/data/icons/hicolor/11x11/status/rtl/log-out.png has changed

Binary file pidgin/data/icons/hicolor/11x11/status/rtl/user-extended-away.png has changed

Binary file pidgin/data/icons/hicolor/11x11/status/user-available.png has changed

Binary file pidgin/data/icons/hicolor/11x11/status/user-away.png has changed

Binary file pidgin/data/icons/hicolor/11x11/status/user-busy.png has changed

Binary file pidgin/data/icons/hicolor/11x11/status/user-extended-away.png has changed

Binary file pidgin/data/icons/hicolor/11x11/status/user-invisible.png has changed

Binary file pidgin/data/icons/hicolor/11x11/status/user-offline.png has changed

Binary file pidgin/data/icons/hicolor/16x16/status/chat.png has changed

Binary file pidgin/data/icons/hicolor/16x16/status/log-in.png has changed

Binary file pidgin/data/icons/hicolor/16x16/status/log-out.png has changed

Binary file pidgin/data/icons/hicolor/16x16/status/person.png has changed

Binary file pidgin/data/icons/hicolor/16x16/status/rtl/log-in.png has changed

Binary file pidgin/data/icons/hicolor/16x16/status/rtl/log-out.png has changed

Binary file pidgin/data/icons/hicolor/16x16/status/rtl/user-extended-away.png has changed

Binary file pidgin/data/icons/hicolor/16x16/status/user-available.png has changed

Binary file pidgin/data/icons/hicolor/16x16/status/user-away.png has changed

Binary file pidgin/data/icons/hicolor/16x16/status/user-busy.png has changed

Binary file pidgin/data/icons/hicolor/16x16/status/user-extended-away.png has changed

Binary file pidgin/data/icons/hicolor/16x16/status/user-invisible.png has changed

Binary file pidgin/data/icons/hicolor/16x16/status/user-offline.png has changed

Binary file pidgin/data/icons/hicolor/22x22/status/chat.png has changed

Binary file pidgin/data/icons/hicolor/22x22/status/log-in.png has changed

Binary file pidgin/data/icons/hicolor/22x22/status/log-out.png has changed

Binary file pidgin/data/icons/hicolor/22x22/status/person.png has changed

Binary file pidgin/data/icons/hicolor/22x22/status/rtl/log-in.png has changed

Binary file pidgin/data/icons/hicolor/22x22/status/rtl/log-out.png has changed

Binary file pidgin/data/icons/hicolor/22x22/status/rtl/user-extended-away.png has changed

Binary file pidgin/data/icons/hicolor/22x22/status/user-available.png has changed

Binary file pidgin/data/icons/hicolor/22x22/status/user-away.png has changed

Binary file pidgin/data/icons/hicolor/22x22/status/user-busy.png has changed

Binary file pidgin/data/icons/hicolor/22x22/status/user-extended-away.png has changed

Binary file pidgin/data/icons/hicolor/22x22/status/user-invisible.png has changed

Binary file pidgin/data/icons/hicolor/22x22/status/user-offline.png has changed

Binary file pidgin/data/icons/hicolor/32x32/status/chat.png has changed

Binary file pidgin/data/icons/hicolor/32x32/status/log-in.png has changed

Binary file pidgin/data/icons/hicolor/32x32/status/log-out.png has changed

Binary file pidgin/data/icons/hicolor/32x32/status/person.png has changed

Binary file pidgin/data/icons/hicolor/32x32/status/rtl/log-in.png has changed

Binary file pidgin/data/icons/hicolor/32x32/status/rtl/log-out.png has changed

Binary file pidgin/data/icons/hicolor/32x32/status/rtl/user-extended-away.png has changed

Binary file pidgin/data/icons/hicolor/32x32/status/user-available.png has changed

Binary file pidgin/data/icons/hicolor/32x32/status/user-away.png has changed

Binary file pidgin/data/icons/hicolor/32x32/status/user-busy.png has changed

Binary file pidgin/data/icons/hicolor/32x32/status/user-extended-away.png has changed

Binary file pidgin/data/icons/hicolor/32x32/status/user-invisible.png has changed

Binary file pidgin/data/icons/hicolor/32x32/status/user-offline.png has changed

Binary file pidgin/data/icons/hicolor/48x48/status/chat.png has changed

Binary file pidgin/data/icons/hicolor/48x48/status/log-in.png has changed

Binary file pidgin/data/icons/hicolor/48x48/status/log-out.png has changed

Binary file pidgin/data/icons/hicolor/48x48/status/person.png has changed

Binary file pidgin/data/icons/hicolor/48x48/status/rtl/log-in.png has changed

Binary file pidgin/data/icons/hicolor/48x48/status/rtl/log-out.png has changed

Binary file pidgin/data/icons/hicolor/48x48/status/rtl/user-extended-away.png has changed

Binary file pidgin/data/icons/hicolor/48x48/status/user-available.png has changed

Binary file pidgin/data/icons/hicolor/48x48/status/user-away.png has changed

Binary file pidgin/data/icons/hicolor/48x48/status/user-busy.png has changed

Binary file pidgin/data/icons/hicolor/48x48/status/user-extended-away.png has changed

Binary file pidgin/data/icons/hicolor/48x48/status/user-invisible.png has changed

Binary file pidgin/data/icons/hicolor/48x48/status/user-offline.png has changed

~~--- a/pidgin/data/icons/meson.build Tue May 08 19:00:23 2018 -0500~~

+++ b/pidgin/data/icons/meson.build Tue May 08 19:27:52 2018 -0500

@@ -12,3 +12,23 @@

install_data(join_paths(path, '@0@.svg'.format(icon)),

install_dir : join_paths(get_option('datadir'), 'icons', path))

endforeach

+

+EXCLUDE_FILES = [

+ '16x16/apps/pidgin.png',

+ '22x22/apps/pidgin.png',

+ '24x24/apps/pidgin.png',

+ '32x32/apps/pidgin.png',

+ '48x48/apps/pidgin.png',

+ 'scalable/apps/pidgin.svg',

+]

+

+EXCLUDE_DIRS = [

+ '16x16/apps/scalable',

+ '24x24/apps/scalable',

+ '32x32/apps/scalable',

+]

+

+install_subdir('hicolor',

+ exclude_files : EXCLUDE_FILES,

+ exclude_directories : EXCLUDE_DIRS,

+ install_dir : get_option('datadir') + '/pidgin/icons')

~~--- a/pidgin/gtkblist.c Tue May 08 19:00:23 2018 -0500~~

+++ b/pidgin/gtkblist.c Tue May 08 19:27:52 2018 -0500

@@ -3359,8 +3359,8 @@

char *path;

if (purple_strequal(mood, "busy")) {

~~- path = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin",~~

~~- "status", "16", "busy.png", NULL);~~

+ path = g_build_filename(PURPLE_DATADIR, "pidgin", "icons",

+ "hicolor", "16x16", "status", "user-busy.png", NULL);

} else if (purple_strequal(mood, "hiptop")) {

path = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin",

"emblems", "16", "hiptop.png", NULL);

~~--- a/pidgin/pidginstock.c Tue May 08 19:00:23 2018 -0500~~

+++ b/pidgin/pidginstock.c Tue May 08 19:27:52 2018 -0500

@@ -192,15 +192,15 @@

const SizedStockIcon sized_status_icons [] = {

~~- { PIDGIN_STOCK_STATUS_AVAILABLE, "status", "available.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, PIDGIN_STOCK_STATUS_AVAILABLE_I },~~

~~- { PIDGIN_STOCK_STATUS_AWAY, "status", "away.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, PIDGIN_STOCK_STATUS_AWAY_I },~~

~~- { PIDGIN_STOCK_STATUS_BUSY, "status", "busy.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, PIDGIN_STOCK_STATUS_BUSY_I },~~

+ { PIDGIN_STOCK_STATUS_AVAILABLE, "status", "user-available.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, PIDGIN_STOCK_STATUS_AVAILABLE_I },

+ { PIDGIN_STOCK_STATUS_AWAY, "status", "user-away.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, PIDGIN_STOCK_STATUS_AWAY_I },

+ { PIDGIN_STOCK_STATUS_BUSY, "status", "user-busy.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, PIDGIN_STOCK_STATUS_BUSY_I },

{ PIDGIN_STOCK_STATUS_CHAT, "status", "chat.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },

~~- { PIDGIN_STOCK_STATUS_INVISIBLE, "status", "invisible.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },~~

~~- { PIDGIN_STOCK_STATUS_XA, "status", "extended-away.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, PIDGIN_STOCK_STATUS_XA_I },~~

+ { PIDGIN_STOCK_STATUS_INVISIBLE, "status", "user-invisible.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },

+ { PIDGIN_STOCK_STATUS_XA, "status", "user-extended-away.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, PIDGIN_STOCK_STATUS_XA_I },

{ PIDGIN_STOCK_STATUS_LOGIN, "status", "log-in.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL },

{ PIDGIN_STOCK_STATUS_LOGOUT, "status", "log-out.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, NULL },

~~- { PIDGIN_STOCK_STATUS_OFFLINE, "status", "offline.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, PIDGIN_STOCK_STATUS_OFFLINE_I },~~

+ { PIDGIN_STOCK_STATUS_OFFLINE, "status", "user-offline.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, PIDGIN_STOCK_STATUS_OFFLINE_I },

{ PIDGIN_STOCK_STATUS_PERSON, "status", "person.png", TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },

{ PIDGIN_STOCK_STATUS_MESSAGE, "toolbar", "message-new.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }

};

~~--- a/pidgin/pixmaps/meson.build Tue May 08 19:00:23 2018 -0500~~

+++ b/pidgin/pixmaps/meson.build Tue May 08 19:27:52 2018 -0500

@@ -21,7 +21,6 @@

install_subdir('emblems',

install_dir : pidginpixmapdir)

subdir('protocols')

~~- subdir('status')~~

subdir('toolbar')

subdir('tray')

endif

Binary file pidgin/pixmaps/status/11/available.png has changed

Binary file pidgin/pixmaps/status/11/away.png has changed

Binary file pidgin/pixmaps/status/11/busy.png has changed

Binary file pidgin/pixmaps/status/11/chat.png has changed

Binary file pidgin/pixmaps/status/11/extended-away.png has changed

Binary file pidgin/pixmaps/status/11/invisible.png has changed

Binary file pidgin/pixmaps/status/11/log-in.png has changed

Binary file pidgin/pixmaps/status/11/log-out.png has changed

Binary file pidgin/pixmaps/status/11/offline.png has changed

Binary file pidgin/pixmaps/status/11/person.png has changed

Binary file pidgin/pixmaps/status/11/rtl/extended-away.png has changed

Binary file pidgin/pixmaps/status/11/rtl/log-in.png has changed

Binary file pidgin/pixmaps/status/11/rtl/log-out.png has changed

Binary file pidgin/pixmaps/status/16/available.png has changed

Binary file pidgin/pixmaps/status/16/away.png has changed

Binary file pidgin/pixmaps/status/16/busy.png has changed

Binary file pidgin/pixmaps/status/16/chat.png has changed

Binary file pidgin/pixmaps/status/16/extended-away.png has changed

Binary file pidgin/pixmaps/status/16/invisible.png has changed

Binary file pidgin/pixmaps/status/16/log-in.png has changed

Binary file pidgin/pixmaps/status/16/log-out.png has changed

Binary file pidgin/pixmaps/status/16/offline.png has changed

Binary file pidgin/pixmaps/status/16/person.png has changed

Binary file pidgin/pixmaps/status/16/rtl/extended-away.png has changed

Binary file pidgin/pixmaps/status/16/rtl/log-in.png has changed

Binary file pidgin/pixmaps/status/16/rtl/log-out.png has changed

Binary file pidgin/pixmaps/status/22/available.png has changed

Binary file pidgin/pixmaps/status/22/away.png has changed

Binary file pidgin/pixmaps/status/22/busy.png has changed

Binary file pidgin/pixmaps/status/22/chat.png has changed

Binary file pidgin/pixmaps/status/22/extended-away.png has changed

Binary file pidgin/pixmaps/status/22/invisible.png has changed

Binary file pidgin/pixmaps/status/22/log-in.png has changed

Binary file pidgin/pixmaps/status/22/log-out.png has changed

Binary file pidgin/pixmaps/status/22/offline.png has changed

Binary file pidgin/pixmaps/status/22/person.png has changed

Binary file pidgin/pixmaps/status/22/rtl/extended-away.png has changed

Binary file pidgin/pixmaps/status/22/rtl/log-in.png has changed

Binary file pidgin/pixmaps/status/22/rtl/log-out.png has changed

Binary file pidgin/pixmaps/status/32/available.png has changed

Binary file pidgin/pixmaps/status/32/away.png has changed

Binary file pidgin/pixmaps/status/32/busy.png has changed

Binary file pidgin/pixmaps/status/32/chat.png has changed

Binary file pidgin/pixmaps/status/32/extended-away.png has changed

Binary file pidgin/pixmaps/status/32/invisible.png has changed

Binary file pidgin/pixmaps/status/32/log-in.png has changed

Binary file pidgin/pixmaps/status/32/log-out.png has changed

Binary file pidgin/pixmaps/status/32/offline.png has changed

Binary file pidgin/pixmaps/status/32/person.png has changed

Binary file pidgin/pixmaps/status/32/rtl/extended-away.png has changed

Binary file pidgin/pixmaps/status/32/rtl/log-in.png has changed

Binary file pidgin/pixmaps/status/32/rtl/log-out.png has changed

Binary file pidgin/pixmaps/status/48/available.png has changed

Binary file pidgin/pixmaps/status/48/away.png has changed

Binary file pidgin/pixmaps/status/48/busy.png has changed

Binary file pidgin/pixmaps/status/48/chat.png has changed

Binary file pidgin/pixmaps/status/48/extended-away.png has changed

Binary file pidgin/pixmaps/status/48/invisible.png has changed

Binary file pidgin/pixmaps/status/48/log-in.png has changed

Binary file pidgin/pixmaps/status/48/log-out.png has changed

Binary file pidgin/pixmaps/status/48/offline.png has changed

Binary file pidgin/pixmaps/status/48/person.png has changed

Binary file pidgin/pixmaps/status/48/rtl/extended-away.png has changed

Binary file pidgin/pixmaps/status/48/rtl/log-in.png has changed

Binary file pidgin/pixmaps/status/48/rtl/log-out.png has changed

~~--- a/pidgin/pixmaps/status/meson.build Tue May 08 19:00:23 2018 -0500~~

+++ /dev/null Thu Jan 01 00:00:00 1970 +0000

@@ -1,4 +0,0 @@

~~-foreach dir : ['11', '16', '22', '32', '48']~~

~~- install_subdir(dir,~~

~~- install_dir: join_paths(pidginpixmapdir, 'status'))~~

~~-endforeach~~

~~--- a/pidgin/plugins/disco/gtkdisco.c Tue May 08 19:00:23 2018 -0500~~

+++ b/pidgin/plugins/disco/gtkdisco.c Tue May 08 19:27:52 2018 -0500

@@ -114,10 +114,13 @@

{

GdkPixbuf *pixbuf = NULL;

char *filename = NULL;

+ gchar *tmp_size;

g_return_val_if_fail(service != NULL, NULL);

g_return_val_if_fail(size != NULL, NULL);

+ tmp_size = g_strdup_printf("%sx%s", size, size);

+

if (service->type == XMPP_DISCO_SERVICE_TYPE_GATEWAY && service->gateway_type) {

char *tmp = g_strconcat(service->gateway_type, ".png", NULL);

filename = g_build_filename(PURPLE_DATADIR,

@@ -130,9 +133,12 @@

#endif

} else if (service->type == XMPP_DISCO_SERVICE_TYPE_CHAT) {

filename = g_build_filename(PURPLE_DATADIR,

~~- "pixmaps", "pidgin", "status", size, "chat.png", NULL);~~

+ "pidgin", "icons", "hicolor", tmp_size, "status",

+ "chat.png", NULL);

}

+ g_free(tmp_size);

+

if (filename) {

pixbuf = gdk_pixbuf_new_from_file(filename, NULL);

g_free(filename);