- icons: rename icon_movieplayer.png and icon_ytplay.png

Conflicts:
	data/icons/headers/Makefile.am

Signed-off-by: Thilo Graf <dbt@novatux.de>

data/icons/headers/Makefile.am

@@ -12,16 +12,15 @@ install_DATA = \
 	games.png \
 	icon_blue.png \
 	icon_green.png \
-	icon_movieplayer.png \
 	icon_red.png \
 	icon_yellow.png \
-	icon_ytplay.png \
 	information.png \
 	keybinding.png \
 	language.png \
 	lcd.png \
 	lock.png \
 	mainmenue.png \
+	movieplayer.png \
 	mp3.png \
 	multimedia.png \
 	network.png \
@@ -36,4 +35,5 @@ install_DATA = \
 	streaming.png \
 	timer.png \
 	upnp.png \
-	video.png
+	video.png \
+	ytplay.png

src/gui/widget/icons.h

@@ -101,7 +101,7 @@
 #define NEUTRINO_ICON_LCD		"lcd"
 #define NEUTRINO_ICON_LOCK		"lock"
 #define NEUTRINO_ICON_MAINMENU		"mainmenue"
-#define NEUTRINO_ICON_MOVIEPLAYER	"icon_movieplayer"
+#define NEUTRINO_ICON_MOVIEPLAYER	"movieplayer"
 #define NEUTRINO_ICON_MULTIMEDIA	"multimedia"
 #define NEUTRINO_ICON_NETWORK		"network"
 #define NEUTRINO_ICON_PERSONALIZE	"personalize"
@@ -116,7 +116,7 @@
 #define NEUTRINO_ICON_UPDATE		"softupdate"
 #define NEUTRINO_ICON_UPNP		"upnp"
 #define NEUTRINO_ICON_VIDEO		"video"
-#define NEUTRINO_ICON_YTPLAY		"icon_ytplay"
+#define NEUTRINO_ICON_YTPLAY		"ytplay"
 
 /* volumebar */
 #define NEUTRINO_ICON_VOLUME		"volume"