Second part of prior commit

diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
index d993022..eb96f68 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
@@ -277,7 +277,7 @@
       KSimpleConfig service(path + name + ".desktop");
       service.setGroup("Desktop Entry");
       service.writeEntry("Type", "Service");
-      service.writeEntry("ServiceTypes", "SearchProvider");
+      service.writeEntry("X-TDE-ServiceTypes", "SearchProvider");
       service.writeEntry("Name", provider->name());
       service.writeEntry("Query", provider->query(), true, false, true);
       service.writeEntry("Keys", provider->keys());
@@ -307,7 +307,7 @@
       KSimpleConfig service(path + *it + ".desktop");
       service.setGroup("Desktop Entry");
       service.writeEntry("Type", "Service");
-      service.writeEntry("ServiceTypes", "SearchProvider");
+      service.writeEntry("X-TDE-ServiceTypes", "SearchProvider");
       service.writeEntry("Hidden", true);
   }
 
diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
index 436a322..ae86c58 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
@@ -501,7 +501,7 @@
         KSimpleConfig desktop(kapp->dirs()->saveLocation("services", "searchproviders/") + name + ".desktop");
         desktop.setGroup("Desktop Entry");
         desktop.writeEntry("Type", "Service");
-        desktop.writeEntry("ServiceTypes", "SearchProvider");
+        desktop.writeEntry("X-TDE-ServiceTypes", "SearchProvider");
         desktop.writeEntry("Name", *it);
         desktop.writeEntry("Query", query);
         desktop.writeEntry("Keys", keys);
diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc
index b5e3be4..c16b95a 100644
--- a/libkonq/konq_popupmenu.cc
+++ b/libkonq/konq_popupmenu.cc
@@ -782,10 +782,10 @@
                 if ( capabilities.contains( "Write" ) && !sWriting )
                     continue;
             }
-            if ( (cfg.hasKey( "Actions" ) || cfg.hasKey( "X-TDE-GetActionMenu") ) && cfg.hasKey( "ServiceTypes" ) )
+            if ( (cfg.hasKey( "Actions" ) || cfg.hasKey( "X-TDE-GetActionMenu") ) && cfg.hasKey( "X-TDE-ServiceTypes" ) )
             {
-                const TQStringList types = cfg.readListEntry( "ServiceTypes" );
-                const TQStringList excludeTypes = cfg.readListEntry( "ExcludeServiceTypes" );
+                const TQStringList types = cfg.readListEntry( "X-TDE-ServiceTypes" );
+                const TQStringList excludeTypes = cfg.readListEntry( "X-TDE-ExcludeServiceTypes" );
                 bool ok = false;
 
                 // check for exact matches or a typeglob'd mimetype if we have a mimetype
diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp
index 0b6855c..8e08178 100644
--- a/nsplugins/pluginscan.cpp
+++ b/nsplugins/pluginscan.cpp
@@ -470,8 +470,8 @@
         ts << "Icon=netscape" << endl;
         ts << "Comment=" << i18n("Netscape plugin viewer") << endl;
         ts << "X-TDE-Library=libnsplugin" << endl;
-        ts << "InitialPreference=7" << endl;
-        ts << "ServiceTypes=KParts/ReadOnlyPart,Browser/View" << endl;
+        ts << "X-TDE-InitialPreference=7" << endl;
+        ts << "X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View" << endl;
         ts << "X-TDE-BrowserView-PluginsInfo=nsplugins/pluginsinfo" << endl;
 
         if (mimeTypes.count() > 0)
diff --git a/tdeioslave/media/libmediacommon/notifierserviceaction.cpp b/tdeioslave/media/libmediacommon/notifierserviceaction.cpp
index 2405dfb..c0b1104 100644
--- a/tdeioslave/media/libmediacommon/notifierserviceaction.cpp
+++ b/tdeioslave/media/libmediacommon/notifierserviceaction.cpp
@@ -159,7 +159,7 @@
 
 	desktopFile.setDesktopGroup();
 
-	desktopFile.writeEntry(TQString("ServiceTypes"), m_mimetypes, ",");
+	desktopFile.writeEntry(TQString("X-TDE-ServiceTypes"), m_mimetypes, ",");
 	desktopFile.writeEntry(TQString("Actions"),
 	                       TQStringList(m_service.m_strName),";");
 }
