Merge branch 'master' of gitorious.org:mana/mana

1 files changed, 5 insertions, 7 deletions

diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp
index 68dc2190..17145eae 100644
--- a/src/gui/widgets/tab.cpp
+++ b/src/gui/widgets/tab.cpp
@@ -30,7 +30,6 @@
 #include "gui/widgets/tabbedarea.h"
 
 #include "resources/image.h"
-#include "resources/resourcemanager.h"
 
 #include "utils/dtor.h"
 
@@ -55,10 +54,10 @@ struct TabData
 };
 
 static TabData const data[TAB_COUNT] = {
-    { "graphics/gui/tab.png", 0, 0 },
-    { "graphics/gui/tab_hilight.png", 9, 4 },
-    { "graphics/gui/tabselected.png", 16, 19 },
-    { "graphics/gui/tab.png", 25, 23 }
+    { "tab.png", 0, 0 },
+    { "tab_hilight.png", 9, 4 },
+    { "tabselected.png", 16, 19 },
+    { "tab.png", 25, 23 }
 };
 
 ImageRect Tab::tabImg[TAB_COUNT];
@@ -91,14 +90,13 @@ void Tab::init()
     if (mInstances == 0)
     {
         // Load the skin
-        ResourceManager *resman = ResourceManager::getInstance();
         Image *tab[TAB_COUNT];
 
         int a, x, y, mode;
 
         for (mode = 0; mode < TAB_COUNT; mode++)
         {
-            tab[mode] = resman->getImage(data[mode].file);
+            tab[mode] = SkinLoader::getImageFromTheme(data[mode].file);
             a = 0;
             for (y = 0; y < 3; y++)
             {