ui: Correct Icon path for uninstalled case

diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
index 8190238..589ce0e 100644 (file)
--- a/src/ui/Makefile.am
+++ b/src/ui/Makefile.am
@@ -1,9 +1,9 @@
 if UNINSTALLED
 shareddir = $(abs_top_builddir)/data
-icondir = $(shareddir)/icons
+icondir = $(shareddir)/icons/32x32
 else
 shareddir = $(datadir)/rygel
-icondir = $(datadir)/icons/hicolor
+icondir = $(datadir)/icons/hicolor/32x32/apps
 endif
 
 rygeldir = $(top_srcdir)/src/rygel

diff --git a/src/ui/rygel-preferences-dialog.vala b/src/ui/rygel-preferences-dialog.vala
index bf90656..d145522 100644 (file)
--- a/src/ui/rygel-preferences-dialog.vala
+++ b/src/ui/rygel-preferences-dialog.vala
@@ -27,7 +27,7 @@ using CStuff;
 public class Rygel.PreferencesDialog : GLib.Object {
     const string UI_FILE = BuildConfig.DATA_DIR + "/rygel-preferences.ui";
     const string DIALOG = "preferences-dialog";
-    const string ICON = BuildConfig.ICON_DIR + "/32x32/apps/rygel.png";
+    const string ICON = BuildConfig.ICON_DIR + "/rygel.png";
 
     UserConfig config;
     Builder builder;