diff --git a/tdeioslave/media/libmediacommon/notifiersettings.cpp b/tdeioslave/media/libmediacommon/notifiersettings.cpp
index a7dc7ee..53d5e63 100644
--- a/tdeioslave/media/libmediacommon/notifiersettings.cpp
+++ b/tdeioslave/media/libmediacommon/notifiersettings.cpp
@@ -297,7 +297,7 @@
 	TQValueList<NotifierServiceAction*> services;
 	
 	const TQString filename = desktop.fileName();
-	const TQStringList mimetypes = desktop.readListEntry( "ServiceTypes" );
+	const TQStringList mimetypes = desktop.readListEntry( "X-TDE-ServiceTypes" );
 
 	TQValueList<KDEDesktopMimeType::Service> type_services
 		= KDEDesktopMimeType::userDefinedServices(filename, true);
@@ -325,7 +325,7 @@
 	desktop.setDesktopGroup();
 
 	if ( desktop.hasKey( "Actions" )
-	  && desktop.hasKey( "ServiceTypes" )
+	  && desktop.hasKey( "X-TDE-ServiceTypes" )
 	  && !desktop.readBoolEntry( "X-TDE-MediaNotifierHide", false )  )
 	{
 		const TQStringList actions = desktop.readListEntry( "Actions" );
@@ -335,7 +335,7 @@
 			return false;
 		}
 		
