diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-08-13 12:21:22 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-08-13 12:21:22 -0500 |
| commit | f65bcb8326e06816d7dc49e58bda120182dbbcd6 (patch) | |
| tree | 4e7fef001fc523929450778d10c86b41e6e32eda /opensuse/tdelibs/applications.menu-fallback.diff | |
| parent | 131df957b41b4683571b1e36e6fed9d614d32356 (diff) | |
| parent | fa41f32b69994ecd75b7359fa2df08ea5a3480ab (diff) | |
| download | tde-packaging-f65bcb8326e06816d7dc49e58bda120182dbbcd6.tar.gz tde-packaging-f65bcb8326e06816d7dc49e58bda120182dbbcd6.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'opensuse/tdelibs/applications.menu-fallback.diff')
| -rw-r--r-- | opensuse/tdelibs/applications.menu-fallback.diff | 19 |
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); |