Used YSettings::getThemDir()

libyui · Jan 17, 2013 · 02990f1 · 02990f1
1 parent 0b62fd1
commit 02990f1
Showing 1 changed file with 4 additions and 13 deletions.
diff --git a/src/YGUI.cc b/src/YGUI.cc
@@ -147,27 +147,18 @@ void YGUI::checkInit()
 	g_log_set_always_fatal (GLogLevelFlags (G_LOG_LEVEL_ERROR|G_LOG_LEVEL_CRITICAL|
 		G_LOG_LEVEL_WARNING| G_LOG_LEVEL_MESSAGE|G_LOG_LEVEL_INFO|G_LOG_LEVEL_DEBUG));
 #endif
-    std::string progSubDir = YSettings::getProgSubDir();
-
-    if (progSubDir.compare(""))
-    {
-      progSubDir = progSubDir + "/theme/"; 
-    }
-    else
-    {
-      progSubDir = THEMEDIR "/";
-    }      
+    std::string themeSubDir = YSettings::access()->getThemeDir();
 
     char* st = getenv("Y2STYLE");
     std::string style = st ? st : "";
 
-    if (!style.empty())
+    if (style.size())
     {
-      style = progSubDir + style;
+      style = themeSubDir + style;
     }
     else
     {
-      style = progSubDir + "style.css";
+      style = themeSubDir + "style.css";
     }
 
     yuiMilestone() << "Style \"" << style << "\"\n";