summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2020-11-29 19:33:59 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2020-11-29 19:34:37 +0900
commitba5ab6d5875f3c8b3744e0eb633b731bd43e8c5c (patch)
tree6d24bb06428a9181b185d315853955599570d776
parentb4f1d53278a0a7039032d01ff1883011463a54e9 (diff)
downloadtdebase-ba5ab6d5.tar.gz
tdebase-ba5ab6d5.zip
Konqueror/KDesktop popup menu: sort service actions by filename to ensure consistency.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit eb6e378c5c2c4d4227a0572e101b7e032466dbb2)
-rw-r--r--libkonq/konq_popupmenu.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc
index 482c152c5..d8efd6bdd 100644
--- a/libkonq/konq_popupmenu.cc
+++ b/libkonq/konq_popupmenu.cc
@@ -705,10 +705,9 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
}
// findAllResources() also removes duplicates
- const TQStringList entries = TDEGlobal::dirs()->findAllResources("data",
- "konqueror/servicemenus/*.desktop",
- false /* recursive */,
- true /* unique */);
+ TQStringList entries = TDEGlobal::dirs()->findAllResources("data",
+ "konqueror/servicemenus/*.desktop", false, true);
+ entries.sort(); // sort to ensure consistent order in popup menu
TQStringList::ConstIterator eIt = entries.begin();
const TQStringList::ConstIterator eEnd = entries.end();
for (; eIt != eEnd; ++eIt )
@@ -840,7 +839,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
const TQString priority = cfg.readEntry("X-TDE-Priority");
const TQString submenuName = cfg.readEntry( "X-TDE-Submenu" );
- ServiceList* list = s.selectList( priority, submenuName );
+ ServiceList *list = s.selectList( priority, submenuName );
(*list) += KDEDesktopMimeType::userDefinedServices( *eIt, cfg, url.isLocalFile(), m_lstPopupURLs );
}
}