Overwriting default menu entry locations (was: Re: KDE/kdelibs/kdeui/xmlgui)

[David Faure]

On Thursday 15 January 2009, Friedrich W. H. Kossebau wrote:
> Am Mittwoch, 14. Januar 2009, um 23:59 Uhr, schrieb Friedrich W. H. Kossebau:
> > Because the Go menu is part of base, not additive?
> 
> Err, meant, Go is both in base and additive, so will have called 
> KXMLGUIClientPrivate::mergeXML() for it, then due to noMerge="1" being 
> replaced (by the empty one from additive).
> 
> So for this error, however rare it might be, additive should be checked if it 
> isn't just perhaps an empty menu, so mergeXML() should instead simply return 
> false there.

No it has to be checked in the same method call, i.e. the last loop has to run
even for noMerge'd menus. Fix committed in trunk, r912265.
I'm not entirely confident about backporting it, so close to 4.2..... hmm, OTOH
empty menus really look bad... can you all test your app's xmlgui with kdelibs trunk
this weekend? If no regressions are found I'll backport on Monday.

-- 
David Faure, faure at kde.org, sponsored by Qt Software @ Nokia to work on KDE,
Konqueror (http://www.konqueror.org), and KOffice (http://www.koffice.org).