[rygel] build,core: Build dictates paths of icons dirs

[Zeeshan Ali Khattak <zeeshanak src gnome org>]

commit c7602078ac803ab97be884fc5bf1b2087ddd73dd
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Sat Jul 24 19:41:40 2010 +0300

    build,core: Build dictates paths of icons dirs
    
    Build system dictates complete path of icons directories. This fixes rygel
    icon export over UPnP for uninstalled case.

 src/rygel/Makefile.am             |    9 ++++++---
 src/rygel/rygel-build-config.vapi |    7 +++++--
 src/rygel/rygel-plugin.vala       |    8 ++++----
 3 files changed, 15 insertions(+), 9 deletions(-)
---
diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am
index 0554181..d9c7f92 100644
--- a/src/rygel/Makefile.am
+++ b/src/rygel/Makefile.am
@@ -2,12 +2,14 @@ if UNINSTALLED
 shareddir = $(abs_top_builddir)/data
 desktopdir = $(shareddir)
 plugindir = $(abs_top_builddir)/src/plugins
-icondir = $(shareddir)/icons
+smallicondir = $(shareddir)/icons/32x32
+bigicondir = $(shareddir)/icons/256x256
 else
 shareddir = $(datadir)/rygel
 desktopdir = $(datadir)/applications
 plugindir = $(libdir)/rygel-1.0
-icondir = $(datadir)/icons/hicolor
+smallicondir = $(datadir)/icons/hicolor/32x32/apps
+bigicondir = $(datadir)/icons/hicolor/256x256/apps
 endif
 
 AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
@@ -21,7 +23,8 @@ AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
 	    -I$(top_srcdir) \
 	    -DDATA_DIR='"$(shareddir)"' -DSYS_CONFIG_DIR='"$(sysconfdir)"'\
 	    -DPLUGIN_DIR='"$(plugindir)"' -DDESKTOP_DIR='"$(desktopdir)"'\
-	    -DICON_DIR='"$(icondir)"' -include config.h
+	    -DSMALL_ICON_DIR='"$(smallicondir)"' \
+	    -DBIG_ICON_DIR='"$(bigicondir)"' -include config.h
 
 librygelincdir = $(includedir)/rygel-1.0
 
diff --git a/src/rygel/rygel-build-config.vapi b/src/rygel/rygel-build-config.vapi
index 08f3437..800780c 100644
--- a/src/rygel/rygel-build-config.vapi
+++ b/src/rygel/rygel-build-config.vapi
@@ -36,8 +36,11 @@ public class Rygel.BuildConfig {
     [CCode (cname = "PLUGIN_DIR")]
     public static const string PLUGIN_DIR;
 
-    [CCode (cname = "ICON_DIR")]
-    public static const string ICON_DIR;
+    [CCode (cname = "BIG_ICON_DIR")]
+    public static const string BIG_ICON_DIR;
+
+    [CCode (cname = "SMALL_ICON_DIR")]
+    public static const string SMALL_ICON_DIR;
 
     [CCode (cname = "PACKAGE_NAME")]
     public static const string PACKAGE_NAME;
diff --git a/src/rygel/rygel-plugin.vala b/src/rygel/rygel-plugin.vala
index 03cccb0..864221f 100644
--- a/src/rygel/rygel-plugin.vala
+++ b/src/rygel/rygel-plugin.vala
@@ -33,11 +33,11 @@ public class Rygel.Plugin : GUPnP.ResourceFactory {
                                 BuildConfig.DATA_DIR + "/xml/MediaServer2.xml";
 
     private static const string ICON_BIG = "file://" +
-                                           BuildConfig.ICON_DIR +
-                                           "/256x256/apps/rygel.png";
+                                           BuildConfig.BIG_ICON_DIR +
+                                           "/rygel.png";
     private static const string ICON_SMALL = "file://" +
-                                             BuildConfig.ICON_DIR +
-                                             "/32x32/apps/rygel.png";
+                                             BuildConfig.SMALL_ICON_DIR +
+                                             "/rygel.png";
     private static const string ICON_MIME = "image/png";
     private static const int ICON_DEPTH = 32;
     private static const int ICON_BIG_WIDTH = 256;