Mercurial > pidgin3 / changeset

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