Bring system icon into XDG compliance

19 files changed, 20 insertions, 20 deletions

diff --git a/kcontrol/smserver/kcmsmserver.desktop b/kcontrol/smserver/kcmsmserver.desktop
index cafdeb083..a727945ba 100644
--- a/kcontrol/smserver/kcmsmserver.desktop
+++ b/kcontrol/smserver/kcmsmserver.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=system-log-out
+Icon=computer-log-out
 Type=Application
 X-DocPath=kcontrol/kcmsmserver/index.html
 Exec=tdecmshell kcmsmserver
diff --git a/kdesktop/init/System.desktop b/kdesktop/init/System.desktop
index 509f1f17d..7c9f2a988 100644
--- a/kdesktop/init/System.desktop
+++ b/kdesktop/init/System.desktop
@@ -144,6 +144,6 @@ GenericName[wa]=Plaeces do sistinme
 GenericName[zh_CN]=系统定位
 GenericName[zh_TW]=系統位置
 URL=system:/
-Icon=system
+Icon=computer
 Type=Link
 OnlyShowIn=TDE;
diff --git a/kicker/applets/lockout/lockout.desktop b/kicker/applets/lockout/lockout.desktop
index 26490e906..7aa420e27 100644
--- a/kicker/applets/lockout/lockout.desktop
+++ b/kicker/applets/lockout/lockout.desktop
@@ -121,5 +121,5 @@ Comment[vi]=Thêm nút khoá màn hình và đăng xuất khỏi phiên làm vi�
 Comment[wa]=Radjout des botons po serer l' waitroûle a clé et dislodjî del session
 Comment[zh_CN]=添加锁定屏幕和注销会话的按钮
 Comment[zh_TW]=加入用來鎖定螢幕與登出作業階段的按鈕
-Icon=system-log-out
+Icon=computer-log-out
 X-TDE-Library=lockout_panelapplet
diff --git a/kicker/applets/naughty/naughtyapplet.desktop b/kicker/applets/naughty/naughtyapplet.desktop
index 39238ddb3..ea6eb68bc 100644
--- a/kicker/applets/naughty/naughtyapplet.desktop
+++ b/kicker/applets/naughty/naughtyapplet.desktop
@@ -126,6 +126,6 @@ Comment[vi]=Phát hiện và ngừng các tiến trình gây lãng phí bộ vi
 Comment[wa]=Trove et arestêye les schetés processus k' eployèt trop di tins CPU
 Comment[zh_CN]=检测并结束占用太多 CPU 时间的进程
 Comment[zh_TW]=偵測並終結浪費多數 CPU 時間的破損程序
-Icon=system-runprocesscatcher
+Icon=computer-runprocesscatcher
 X-TDE-Library=naughty_panelapplet
 X-TDE-UniqueApplet=true
diff --git a/kicker/applets/systemtray/systemtrayapplet.desktop b/kicker/applets/systemtray/systemtrayapplet.desktop
index a2882b994..8d107e583 100644
--- a/kicker/applets/systemtray/systemtrayapplet.desktop
+++ b/kicker/applets/systemtray/systemtrayapplet.desktop
@@ -153,6 +153,6 @@ Comment[xh]=I applet yeqela lenjongo ethile yendlela yetreyi yokusebenza
 Comment[zh_CN]=系统托盘小程序
 Comment[zh_TW]=系統匣 (system tray) 面板小程式
 Comment[zu]=I-applet yewindi lemininingwane yetreyi lesistimu
-Icon=systemtray
+Icon=computertray
 X-TDE-Library=systemtray_panelapplet
 X-TDE-UniqueApplet=true
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index a5641168f..8d129610d 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -265,7 +265,7 @@ KMenu::KMenu()
     if (KickerSettings::kickoffTabBarFormat() != KickerSettings::LabelOnly) {
 	m_tabs[FavoriteTab]->setIconSet(BarIcon("bookmark", tab_icon_size));
 	m_tabs[HistoryTab]->setIconSet(BarIcon("recently_used", tab_icon_size));
-	m_tabs[ComputerTab]->setIconSet(BarIcon("system", tab_icon_size));
+	m_tabs[ComputerTab]->setIconSet(BarIcon("computer", tab_icon_size));
 	m_tabs[ApplicationsTab]->setIconSet(BarIcon("player_playlist", tab_icon_size));
 	m_tabs[LeaveTab]->setIconSet(BarIcon("leave", tab_icon_size));
     }
