Review Request 122499: include applications-menu-merged too

[David Faure]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/122499/#review76018
-----------------------------------------------------------


The real URL for the menu spec is
http://standards.freedesktop.org/menu-spec/menu-spec-latest.html
but indeed it has the same sentence.

But it also says
   The default merge directories included in the <DefaultMergeDirs> element.
which sounds to me like we shouldn't have to list it in XML, but rather ensure that the C++ code expands DefaultMergeDirs correctly.
And it does, AFAICS. kbuildsycoca/vfolder_menu.cpp line 806 says:
    m_defaultMergeDirs << m_docInfo.baseName + QStringLiteral("-merged/");

So this patch makes no sense to me, further investigation is required. From what I can see, <DefaultMergeDirs> should already expand to a list that contains applications-merged, so this patch shouldn't change anything. If it does, then one of us is missing something...

- David Faure


On Feb. 9, 2015, 12:14 p.m., Bhushan Shah wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/122499/
> -----------------------------------------------------------
> 
> (Updated Feb. 9, 2015, 12:14 p.m.)
> 
> 
> Review request for KDE Frameworks and David Faure.
> 
> 
> Bugs: 213972
>     https://bugs.kde.org/show_bug.cgi?id=213972
> 
> 
> Repository: kservice
> 
> 
> Description
> -------
> 
> faAs per,
> 
> https://developer.gnome.org/menu-spec/
> 
> The default merge directories included in the <DefaultMergeDirs> element. By convention, third parties may add new <Menu> files in this location to create their own sub-menus.
> Note that a system that uses either gnome-applications.menu or kde-applications.menu depending on the desktop environment in use must still use applications-merged as the default merge directory in both cases.
> Implementations may chose to use .menu files with names other than application.menu for tasks or menus other than the main application menu. In that case the first part of the name of the default merge directory is derived from the name of the .menu file.
> For example in a system that uses a preferences.menu file to describe an additional menu, the default merge directories included in the <DefaultMergeDirs> element in the preferences.menu file would become $XDG_CONFIG_DIRS/menus/preferences-merged/
> 
> 
> Diffs
> -----
> 
>   src/kbuildsycoca/applications.menu f2d5253 
> 
> Diff: https://git.reviewboard.kde.org/r/122499/diff/
> 
> 
> Testing
> -------
> 
> 
> Thanks,
> 
> Bhushan Shah
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-frameworks-devel/attachments/20150214/8100d4cf/attachment-0001.html>