Review Request: Write to the correct xmlFile in KToolBar::Private::slotContextShowText()

[Commit Hook]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/103812/#review10817
-----------------------------------------------------------


This review has been submitted with commit 576e13d355c34858e8a254a28a100a8b9f7876a8 by Albert Astals Cid to branch KDE/4.8.

- Commit Hook


On Feb. 20, 2012, 10:33 p.m., Albert Astals Cid wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/103812/
> -----------------------------------------------------------
> 
> (Updated Feb. 20, 2012, 10:33 p.m.)
> 
> 
> Review request for kdelibs and David Faure.
> 
> 
> Description
> -------
> 
> KToolBar::Private::slotContextShowText() was assuming that the xmlgui file it had to write was
>   KGlobal::mainComponent.componentName() + "ui.rc";
> which is obviously wrong since we have a setXMLFile function for a reason.
> 
> I tried using 
>   xmlguiClient->xmlFile()
> directly but in Okular we use the same the same toolbar name defined in two xml files, so that still did not work because this means we end up with just one KToolbar (yes i know that might be a misuse of the API).
> 
> So i ended up going through the actioncollections to find the action and get the correct client from there.
> 
> 
> This addresses bug 292574.
>     http://bugs.kde.org/show_bug.cgi?id=292574
> 
> 
> Diffs
> -----
> 
>   kdeui/widgets/ktoolbar.h 69c482e 
>   kdeui/widgets/ktoolbar.cpp d17ff39 
>   kdeui/xmlgui/kxmlguibuilder.cpp 6773c31 
>   kdeui/xmlgui/kxmlguifactory_p.cpp 2f81f18 
> 
> Diff: http://git.reviewboard.kde.org/r/103812/diff/
> 
> 
> Testing
> -------
> 
> Fixes the issue in Okular, i tested it does still work with Kate that is using the ui.rc scheme.
> 
> 
> Thanks,
> 
> Albert Astals Cid
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-core-devel/attachments/20120221/c508fe06/attachment.htm>