37aa33ad3a
The way it works is the following: * all desktops install their main menu as blah-applications.menu (e.g. kde3-applications.menu) * however, we do not want the merged directory name to be constructed from the menu name, because we want all applications and desktops to install merged files into the same directory: applications-merged, so that everyone benefit from it. Issue reported by Daniel LEVAI on ports@
17 lines
549 B
Plaintext
17 lines
549 B
Plaintext
$OpenBSD: patch-kded_vfolder_menu_cpp,v 1.1 2009/12/02 15:39:39 ajacoutot Exp $
|
|
|
|
The merged menu directory is always called applications-merged
|
|
(and not kde3-applications-merged).
|
|
|
|
--- kded/vfolder_menu.cpp.orig Wed Dec 2 15:02:19 2009
|
|
+++ kded/vfolder_menu.cpp Wed Dec 2 15:03:25 2009
|
|
@@ -846,7 +846,7 @@ VFolderMenu::loadMenu(const QString &fileName)
|
|
return;
|
|
|
|
pushDocInfo(fileName);
|
|
- m_defaultMergeDirs << m_docInfo.baseName+"-merged/";
|
|
+ m_defaultMergeDirs << "applications-merged/";
|
|
m_doc = loadDoc();
|
|
popDocInfo();
|
|
|