Mercurial > pidgin3 / file diff

--- a/pidgin/gtkblist.c	Tue May 08 19:55:05 2018 -0500
+++ b/pidgin/gtkblist.c	Tue May 08 22:25:29 2018 -0500
@@ -3362,8 +3362,9 @@
 		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);
+		path = g_build_filename(PURPLE_DATADIR, "pidgin", "icons",
+			"hicolor", "16x16", "emblems", "emblem-hiptop.png",
+			NULL);
 	} else {
 		char *filename = g_strdup_printf("%s.png", mood);
 		path = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin",
@@ -4074,8 +4075,9 @@
 	g_return_val_if_fail(buddy != NULL, NULL);
 
 	if (!purple_account_privacy_check(purple_buddy_get_account(buddy), purple_buddy_get_name(buddy))) {
-		path = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin",
-			"emblems", "16", "blocked.png", NULL);
+		path = g_build_filename(PURPLE_DATADIR, "pidgin", "icons",
+			"hicolor", "16x16", "emblems", "emblem-blocked.png",
+			NULL);
 		return _pidgin_blist_get_cached_emblem(path);
 	}
 
@@ -4095,14 +4097,16 @@
 	if (tune && purple_status_is_active(tune)) {
 		/* TODO: Replace "Tune" with generalized "Media" in 3.0. */
 		if (purple_status_get_attr_string(tune, "game") != NULL) {
-			path = g_build_filename(PURPLE_DATADIR, "pixmaps",
-				"pidgin", "emblems", "16", "game.png", NULL);
+			path = g_build_filename(PURPLE_DATADIR, "pidgin",
+				"icons", "hicolor", "16x16", "emblems",
+				"emblem-game.png", NULL);
 			return _pidgin_blist_get_cached_emblem(path);
 		}
 		/* TODO: Replace "Tune" with generalized "Media" in 3.0. */
 		if (purple_status_get_attr_string(tune, "office") != NULL) {
-			path = g_build_filename(PURPLE_DATADIR, "pixmaps",
-				"pidgin", "emblems", "16", "office.png", NULL);
+			path = g_build_filename(PURPLE_DATADIR, "pidgin",
+				"icons", "hicolor", "16x16", "emblems",
+				"emblem-office.png", NULL);
 			return _pidgin_blist_get_cached_emblem(path);
 		}
 		/* Regular old "tune" is the only one in all protocols. */
@@ -4132,9 +4136,9 @@
 
 		path = get_mood_icon_path(name);
 	} else {
-		filename = g_strdup_printf("%s.png", name);
-		path = g_build_filename(PURPLE_DATADIR, "pixmaps", "pidgin",
-			"emblems", "16", filename, NULL);
+		filename = g_strdup_printf("emblem-%s.png", name);
+		path = g_build_filename(PURPLE_DATADIR, "pidgin", "icons",
+			"hicolor", "16x16", "emblems", filename, NULL);
 		g_free(filename);
 	}