Update XDG information in support of bug report 892.

6 files changed, 33 insertions, 33 deletions

diff --git a/libkonq/SERVICEMENUS b/libkonq/SERVICEMENUS
index 1419b86e0..127acd6de 100644
--- a/libkonq/SERVICEMENUS
+++ b/libkonq/SERVICEMENUS
@@ -22,7 +22,7 @@ ServiceTypes=text/html,text/plain # use all/all for all entries
                                   # you can also do things like image/* for all
                                   # image mimetypes
 Actions=gzip;mail                 # those are ';' separated, per the standard !
-X-KDE-Submenu=Menuname            # this optional entry allows grouping the 
+X-TDE-Submenu=Menuname            # this optional entry allows grouping the 
                                   # entries in this servicemenu file into a
                                   # common submenu, in this case "Menuname"
 TryExec=gzip			  # Find if executable exist, if it doesn't exist
diff --git a/libkonq/favicons/favicons.desktop b/libkonq/favicons/favicons.desktop
index 7a7042057..2d6eb30c7 100644
--- a/libkonq/favicons/favicons.desktop
+++ b/libkonq/favicons/favicons.desktop
@@ -141,8 +141,8 @@ Comment[wa]=Sopoirt imådjetes rascourtis
 Comment[zh_CN]=快捷图标支持
 Comment[zh_TW]=捷徑圖示支援
 ServiceTypes=KDEDModule
-X-KDE-ModuleType=Library
-X-KDE-Library=favicons
-X-KDE-FactoryName=favicons
-X-KDE-Kded-autoload=false
-X-KDE-Kded-load-on-demand=true
+X-TDE-ModuleType=Library
+X-TDE-Library=favicons
+X-TDE-FactoryName=favicons
+X-TDE-Kded-autoload=false
+X-TDE-Kded-load-on-demand=true
diff --git a/libkonq/konq_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cc
index 9c8571f1e..cb2b9fe81 100644
--- a/libkonq/konq_iconviewwidget.cc
+++ b/libkonq/konq_iconviewwidget.cc
@@ -696,7 +696,7 @@ bool KonqIconViewWidget::mimeTypeMatch( const TQString& mimeType, const TQString
             return true;
         if ( (*mt) == "text/plain" )
         {
-            TQVariant textProperty = mime->property( "X-KDE-text" );
+            TQVariant textProperty = mime->property( "X-TDE-text" );
             if ( textProperty.type() == TQVariant::Bool && textProperty.toBool() )
                 return true;
         }
diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc
index 0756e140b..cd86ac5bb 100644
--- a/libkonq/konq_popupmenu.cc
+++ b/libkonq/konq_popupmenu.cc
@@ -140,7 +140,7 @@ bool KonqPopupMenu::ProtocolInfo::trashIncluded() const
 }
 
 // This helper class stores the .desktop-file actions and the servicemenus
