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

List:       kde-commits
Subject:    KDE/kdebase/apps
From:       Chusslove Illich <caslav.ilic () gmx ! net>
Date:       2008-06-10 9:07:59
Message-ID: 1213088879.918753.18348.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 818988 by ilic:

Revert 818910 and do it properly (patch by dfaure).

 M  +1 -1      dolphin/src/CMakeLists.txt  
 M  +1 -3      dolphin/src/dolphinpart.cpp  
 M  +0 -1      konqueror/src/konqmain.cpp  


--- trunk/KDE/kdebase/apps/dolphin/src/CMakeLists.txt #818987:818988
@@ -82,7 +82,7 @@
 
 install(TARGETS dolphinpart DESTINATION ${PLUGIN_INSTALL_DIR} )
 
-install(FILES dolphinpart.rc DESTINATION ${DATA_INSTALL_DIR}/dolphinpart )
+install(FILES dolphinpart.rc DESTINATION ${DATA_INSTALL_DIR}/dolphin)
 install(FILES dolphinpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 ##########################################
--- trunk/KDE/kdebase/apps/dolphin/src/dolphinpart.cpp #818987:818988
@@ -49,9 +49,7 @@
 #include <QClipboard>
 
 K_PLUGIN_FACTORY(DolphinPartFactory, registerPlugin<DolphinPart>();)
-// The componentdata name must be dolphinpart so that dolphinpart.rc is found
-// Alternatively we would have to install it as dolphin/dolphinpart.rc
-K_EXPORT_PLUGIN(DolphinPartFactory("dolphinpart"))
+K_EXPORT_PLUGIN(DolphinPartFactory("dolphin"))
 
 DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args)
     : KParts::ReadOnlyPart(parent)
--- trunk/KDE/kdebase/apps/konqueror/src/konqmain.cpp #818987:818988
@@ -69,7 +69,6 @@
   app.setQuitOnLastWindowClosed(false);
 
   KGlobal::locale()->insertCatalog("libkonq"); // needed for apps using libkonq
-  KGlobal::locale()->insertCatalog("dolphin"); // needed for some file manager menus
 
   KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
 
[prev in list] [next in list] [prev in thread] [next in thread]