Sophie

Sophie

distrib > Mandriva > 2006.0 > i586 > media > main-src > by-pkgid > a6bc312ce50b5c8d0c51736e58ac32bc > files > 340

kdebase-3.4.2-55mdk.src.rpm

--- kdebase-3.4.0/konqueror/konq_mainwindow.cc--	2005-04-12 10:01:05.659834521 -0400
+++ kdebase-3.4.0/konqueror/konq_mainwindow.cc	2005-04-12 10:02:09.301362508 -0400
@@ -3719,7 +3719,9 @@ void KonqMainWindow::initActions()
    // "Remove" ? "Reset" ? The former is more correct, the latter is more kcontrol-like...
   m_paRemoveLocalProperties = new KAction( i18n( "Remove Folder Properties" ), 0, this, SLOT( slotRemoveLocalProperties() ), actionCollection(), "removeLocalProperties" );
 
-
+  if( KStandardDirs::default_menu_type_by_version()=="kde")
+  {
+          
   m_configureModules << "kde-filebehavior.desktop" << "kde-fileappearance.desktop" <<
       "kde-filepreviews.desktop" << "kde-filetypes.desktop" <<
       "kde-khtml_behavior.desktop" << "kde-khtml_java_js.desktop" <<
@@ -3729,7 +3731,18 @@ void KonqMainWindow::initActions()
       "kde-crypto.desktop" << "kde-useragent.desktop" <<
       "kde-khtml_plugins.desktop" << "kde-kcmkonqyperformance.desktop";
 
-
+    }
+    else
+    {
+  m_configureModules << "filebehavior.desktop" << "fileappearance.desktop" <<
+          "filepreviews.desktop" << "filetypes.desktop" <<
+          "khtml_behavior.desktop" << "khtml_java_js.desktop" <<
+          "khtml_fonts.desktop" << "ebrowsing.desktop" <<
+          "kcmhistory.desktop" << "cookies.desktop" <<
+          "cache.desktop" << "proxy.desktop" << "kcmcss.desktop" <<
+          "crypto.desktop" << "useragent.desktop" <<
+          "khtml_plugins.desktop" << "kcmkonqyperformance.desktop";
+    }
   if (!kapp->authorizeControlModules(configModules()).isEmpty())
      KStdAction::preferences (this, SLOT (slotConfigure()), actionCollection() );