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 eb6e378c5c)

libkonq/konq_popupmenu.cc

@@ -705,10 +705,9 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
         }
 
         // findAllResources() also removes duplicates
-        const TQStringList entries = TDEGlobal::dirs()->findAllResources("data",
+        TQStringList entries = TDEGlobal::dirs()->findAllResources("data",
-                                                                      "konqueror/servicemenus/*.desktop",
+                "konqueror/servicemenus/*.desktop", false, true);
-                                                                      false /* recursive */,
+        entries.sort();  // sort to ensure consistent order in popup menu
-                                                                      true /* unique */);
         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 );
                 }
             }