[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/runtime/kioslave/desktop
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2009-01-05 0:36:55
Message-ID: 1231115815.132333.12177.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 905766 by aseigo:

use the same hack as the ioslaves in kdelibs. not sure how "correct" it is in the \
strictest sense (lieing about your catalog) but if its good enough for the ioslaves \
in kdelibs, it's good enough for this one. BUG:172774


 M  +2 -9      kio_desktop.cpp  


--- trunk/KDE/kdebase/runtime/kioslave/desktop/kio_desktop.cpp #905765:905766
@@ -38,16 +38,9 @@
     int KDE_EXPORT kdemain(int argc, char **argv)
     {
         // necessary to use other kio slaves
-        KComponentData( "kio_desktop" );
-        {
-            // we have to set the language ourselves because we have no \
                translations, so the
-            // locale will be ignored. this is a rather unfortunate hack, one that \
                might be better
-            // solved in kdelibs/localization/klocale.cpp?
-            KConfigGroup localeCg(KGlobal::config(), "Locale");
-            KGlobal::locale()->setLanguage(localeCg.readEntry("Language"), \
                KGlobal::config().data());
-        }
-        KGlobal::config()->setLocale(KGlobal::locale()->country());
         QCoreApplication app(argc, argv);
+        KComponentData("kio_desktop", "kdelibs4");
+        KGlobal::locale();
 
         // start the slave
         DesktopProtocol slave(argv[1], argv[2], argv[3]);


[prev in list] [next in list] [prev in thread] [next in thread]