Ticket #2370: media_alert_icon.patch

src/preferences/media/Jamfile

@@ -6 +6 @@
     SubDirC++Flags -fmultiple-symbol-spaces ;
 }
 
+UseLibraryHeaders icon ;
 UsePrivateHeaders media ;
 
 Preference Media :

src/preferences/media/MediaAlert.cpp

@@ -22 +22 @@
 #include <Screen.h>
 #include <View.h>
 
+#include <IconUtils.h>
 #include <File.h>
 #include <FindDirectory.h>
 #include <Path.h>
@@ -130 +131 @@
                 // Load the raw icon data
                 size_t size;
                 const void* rawIcon =
-                    Resources.LoadResource(B_LARGE_ICON_TYPE, iconName, &size);
+                    Resources.LoadResource(B_VECTOR_ICON_TYPE, iconName, &size);
 
                 if (rawIcon)
                 {
                     // Now build the bitmap
                     Icon = new BBitmap(BRect(0, 0, 31, 31), B_CMAP8);
-                    Icon->SetBits(rawIcon, size, 0, B_CMAP8);
+                    if (BIconUtils::GetVectorIcon((const uint8*)rawIcon, size, Icon) != B_OK) {
+                        delete Icon;
+                        Icon = NULL;
+                    }
                 }
             }
         }