diff --git a/kicker/menuext/system/systemmenu.desktop b/kicker/menuext/system/systemmenu.desktop
index e6d977c95..cfd510679 100644
--- a/kicker/menuext/system/systemmenu.desktop
+++ b/kicker/menuext/system/systemmenu.desktop
@@ -122,6 +122,6 @@ Comment[vi]=Thực đơn chứa các liên kết hệ thống quan trọng
 Comment[wa]=Dressêye des impôrtantès plaeces do sistinmes
 Comment[zh_CN]=重要系统位置的菜单
 Comment[zh_TW]=重要系統位置選單
-Icon=system
+Icon=computer
 
 X-TDE-Library=kickermenu_systemmenu
diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc
index a94f2d554..cb2149f90 100644
--- a/konqueror/about/konq_aboutpage.cc
+++ b/konqueror/about/konq_aboutpage.cc
@@ -101,7 +101,7 @@ TQString KonqAboutPageFactory::launch()
   TDEIconLoader *iconloader = TDEGlobal::iconLoader();
   int iconSize = iconloader->currentSize(TDEIcon::Desktop);
   TQString home_icon_path = iconloader->iconPath("kfm_home", TDEIcon::Desktop );
-  TQString storage_icon_path = iconloader->iconPath("system", TDEIcon::Desktop );
+  TQString storage_icon_path = iconloader->iconPath("computer", TDEIcon::Desktop );
   TQString remote_icon_path = iconloader->iconPath("network", TDEIcon::Desktop );
   TQString wastebin_icon_path = iconloader->iconPath("trashcan_full", TDEIcon::Desktop );
   TQString applications_icon_path = iconloader->iconPath("kmenu", TDEIcon::Desktop );
diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc
index 4725327d5..7a8c4fd03 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -3852,9 +3852,9 @@ void KonqMainWindow::initActions()
   connect( m_paHome, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState) ), TQT_TQOBJECT(this),
 	   TQT_SLOT( slotHome(TDEAction::ActivationReason, TQt::ButtonState) ) );
 
-  (void) new TDEAction( i18n( "S&ystem" ), "system", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoSystem() ), actionCollection(), "go_system" );
+  (void) new TDEAction( i18n( "S&ystem" ), "computer", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoSystem() ), actionCollection(), "go_system" );
   (void) new TDEAction( i18n( "App&lications" ), "kmenu", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoApplications() ), actionCollection(), "go_applications" );
-  (void) new TDEAction( i18n( "&Storage Media" ), "system", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoMedia() ), actionCollection(), "go_media" );
+  (void) new TDEAction( i18n( "&Storage Media" ), "computer", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoMedia() ), actionCollection(), "go_media" );
   (void) new TDEAction( i18n( "&Network Folders" ), "network", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoNetworkFolders() ), actionCollection(), "go_network_folders" );
   (void) new TDEAction( i18n( "Sett&ings" ), "kcontrol", 0, TQT_TQOBJECT(this), TQT_SLOT( slotGoSettings() ), actionCollection(), "go_settings" );
   //(void) new TDEAction( i18n( "Sidebar Configuration" ), 0, this, TQT_SLOT( slotGoDirTree() ), actionCollection(), "go_dirtree" );
diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.desktop b/konqueror/shellcmdplugin/kshellcmdplugin.desktop
index 09c263aeb..9d7f7cb37 100644
--- a/konqueror/shellcmdplugin/kshellcmdplugin.desktop
+++ b/konqueror/shellcmdplugin/kshellcmdplugin.desktop
@@ -10,7 +10,7 @@ X-TDE-PluginInfo-Depends=
 X-TDE-PluginInfo-License=GPL
 X-TDE-PluginInfo-EnabledByDefault=true
 X-TDE-ParentApp=konqueror
-Icon=system-run
+Icon=computer-run
 Name=Shell Command Plugin
 Name[af]=Opdrag tolk inprop module
 Name[ar]=قابس أمر المحارة
diff --git a/konqueror/sidebar/trees/init/services/media.desktop b/konqueror/sidebar/trees/init/services/media.desktop
index 1a7a85c19..a74a01f09 100644
--- a/konqueror/sidebar/trees/init/services/media.desktop
+++ b/konqueror/sidebar/trees/init/services/media.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Link
 URL=media:/
