From 865f314dd5ed55508f45a32973b709b79a541e36 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 11 Dec 2009 03:46:01 +0000
Subject: kdelibs update to Trinity v3.5.11

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1061230 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kded/vfolder_menu.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'kded/vfolder_menu.cpp')

diff --git a/kded/vfolder_menu.cpp b/kded/vfolder_menu.cpp
index f73ef0c8e..baa3c88b0 100644
--- a/kded/vfolder_menu.cpp
+++ b/kded/vfolder_menu.cpp
@@ -774,7 +774,9 @@ VFolderMenu::locateMenuFile(const QString &fileName)
 
    QString result;
 
-   QString xdgMenuPrefix = QString::fromLocal8Bit(getenv("XDG_MENU_PREFIX"));
+   //QString xdgMenuPrefix = QString::fromLocal8Bit(getenv("XDG_MENU_PREFIX"));
+   // hardcode xdgMenuPrefix to "kde-" string until proper upstream fix
+   QString xdgMenuPrefix = "kde-";
    if (!xdgMenuPrefix.isEmpty())
    {
       QFileInfo fileInfo(fileName);
-- 
cgit v1.2.3