core,data: Provide icons in DLNA standard sizes

Provide icons confirming to PNG_SM_ICO and PNG_LRG_ICO DLNA profiles to
satisfy DLNA requirement 7.2.28. We still distribute the 32x32 sized icons
but we do not expose them to UPnP clients.

diff --git a/configure.ac b/configure.ac
index db8f271..2735b76 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -310,8 +310,9 @@ src/plugins/test/Makefile
 data/Makefile
 data/xml/Makefile
 data/icons/Makefile
-data/icons/256x256/Makefile
 data/icons/32x32/Makefile
+data/icons/48x48/Makefile
+data/icons/120x120/Makefile
 data/icons/scalable/Makefile
 po/Makefile.in
 rygel-1.0.pc

diff --git a/data/icons/256x256/Makefile.am b/data/icons/120x120/Makefile.am
similarity index 50%
rename from data/icons/256x256/Makefile.am
rename to data/icons/120x120/Makefile.am
index d1f86d1..3f6ff94 100644 (file)
--- a/data/icons/256x256/Makefile.am
+++ b/data/icons/120x120/Makefile.am
@@ -1,4 +1,4 @@
-icondir = $(datadir)/icons/hicolor/256x256/apps
+icondir = $(datadir)/icons/hicolor/120x120/apps
 icon_DATA = rygel.png
 
 EXTRA_DIST = $(icon_DATA)

diff --git a/data/icons/120x120/rygel.png b/data/icons/120x120/rygel.png
new file mode 100644 (file)
index 0000000..2a182f0
Binary files /dev/null and b/data/icons/120x120/rygel.png differ

diff --git a/data/icons/256x256/rygel.png b/data/icons/256x256/rygel.png
deleted file mode 100644 (file)
index 3fd9194..0000000
Binary files a/data/icons/256x256/rygel.png and /dev/null differ

diff --git a/data/icons/48x48/Makefile.am b/data/icons/48x48/Makefile.am
new file mode 100644 (file)
index 0000000..e327d34
--- /dev/null
+++ b/data/icons/48x48/Makefile.am
@@ -0,0 +1,4 @@
+icondir = $(datadir)/icons/hicolor/48x48/apps
+icon_DATA = rygel.png
+
+EXTRA_DIST = $(icon_DATA)

diff --git a/data/icons/48x48/rygel.png b/data/icons/48x48/rygel.png
new file mode 100644 (file)
index 0000000..00fc5a4
Binary files /dev/null and b/data/icons/48x48/rygel.png differ

diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 8ba7385..1d38468 100644 (file)
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1 +1 @@
-SUBDIRS = 256x256 32x32 scalable
+SUBDIRS = 120x120 48x48 32x32 scalable

diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am
index 3bba0dc..1025e93 100644 (file)
--- a/src/rygel/Makefile.am
+++ b/src/rygel/Makefile.am
@@ -2,14 +2,14 @@ if UNINSTALLED
 shareddir = $(abs_top_builddir)/data
 desktopdir = $(shareddir)
 plugindir = $(abs_top_builddir)/src/plugins
-smallicondir = $(shareddir)/icons/32x32
-bigicondir = $(shareddir)/icons/256x256
+smallicondir = $(shareddir)/icons/48x48
+bigicondir = $(shareddir)/icons/120x120
 else
 shareddir = $(datadir)/rygel
 desktopdir = $(datadir)/applications
 plugindir = $(libdir)/rygel-1.0
-smallicondir = $(datadir)/icons/hicolor/32x32/apps
-bigicondir = $(datadir)/icons/hicolor/256x256/apps
+smallicondir = $(datadir)/icons/hicolor/48x48/apps
+bigicondir = $(datadir)/icons/hicolor/120x120/apps
 endif
 
 AM_CFLAGS = $(LIBGUPNP_CFLAGS) \

diff --git a/src/rygel/rygel-plugin.vala b/src/rygel/rygel-plugin.vala
index 4f0686b..1f2c986 100644 (file)
--- a/src/rygel/rygel-plugin.vala
+++ b/src/rygel/rygel-plugin.vala
@@ -41,10 +41,10 @@ public class Rygel.Plugin : GUPnP.ResourceFactory {
                                              PNG_EXT;
     private static const string ICON_MIME = "image/png";
     private static const int ICON_DEPTH = 32;
-    private static const int ICON_BIG_WIDTH = 256;
-    private static const int ICON_BIG_HEIGHT = 256;
-    private static const int ICON_SMALL_WIDTH = 32;
-    private static const int ICON_SMALL_HEIGHT = 32;
+    private static const int ICON_BIG_WIDTH = 120;
+    private static const int ICON_BIG_HEIGHT = 120;
+    private static const int ICON_SMALL_WIDTH = 48;
+    private static const int ICON_SMALL_HEIGHT = 48;
 
     public string name;
     public string title;