Branch: master

23efa976 2014-10-14 11:39:44 Timothy Pearson
Bring package_development, package_games, package_graphics, package_network, package_multimedia, package_wordprocessing, edu_science, package_utilities, input_devices_settings, kcmsystem, personal, and looknfeel icons into XDG compliance
M kopete/kopete/config/accounts/kopete_accountconfig.desktop
M kopete/kopete/config/appearance/kopete_appearanceconfig.desktop
M kopete/kopete/kopetewindow.cpp
M kopete/protocols/winpopup/wpaddcontact.cpp
diff --git a/kopete/kopete/config/accounts/kopete_accountconfig.desktop b/kopete/kopete/config/accounts/kopete_accountconfig.desktop
index ea2e797..0bc2b66 100644
--- a/kopete/kopete/config/accounts/kopete_accountconfig.desktop
+++ b/kopete/kopete/config/accounts/kopete_accountconfig.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=personal
+Icon=preferences-desktop-personal
 Type=Service
 X-TDE-ServiceTypes=TDECModule
 
diff --git a/kopete/kopete/config/appearance/kopete_appearanceconfig.desktop b/kopete/kopete/config/appearance/kopete_appearanceconfig.desktop
index aa923fc..c7738d7 100644
--- a/kopete/kopete/config/appearance/kopete_appearanceconfig.desktop
+++ b/kopete/kopete/config/appearance/kopete_appearanceconfig.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=looknfeel
+Icon=preferences-desktop
 Type=Service
 X-TDE-ServiceTypes=TDECModule
 
diff --git a/kopete/kopete/kopetewindow.cpp b/kopete/kopete/kopetewindow.cpp
index dc3e8a0..63633f0 100644
--- a/kopete/kopete/kopetewindow.cpp
+++ b/kopete/kopete/kopetewindow.cpp
@@ -280,7 +280,7 @@
 	statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(showStatusbar()), actionCollection(), "settings_showstatusbar");
 
 	KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection(), "settings_keys" );
-	new TDEAction( i18n( "Configure Plugins..." ), "input_devices_settings", 0, TQT_TQOBJECT(this),
+	new TDEAction( i18n( "Configure Plugins..." ), "preferences-desktop-peripherals", 0, TQT_TQOBJECT(this),
 		TQT_SLOT( slotConfigurePlugins() ), actionCollection(), "settings_plugins" );
 	new TDEAction( i18n( "Configure &Global Shortcuts..." ), "configure_shortcuts", 0, TQT_TQOBJECT(this),
 		TQT_SLOT( slotConfGlobalKeys() ), actionCollection(), "settings_global" );
diff --git a/kopete/protocols/winpopup/wpaddcontact.cpp b/kopete/protocols/winpopup/wpaddcontact.cpp
index 10f7df7..43be67a 100644
--- a/kopete/protocols/winpopup/wpaddcontact.cpp
+++ b/kopete/protocols/winpopup/wpaddcontact.cpp
@@ -77,7 +77,7 @@
 	TQString ownHost = theAccount->myself()->contactId();
 	TQStringList::ConstIterator end = Hosts.end();
 	for (TQStringList::ConstIterator i = Hosts.begin(); i != end; i++)
-		if (*i != ownHost) theDialog->mHostName->insertItem(SmallIcon("personal"), *i);
+		if (*i != ownHost) theDialog->mHostName->insertItem(SmallIcon("preferences-desktop-personal"), *i);
 }
 
 bool WPAddContact::validateData()