summaryrefslogtreecommitdiffstats
path: root/opensuse/core/tdelibs/applications.menu-fallback.diff
diff options
context:
space:
mode:
authorRobert Xu <robxu9@gmail.com>2011-11-10 18:04:39 -0500
committerRobert Xu <robxu9@gmail.com>2011-11-10 18:04:39 -0500
commit21fcfa3348213aa87f0e3aef62ca4720c6d31cb7 (patch)
tree2cfb64c59322628e613ed0895e3c3694d3abe6bd /opensuse/core/tdelibs/applications.menu-fallback.diff
parent8667643bff14a60d8571c599efd3e48bed3e3b12 (diff)
downloadtde-packaging-21fcfa3348213aa87f0e3aef62ca4720c6d31cb7.tar.gz
tde-packaging-21fcfa3348213aa87f0e3aef62ca4720c6d31cb7.zip
initial commit to suse branch: eclipse integration
Diffstat (limited to 'opensuse/core/tdelibs/applications.menu-fallback.diff')
-rw-r--r--opensuse/core/tdelibs/applications.menu-fallback.diff19
1 files changed, 19 insertions, 0 deletions
diff --git a/opensuse/core/tdelibs/applications.menu-fallback.diff b/opensuse/core/tdelibs/applications.menu-fallback.diff
new file mode 100644
index 000000000..69450dad8
--- /dev/null
+++ b/opensuse/core/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);