diff options
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | tools/Linux/xbmc-48x48.png | bin | 5880 -> 0 bytes | |||
| -rw-r--r-- | xbmc/windowing/X11/WinSystemX11.cpp | 2 | ||||
| -rw-r--r-- | xbmc/windowing/X11/WinSystemX11GLES.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index 002bb23269..a91a38b988 100644 --- a/Makefile.in +++ b/Makefile.in @@ -642,9 +642,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 Binary files differdeleted file mode 100644 index 5b5771cbfb..0000000000 --- a/tools/Linux/xbmc-48x48.png +++ /dev/null diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp index ed8b11ce63..cc2d9bce28 100644 --- a/xbmc/windowing/X11/WinSystemX11.cpp +++ b/xbmc/windowing/X11/WinSystemX11.cpp @@ -1049,7 +1049,7 @@ bool CWinSystemX11::CreateIconPixmap() gRatio = vis->green_mask / 255.0; bRatio = vis->blue_mask / 255.0; - CBaseTexture *iconTexture = CBaseTexture::LoadFromFile("special://xbmc/media/icon.png"); + CBaseTexture *iconTexture = CBaseTexture::LoadFromFile("special://xbmc/media/icon256x256.png"); if (!iconTexture) return false; diff --git a/xbmc/windowing/X11/WinSystemX11GLES.cpp b/xbmc/windowing/X11/WinSystemX11GLES.cpp index 3d82fbf345..b2e282e933 100644 --- 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); |
