summaryrefslogtreecommitdiffstats
path: root/opensuse/tdelibs/applications.menu-fallback.diff
diff options
context:
space:
mode:
authorRobert Xu <robxu9@gmail.com>2011-08-13 12:58:51 -0400
committerRobert Xu <robxu9@gmail.com>2011-08-13 12:58:51 -0400
commit46130378aea5fff80803409c2573e2ea31472cb9 (patch)
treecb5da908105e6577da7676f84ba9c7fbaba4fb52 /opensuse/tdelibs/applications.menu-fallback.diff
parent53f2819f9af035a38ca08df1ede9e6cd24aa79ef (diff)
downloadtde-packaging-46130378aea5fff80803409c2573e2ea31472cb9.tar.gz
tde-packaging-46130378aea5fff80803409c2573e2ea31472cb9.zip
add dbus-1-tqt and libdbus-1-tqt-0; add unmodified tdelibs from kdelibs3
Diffstat (limited to 'opensuse/tdelibs/applications.menu-fallback.diff')
-rw-r--r--opensuse/tdelibs/applications.menu-fallback.diff19
1 files changed, 19 insertions, 0 deletions
diff --git a/opensuse/tdelibs/applications.menu-fallback.diff b/opensuse/tdelibs/applications.menu-fallback.diff
new file mode 100644
index 000000000..69450dad8
--- /dev/null
+++ b/opensuse/tdelibs/applications.menu-fallback.diff
@@ -0,0 +1,19 @@
+Index: kded/kbuildsycoca.cpp
+===================================================================
+--- kded/kbuildsycoca.cpp.orig
++++ kded/kbuildsycoca.cpp
+@@ -378,8 +378,12 @@ bool KBuildSycoca::build()
+
+ connect(g_vfolder, SIGNAL(newService(const QString &, KService **)),
+ this, SLOT(slotCreateEntry(const QString &, KService **)));
+-
+- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
++
++ VFolderMenu::SubMenu *kdeMenu;
++ if ( QFile::exists( "/etc/xdg/menus/applications.menu" ) )
++ kdeMenu = g_vfolder->parseMenu("applications.menu", true);
++ else
++ kdeMenu = g_vfolder->parseMenu("applications.menu.kde", true);
+
+ KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, false);
+ entry->setLayoutInfo(kdeMenu->layoutList);