-		const TQStringList types = desktop.readListEntry( "ServiceTypes" );
+		const TQStringList types = desktop.readListEntry( "X-TDE-ServiceTypes" );
 
 		if ( mimetype.isEmpty() )
 		{

Merge branch 'master' of https://scm.trinitydesktop.org/scm/git/tdebase

diff --git a/applnk/compat/email.desktop b/applnk/compat/email.desktop
index 016b0ee..1791ecd 100644
--- a/applnk/compat/email.desktop
+++ b/applnk/compat/email.desktop
@@ -2,7 +2,7 @@
 Icon=email
 Type=Application
 Exec=tdecmshell kcm_useraccount
-DocPath=kcontrol/email/index.html
+X-DocPath=kcontrol/email/index.html
 X-TDE-ModuleType=Library
 X-TDE-Library=useraccount
 X-TDE-ParentApp=kcontrol
diff --git a/applnk/compat/passwords.desktop b/applnk/compat/passwords.desktop
index 7d90765..82e040f 100644
--- a/applnk/compat/passwords.desktop
+++ b/applnk/compat/passwords.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Exec=tdecmshell kcm_useraccount
 Icon=password
-DocPath=kcontrol/useraccount/index.html
+X-DocPath=kcontrol/useraccount/index.html
 NoDisplay=true
 X-TDE-ModuleType=Library
 X-TDE-Library=useraccount
diff --git a/applnk/compat/userinfo.desktop b/applnk/compat/userinfo.desktop
index 3764635..3a2f971 100644
--- a/applnk/compat/userinfo.desktop
+++ b/applnk/compat/userinfo.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Exec=tdecmshell kcm_useraccount
 Icon=tdmconfig
-DocPath=kcontrol/useraccount/index.html
+X-DocPath=kcontrol/useraccount/index.html
 
 X-TDE-ModuleType=Library
 X-TDE-Library=useraccount
diff --git a/kappfinder/apps/Internet/Terminal/btdownloadcurses.desktop b/kappfinder/apps/Internet/Terminal/btdownloadcurses.desktop
index f442933..0332232 100644
--- a/kappfinder/apps/Internet/Terminal/btdownloadcurses.desktop
+++ b/kappfinder/apps/Internet/Terminal/btdownloadcurses.desktop
@@ -52,7 +52,7 @@
 GenericName[wa]=Eterface grafike po BitTorrent
 GenericName[zh_TW]=BitTorrent ���������������������
 Icon=xapp
-InitialPreference=1
+X-TDE-InitialPreference=1
 MimeType=application/x-bittorrent
 Name=BitTorrent Python Curses GUI
 Name[be]=���������������� ������������ BitTorrent ���� �������� Python
@@ -101,6 +101,6 @@
 Name[vi]=Con tr��� Giao di���n Python BitTorrent
 Name[wa]=Eterface grafike e python po BitTorrent
 Name[zh_TW]=BitTorrent Python Curses ���������������������
-ServiceTypes=
+X-TDE-ServiceTypes=
 Terminal=true
 Type=Application
diff --git a/kappfinder/apps/Internet/btdownloadgui.desktop b/kappfinder/apps/Internet/btdownloadgui.desktop
index 66bff95..671879b 100644
--- a/kappfinder/apps/Internet/btdownloadgui.desktop
+++ b/kappfinder/apps/Internet/btdownloadgui.desktop
@@ -52,7 +52,7 @@
 GenericName[wa]=Eterface grafike po BitTorrent
 GenericName[zh_TW]=BitTorrent ���������������������
 Icon=xapp
-InitialPreference=2
+X-TDE-InitialPreference=2
 MimeType=application/x-bittorrent
 Name=BitTorrent Python wxGTK GUI
 Name[be]=���������������� ������������ BitTorrent ���� �������� Python ������ wxGTK
@@ -100,6 +100,6 @@
 Name[vi]=Giao di���n wxGTK Python BitTorrent
 Name[wa]=Eterface grafike e python wxGTK po BitTorrent
 Name[zh_TW]=BitTorrent Python wxGTK ���������������������
-ServiceTypes=
+X-TDE-ServiceTypes=
 Terminal=false
 Type=Application
diff --git a/kappfinder/apps/Internet/javaws.desktop b/kappfinder/apps/Internet/javaws.desktop
index bed9f6f..fada724 100644
--- a/kappfinder/apps/Internet/javaws.desktop
+++ b/kappfinder/apps/Internet/javaws.desktop
@@ -27,7 +27,7 @@
 Name[uk]=������������ �������������� Java �� ������������
 Name[vi]=Kh���i �����ng Java M���ng
 Name[wa]=Enondaedje di Java sol daegntoele
-ServiceTypes=
+X-TDE-ServiceTypes=
 Terminal=false
 Type=Application
 Icon=java
diff --git a/kappfinder/apps/Multimedia/XMovie.desktop b/kappfinder/apps/Multimedia/XMovie.desktop
index 594a2f9..25a1a9e 100644
--- a/kappfinder/apps/Multimedia/XMovie.desktop
+++ b/kappfinder/apps/Multimedia/XMovie.desktop
@@ -96,5 +96,5 @@
 Terminal=false
 Icon=xmovie
 MimeType=video/x-msvideo;video/quicktime;video/x-flic;video/mpeg;video/x-mpeg;
-InitialPreference=10
+X-TDE-InitialPreference=10
 Type=Application
diff --git a/kappfinder/apps/Multimedia/aviplay.desktop b/kappfinder/apps/Multimedia/aviplay.desktop
index 058a898..a19f9d7 100644
--- a/kappfinder/apps/Multimedia/aviplay.desktop
+++ b/kappfinder/apps/Multimedia/aviplay.desktop
@@ -93,6 +93,6 @@
 Name[vi]=Ch��i Avi
 Name[xh]=Umdlalo we Avi
 Name[zu]=Umdlali we-Avi
-ServiceTypes=
+X-TDE-ServiceTypes=
 Type=Application
 
diff --git a/kappfinder/apps/Multimedia/gtv.desktop b/kappfinder/apps/Multimedia/gtv.desktop
index cac8984..2a7eb0c 100644
--- a/kappfinder/apps/Multimedia/gtv.desktop
+++ b/kappfinder/apps/Multimedia/gtv.desktop
@@ -88,5 +88,5 @@
 Name[hi]=������������������
 Name[te]=������������������
 Name[th]=GTV 
-ServiceTypes=
+X-TDE-ServiceTypes=
 Type=Application
diff --git a/kappfinder/apps/Multimedia/mplayer.desktop b/kappfinder/apps/Multimedia/mplayer.desktop
index 0dc6a15..e08dbc8 100644
--- a/kappfinder/apps/Multimedia/mplayer.desktop
+++ b/kappfinder/apps/Multimedia/mplayer.desktop
@@ -95,7 +95,7 @@
 Name[ta]=M������������������
 Name[te]=���������������������������
 Name[ven]=Tshitambisi tsha M
-ServiceTypes=
+X-TDE-ServiceTypes=
 ** Diff limit reached (max: 250 lines) **