Fix straggling XDG references missed in patch set from June 8, 2012.

pull/1/head
Darrell Anderson 13 years ago
parent 68fff8abfc
commit 75692d2d11

@ -367,7 +367,7 @@ void DolphinContextMenu::insertActionItems(KPopupMenu* popup,
for (TQStringList::ConstIterator entryIt = entries.begin(); entryIt != entries.end(); ++entryIt) { for (TQStringList::ConstIterator entryIt = entries.begin(); entryIt != entries.end(); ++entryIt) {
KSimpleConfig cfg(*dirIt + *entryIt, true); KSimpleConfig cfg(*dirIt + *entryIt, true);
cfg.setDesktopGroup(); cfg.setDesktopGroup();
if ((cfg.hasKey("Actions") || cfg.hasKey("X-KDE-GetActionMenu")) && cfg.hasKey("ServiceTypes")) { if ((cfg.hasKey("Actions") || cfg.hasKey("X-TDE-GetActionMenu")) && cfg.hasKey("ServiceTypes")) {
const TQStringList types = cfg.readListEntry("ServiceTypes"); const TQStringList types = cfg.readListEntry("ServiceTypes");
for (TQStringList::ConstIterator it = types.begin(); it != types.end(); ++it) { for (TQStringList::ConstIterator it = types.begin(); it != types.end(); ++it) {
// check whether the mime type is equal or whether the // check whether the mime type is equal or whether the
@ -413,7 +413,7 @@ void DolphinContextMenu::insertActionItems(KPopupMenu* popup,
if (insert) { if (insert) {
menu = actionsMenu; menu = actionsMenu;
const TQString submenuName = cfg.readEntry( "X-KDE-Submenu" ); const TQString submenuName = cfg.readEntry( "X-TDE-Submenu" );
if (!submenuName.isEmpty()) { if (!submenuName.isEmpty()) {
menu = new KPopupMenu(); menu = new KPopupMenu();
actionsMenu->insertItem(submenuName, menu, submenuID); actionsMenu->insertItem(submenuName, menu, submenuID);

@ -443,7 +443,7 @@ void InfoSidebarPage::insertActions()
for (TQStringList::ConstIterator entryIt = entries.begin(); entryIt != entries.end(); ++entryIt) { for (TQStringList::ConstIterator entryIt = entries.begin(); entryIt != entries.end(); ++entryIt) {
KSimpleConfig cfg(*dirIt + *entryIt, true); KSimpleConfig cfg(*dirIt + *entryIt, true);
cfg.setDesktopGroup(); cfg.setDesktopGroup();
if ((cfg.hasKey("Actions") || cfg.hasKey("X-KDE-GetActionMenu")) && cfg.hasKey("ServiceTypes")) { if ((cfg.hasKey("Actions") || cfg.hasKey("X-TDE-GetActionMenu")) && cfg.hasKey("ServiceTypes")) {
const TQStringList types = cfg.readListEntry("ServiceTypes"); const TQStringList types = cfg.readListEntry("ServiceTypes");
for (TQStringList::ConstIterator it = types.begin(); it != types.end(); ++it) { for (TQStringList::ConstIterator it = types.begin(); it != types.end(); ++it) {
// check whether the mime type is equal or whether the // check whether the mime type is equal or whether the
@ -481,7 +481,7 @@ void InfoSidebarPage::insertActions()
} }
if (insert) { if (insert) {
const TQString submenuName = cfg.readEntry( "X-KDE-Submenu" ); const TQString submenuName = cfg.readEntry( "X-TDE-Submenu" );
TQPopupMenu* popup = 0; TQPopupMenu* popup = 0;
if (!submenuName.isEmpty()) { if (!submenuName.isEmpty()) {
// create a sub menu containing all actions // create a sub menu containing all actions

Loading…
Cancel
Save