[linux] make use of new icons

diff --git a/Makefile.in b/Makefile.in
index 6f689cf..1db6ee2 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -648,9 +648,9 @@ endif
        @install -d $(DESTDIR)$(datarootdir)/applications
        @install tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/xbmc.desktop
        @install -d $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps
-       @install -m 0644 tools/Linux/xbmc-48x48.png $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/xbmc.png
+       @install -m 0644 media/icon48x48.png $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/xbmc.png
        @install -d $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps
-       @install -m 0644 media/icon.png $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps/xbmc.png
+       @install -m 0644 media/icon256x256.png $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps/xbmc.png
        @test -z "$(DESTDIR)" && gtk-update-icon-cache -f -q -t $(datadir)/icons/hicolor || :
 
        @echo "Copying bindings to $(DESTDIR)$(includedir)/xbmc"

diff --git a/tools/Linux/xbmc-48x48.png b/tools/Linux/xbmc-48x48.png
deleted file mode 100644 (file)
index 5b5771c..0000000
Binary files a/tools/Linux/xbmc-48x48.png and /dev/null differ

diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp
index 083d1e9..54379ea 100644 (file)
--- a/xbmc/windowing/X11/WinSystemX11.cpp
+++ b/xbmc/windowing/X11/WinSystemX11.cpp
@@ -136,7 +136,7 @@ bool CWinSystemX11::CreateNewWindow(const CStdString& name, bool fullScreen, RES
   if(!SetFullScreen(fullScreen, res, false))
     return false;
 
-  CBaseTexture* iconTexture = CTexture::LoadFromFile("special://xbmc/media/icon.png");
+  CBaseTexture* iconTexture = CTexture::LoadFromFile("special://xbmc/media/icon256x256.png");
 
   if (iconTexture)
     SDL_WM_SetIcon(SDL_CreateRGBSurfaceFrom(iconTexture->GetPixels(), iconTexture->GetWidth(), iconTexture->GetHeight(), 32, iconTexture->GetPitch(), 0xff0000, 0x00ff00, 0x0000ff, 0xff000000L), NULL);

diff --git a/xbmc/windowing/X11/WinSystemX11GLES.cpp b/xbmc/windowing/X11/WinSystemX11GLES.cpp
index 3d82fbf..b2e282e 100644 (file)
--- a/xbmc/windowing/X11/WinSystemX11GLES.cpp
+++ b/xbmc/windowing/X11/WinSystemX11GLES.cpp
@@ -159,7 +159,7 @@ bool CWinSystemX11GLES::CreateNewWindow(const CStdString& name, bool fullScreen,
        return false;
 
   CTexture iconTexture;
-  iconTexture.LoadFromFile("special://xbmc/media/icon.png");
+  iconTexture.LoadFromFile("special://xbmc/media/icon256x256.png");
 
   SDL_WM_SetIcon(SDL_CreateRGBSurfaceFrom(iconTexture.GetPixels(), iconTexture.GetWidth(), iconTexture.GetHeight(), BPP, iconTexture.GetPitch(), 0xff0000, 0x00ff00, 0x0000ff, 0xff000000L), NULL);
   SDL_WM_SetCaption("XBMC Media Center", NULL);