-// in order to support X-KDE-Priority and X-KDE-Submenu.
+// in order to support X-TDE-Priority and X-TDE-Submenu.
 class PopupServices
 {
 public:
@@ -303,12 +303,12 @@ int KonqPopupMenu::insertServices(const ServiceList& list,
 
 bool KonqPopupMenu::KIOSKAuthorizedAction(KConfig& cfg)
 {
-    if ( !cfg.hasKey( "X-KDE-AuthorizeAction") )
+    if ( !cfg.hasKey( "X-TDE-AuthorizeAction") )
     {
         return true;
     }
 
-    TQStringList list = cfg.readListEntry("X-KDE-AuthorizeAction");
+    TQStringList list = cfg.readListEntry("X-TDE-AuthorizeAction");
     if (kapp && !list.isEmpty())
     {
         for(TQStringList::ConstIterator it = list.begin();
@@ -649,8 +649,8 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
         const TQString path = urlForServiceMenu.path();
         KSimpleConfig cfg( path, true );
         cfg.setDesktopGroup();
-        const TQString priority = cfg.readEntry("X-KDE-Priority");
-        const TQString submenuName = cfg.readEntry( "X-KDE-Submenu" );
+        const TQString priority = cfg.readEntry("X-TDE-Priority");
+        const TQString submenuName = cfg.readEntry( "X-TDE-Submenu" );
         if ( cfg.readEntry("Type") == "Link" ) {
            urlForServiceMenu = cfg.readEntry("URL");
            // TODO: Do we want to make all the actions apply on the target
@@ -674,8 +674,8 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
 
             if (KIOSKAuthorizedAction(cfg))
             {
-                const TQString priority = cfg.readEntry("X-KDE-Priority");
-                const TQString submenuName = cfg.readEntry( "X-KDE-Submenu" );
+                const TQString priority = cfg.readEntry("X-TDE-Priority");
+                const TQString submenuName = cfg.readEntry( "X-TDE-Submenu" );
                 ServiceList* list = s.selectList( priority, submenuName );
                 (*list) += KDEDesktopMimeType::userDefinedServices( dotDirectoryFile, cfg, true );
             }
@@ -698,15 +698,15 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
                 continue;
             }
 
-            if ( cfg.hasKey( "X-KDE-ShowIfRunning" ) )
+            if ( cfg.hasKey( "X-TDE-ShowIfRunning" ) )
             {
-                const TQString app = cfg.readEntry( "X-KDE-ShowIfRunning" );
+                const TQString app = cfg.readEntry( "X-TDE-ShowIfRunning" );
                 if ( !kapp->dcopClient()->isApplicationRegistered( app.utf8() ) )
                     continue;
             }
-            if ( cfg.hasKey( "X-KDE-ShowIfDcopCall" ) )
+            if ( cfg.hasKey( "X-TDE-ShowIfDcopCall" ) )
             {
-                TQString dcopcall = cfg.readEntry( "X-KDE-ShowIfDcopCall" );
+                TQString dcopcall = cfg.readEntry( "X-TDE-ShowIfDcopCall" );
                 const TQCString app = TQString(dcopcall.section(' ', 0,0)).utf8();
 
                 //if( !kapp->dcopClient()->isApplicationRegistered( app ))
@@ -721,7 +721,7 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
                 TQCString object = TQString(dcopcall.section(' ', 1,-2)).utf8();
                 TQString function =  TQString(dcopcall.section(' ', -1));
                 if(!function.endsWith("(KURL::List)")) {
-                    kdWarning() << "Desktop file " << *eIt << " contains an invalid X-KDE-ShowIfDcopCall - the function must take the exact parameter (KURL::List) and must be specified." << endl;
+                    kdWarning() << "Desktop file " << *eIt << " contains an invalid X-TDE-ShowIfDcopCall - the function must take the exact parameter (KURL::List) and must be specified." << endl;
                     continue; //Be safe.
                 }
 
@@ -733,15 +733,15 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
                     continue;
 
             }
-            if ( cfg.hasKey( "X-KDE-Protocol" ) )
+            if ( cfg.hasKey( "X-TDE-Protocol" ) )
             {
-                const TQString protocol = cfg.readEntry( "X-KDE-Protocol" );
+                const TQString protocol = cfg.readEntry( "X-TDE-Protocol" );
                 if ( protocol != urlForServiceMenu.protocol() )
                     continue;
             }
-            else if ( cfg.hasKey( "X-KDE-Protocols" ) )
+            else if ( cfg.hasKey( "X-TDE-Protocols" ) )
             {
-                TQStringList protocols = TQStringList::split( "," , cfg.readEntry( "X-KDE-Protocols" ) );
+                TQStringList protocols = TQStringList::split( "," , cfg.readEntry( "X-TDE-Protocols" ) );
                 if ( !protocols.contains( urlForServiceMenu.protocol() ) )
                     continue;
             }
@@ -753,13 +753,13 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
                 continue;
             }
 
-            if ( cfg.hasKey( "X-KDE-Require" ) )
+            if ( cfg.hasKey( "X-TDE-Require" ) )
             {
-                const TQStringList capabilities = cfg.readListEntry( "X-KDE-Require" );
+                const TQStringList capabilities = cfg.readListEntry( "X-TDE-Require" );
                 if ( capabilities.contains( "Write" ) && !sWriting )
                     continue;
             }
-            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 excludeTypes = cfg.readListEntry( "ExcludeServiceTypes" );
@@ -814,8 +814,8 @@ void KonqPopupMenu::setup(KonqPopupFlags kpf)
 
                 if ( ok )
                 {
-                    const TQString priority = cfg.readEntry("X-KDE-Priority");
-                    const TQString submenuName = cfg.readEntry( "X-KDE-Submenu" );
+                    const TQString priority = cfg.readEntry("X-TDE-Priority");
+                    const TQString submenuName = cfg.readEntry( "X-TDE-Submenu" );
 
                     ServiceList* list = s.selectList( priority, submenuName );
                     (*list) += KDEDesktopMimeType::userDefinedServices( *eIt, cfg, url.isLocalFile(), m_lstPopupURLs );
diff --git a/libkonq/konq_settings.cc b/libkonq/konq_settings.cc
index d48c7af10..edde3c3fc 100644
--- a/libkonq/konq_settings.cc
+++ b/libkonq/konq_settings.cc
@@ -131,15 +131,15 @@ bool KonqFMSettings::shouldEmbed( const TQString & serviceType ) const
     bool hasLocalProtocolRedirect = false;
     if ( serviceTypePtr )
     {
-        hasLocalProtocolRedirect = !serviceTypePtr->property( "X-KDE-LocalProtocol" ).toString().isEmpty();
-        TQVariant autoEmbedProp = serviceTypePtr->property( "X-KDE-AutoEmbed" );
+        hasLocalProtocolRedirect = !serviceTypePtr->property( "X-TDE-LocalProtocol" ).toString().isEmpty();
+        TQVariant autoEmbedProp = serviceTypePtr->property( "X-TDE-AutoEmbed" );
         if ( autoEmbedProp.isValid() )
         {
             bool autoEmbed = autoEmbedProp.toBool();
-            kdDebug(1203) << "X-KDE-AutoEmbed set to " << (autoEmbed ? "true" : "false") << endl;
+            kdDebug(1203) << "X-TDE-AutoEmbed set to " << (autoEmbed ? "true" : "false") << endl;
             return autoEmbed;
         } else
-            kdDebug(1203) << "No X-KDE-AutoEmbed, looking for group" << endl;
+            kdDebug(1203) << "No X-TDE-AutoEmbed, looking for group" << endl;
     }
     // 2 - in the configuration for the group if nothing was found in the mimetype
     TQString serviceTypeGroup = serviceType.left(serviceType.find("/"));
diff --git a/libkonq/konqpopupmenuplugin.desktop b/libkonq/konqpopupmenuplugin.desktop
index 984fe6949..07a2a4865 100644
--- a/libkonq/konqpopupmenuplugin.desktop
+++ b/libkonq/konqpopupmenuplugin.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=ServiceType
-X-KDE-ServiceType=KonqPopupMenu/Plugin
+X-TDE-ServiceType=KonqPopupMenu/Plugin
 Comment=Plugin for the Konqueror Popup Menu
 Comment[af]=Inplak vir die Konqueror Opspring Kieslys
 Comment[az]=Konqueror üçün PopupMenu əlavəsi