From 893c2c4c1dd4f493cc94ef18e508e8039badbd4f Mon Sep 17 00:00:00 2001 From: "Aaron J. Seigo" Date: Fri, 3 Oct 2008 15:49:45 +0000 Subject: [PATCH] * we don't have kdesktop around in kde4, so don't bother with its config file * kwin doesn't seem to have a top level menu display impl anymore; we have a non-working one in playground for plasma, but that hardly counts; since this is breaking things for people upgrading, disable the setting until we get this sorted out properly svn path=/trunk/KDE/kdebase/workspace/; revision=867480 --- options.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/options.cpp b/options.cpp index e2f79621d8..867aee124f 100644 --- a/options.cpp +++ b/options.cpp @@ -178,15 +178,16 @@ unsigned long Options::updateSettings() // Since we want to allow users to enable window decoration tooltips // and not kstyle tooltips and vise-versa, we don't read the // "EffectNoTooltip" setting from kdeglobals. - KConfig _globalConfig( "kdeglobals" ); - KConfigGroup globalConfig(&_globalConfig, "KDE"); - topmenus = globalConfig.readEntry( "macStyle", false); - KConfig _kdesktopcfg( "kdesktoprc" ); - KConfigGroup kdesktopcfg(&_kdesktopcfg, "Menubar" ); - desktop_topmenu = kdesktopcfg.readEntry( "ShowMenubar", false); - if( desktop_topmenu ) - topmenus = true; +#if 0 + FIXME: we have no mac style menu implementation in kwin anymore, so this just breaks + things for people! + KConfig _globalConfig("kdeglobals"); + KConfigGroup globalConfig(&_globalConfig, "KDE"); + topmenus = globalConfig.readEntry("macStyle", false); +#else + topmenus = false; +#endif // QToolTip::setGloballyEnabled( d->show_tooltips ); // KDE4 this probably needs to be done manually in clients