-Icon=system
+Icon=computer
 Name=Storage Media
 Name[af]=Stoor Media
 Name[ar]=وسائط التخزين
diff --git a/konqueror/sidebar/trees/init/system.desktop b/konqueror/sidebar/trees/init/system.desktop
index 9e87b0470..a3260e006 100644
--- a/konqueror/sidebar/trees/init/system.desktop
+++ b/konqueror/sidebar/trees/init/system.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Link
 URL=system:/
-Icon=system
+Icon=computer
 Name=System
 Name[af]=Stelsel
 Name[ar]=النظام
diff --git a/tdeioslave/cgi/kcmcgi/kcmcgi.desktop b/tdeioslave/cgi/kcmcgi/kcmcgi.desktop
index 986d06cac..520958305 100644
--- a/tdeioslave/cgi/kcmcgi/kcmcgi.desktop
+++ b/tdeioslave/cgi/kcmcgi/kcmcgi.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=system-run
+Icon=computer-run
 Type=Application
 Exec=tdecmshell kcmcgi
 X-DocPath=kcontrol/kcmcgi/index.html
diff --git a/tdeioslave/media/media.protocol b/tdeioslave/media/media.protocol
index 9a2ff824e..45dcd7ad3 100644
--- a/tdeioslave/media/media.protocol
+++ b/tdeioslave/media/media.protocol
@@ -10,7 +10,7 @@ makedir=true
 deleting=true
 linking=true
 moving=true
-Icon=system
+Icon=computer
 maxInstances=4
 X-DocPath=tdeioslave/media/index.html
 Class=:local
diff --git a/tdeioslave/media/mimetypes/mycomputer.desktop b/tdeioslave/media/mimetypes/mycomputer.desktop
index 886d95aed..7e360892d 100644
--- a/tdeioslave/media/mimetypes/mycomputer.desktop
+++ b/tdeioslave/media/mimetypes/mycomputer.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=system
+Icon=computer
 Type=MimeType
 MimeType=media/builtin-mycomputer
 Comment=My Computer
diff --git a/tdeioslave/media/tdecmodule/media.desktop b/tdeioslave/media/tdecmodule/media.desktop
index 007603832..badfc48cc 100644
--- a/tdeioslave/media/tdecmodule/media.desktop
+++ b/tdeioslave/media/tdecmodule/media.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 X-DocPath=kcontrol/media/index.html
-Icon=system
+Icon=computer
 Exec=tdecmshell media
 X-TDE-Library=media
 X-TDE-FactoryName=media
diff --git a/tdeioslave/system/entries/media.desktop b/tdeioslave/system/entries/media.desktop
index 8ad83923a..107ea9555 100644
--- a/tdeioslave/system/entries/media.desktop
+++ b/tdeioslave/system/entries/media.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Link
 URL=media:/
-Icon=system
+Icon=computer
 Name=Storage Media
 Name[af]=Stoor Media
 Name[ar]=وسائط التخزين
diff --git a/tdeioslave/system/system.protocol b/tdeioslave/system/system.protocol
index a32fd4560..62eea0631 100644
--- a/tdeioslave/system/system.protocol
+++ b/tdeioslave/system/system.protocol
@@ -10,7 +10,7 @@ makedir=true
 deleting=true
 linking=true
 moving=true
-Icon=system
+Icon=computer
 maxInstances=4
 X-DocPath=tdeioslave/system/index.html
 Class=:local
diff --git a/tdeioslave/system/systemimpl.cpp b/tdeioslave/system/systemimpl.cpp
index 2cd8226a5..21a9da7da 100644
--- a/tdeioslave/system/systemimpl.cpp
+++ b/tdeioslave/system/systemimpl.cpp
@@ -204,7 +204,7 @@ void SystemImpl::createTopLevelEntry(TDEIO::UDSEntry &entry) const
 	addAtom(entry, TDEIO::UDS_FILE_TYPE, S_IFDIR);
 	addAtom(entry, TDEIO::UDS_ACCESS, 0555);
 	addAtom(entry, TDEIO::UDS_MIME_TYPE, 0, "inode/system_directory");
-	addAtom(entry, TDEIO::UDS_ICON_NAME, 0, "system");
+	addAtom(entry, TDEIO::UDS_ICON_NAME, 0, "computer");
 }
 
 TQString SystemImpl::readPathINL(TQString filename)