From 60a25a0fe53314833e60161c57e7f19290f70c63 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 10 Mar 2012 17:43:13 -0600 Subject: Fix icons not showing up on desktop and popup menu entries not appearing --- kdesktop/kdiconview.cc | 18 +++++++++--------- libkonq/konq_popupmenu.cc | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc index 0e439e880..e2f1c80a0 100644 --- a/kdesktop/kdiconview.cc +++ b/kdesktop/kdiconview.cc @@ -1,4 +1,4 @@ -/* This file is part of the KDE project +/* This file is part of the TDE project Copyright (C) 1998, 1999 Torben Weis Copyright (C) 2000, 2001 David Faure @@ -835,12 +835,12 @@ bool KDIconView::deleteGlobalDesktopFiles() // Ignore these special files // Name URL Type OnlyShowIn - // My Documents kxdglauncher --xdgname DOCUMENTS Application KDE; - // My Computer media:/ Link KDE; - // My Network Places remote:/ Link KDE; - // Printers [exec] kjobviewer --all --show %i %m Application KDE; - // Trash trash:/ Link KDE; - // Web Browser kfmclient openBrowser %u Application KDE; + // My Documents kxdglauncher --xdgname DOCUMENTS Application TDE; + // My Computer media:/ Link TDE; + // My Network Places remote:/ Link TDE; + // Printers [exec] kjobviewer --all --show %i %m Application TDE; + // Trash trash:/ Link TDE; + // Web Browser kfmclient openBrowser %u Application TDE; if ( isDesktopFile(fItem) ) { KSimpleConfig cfg( fItem->url().path(), true ); @@ -1009,12 +1009,12 @@ bool KDIconView::makeFriendlyText( KFileIVI *fileIVI ) TQStringList tmpList; if (cfg.hasKey("OnlyShowIn")) { - if (!cfg.readListEntry("OnlyShowIn", ';').contains("KDE")) + if (!cfg.readListEntry("OnlyShowIn", ';').contains("TDE")) return false; } if (cfg.hasKey("NotShowIn")) { - if (cfg.readListEntry("NotShowIn", ';').contains("KDE")) + if (cfg.readListEntry("NotShowIn", ';').contains("TDE")) return false; } if (cfg.hasKey("TryExec")) diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc index b878b0ae5..c396bc2c0 100644 --- a/libkonq/konq_popupmenu.cc +++ b/libkonq/konq_popupmenu.cc @@ -876,20 +876,20 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf) { KService::Ptr service = (*it); - // Skip OnlyShowIn=Foo and NotShowIn=KDE entries, + // Skip OnlyShowIn=Foo and NotShowIn=TDE entries, // but still offer NoDisplay=true entries, that's the // whole point of such desktop files. This is why we don't // use service->noDisplay() here. const TQString onlyShowIn = service->property("OnlyShowIn", TQVariant::String).toString(); if ( !onlyShowIn.isEmpty() ) { const TQStringList aList = TQStringList::split(';', onlyShowIn); - if (!aList.contains("KDE")) + if (!aList.contains("TDE")) continue; } const TQString notShowIn = service->property("NotShowIn", TQVariant::String).toString(); if ( !notShowIn.isEmpty() ) { const TQStringList aList = TQStringList::split(';', notShowIn); - if (aList.contains("KDE")) + if (aList.contains("TDE")) continue; } -- cgit v1.2.1