Bring mail_forward, mail_new, mail_replyall, mail_reply, mail_send, player_pause, player_play, player_stop, player_rew, player_fwd, player_start, player_end, rotate_ccw, rotate_cw, window_fullscreen, window_nofullscreen, window_new, viewmagfit, viewmag+, viewmag1, and viewmag- icons into XDG compliance

diff --git a/kshowmail/kcmconfigs/configactions.cpp b/kshowmail/kcmconfigs/configactions.cpp
index 11cacd6..98edf8c 100644
--- a/kshowmail/kcmconfigs/configactions.cpp
+++ b/kshowmail/kcmconfigs/configactions.cpp
@@ -58,7 +58,7 @@
   TQToolTip::add( chkNewMailsSound, i18n( "Plays sound if new mail" ) );
   layMainNewMailsDown->addWidget( chkNewMailsSound, 0, 0 );
 
-  btnNewMailsPlaySound = new KPushButton( KGuiItem( TQString(), TQString( "player_play" ), i18n( "Play the selected sound file" ), i18n( "Play the selected sound file" ) ), gboxNewMails, "btnNewMailsPlaySound" );
+  btnNewMailsPlaySound = new KPushButton( KGuiItem( TQString(), TQString( "media-playback-start" ), i18n( "Play the selected sound file" ), i18n( "Play the selected sound file" ) ), gboxNewMails, "btnNewMailsPlaySound" );
   layMainNewMailsDown->addWidget( btnNewMailsPlaySound, 0, 1 );
 
   txtNewMailsSound = new KLineEdit( gboxNewMails, "txtNewMailsSound" );
diff --git a/kshowmail/kcmconfigs/configfilter.cpp b/kshowmail/kcmconfigs/configfilter.cpp
index 6807cf6..708898c 100644
--- a/kshowmail/kcmconfigs/configfilter.cpp
+++ b/kshowmail/kcmconfigs/configfilter.cpp
@@ -42,7 +42,7 @@
   TQHBoxLayout* laySender = new TQHBoxLayout( gboxSenderLists->layout(), 10 );
   layMain->addWidget( gboxSenderLists );
 
-  btnOpenWhitelist = new KPushButton( KGuiItem( TQString( i18n( "Whitelist") ), TQString( "mail_forward" ) ), gboxSenderLists, "btnOpenWhitelist" );
+  btnOpenWhitelist = new KPushButton( KGuiItem( TQString( i18n( "Whitelist") ), TQString( "mail-forward" ) ), gboxSenderLists, "btnOpenWhitelist" );
   TQToolTip::add( btnOpenWhitelist, i18n( "Click here to edit the list of senders whose mails shall pass the filter." ) );
   laySender->addWidget( btnOpenWhitelist );
   laySender->setStretchFactor( btnOpenWhitelist, 3 );
diff --git a/kshowmail/showmaildialog.cpp b/kshowmail/showmaildialog.cpp
index daaf5f8..1b57c7c 100644
--- a/kshowmail/showmaildialog.cpp
+++ b/kshowmail/showmaildialog.cpp
@@ -12,7 +12,7 @@
 #include "showmaildialog.h"
 
 ShowMailDialog::ShowMailDialog( TQWidget * parent, TQString & caption, bool allowHTML, TQString & sender, TQString & date, TQString & size, TQString & subject, TQString & body ) :
-    KDialogBase( parent, "showmaildialog", true, caption, KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::User1, KDialogBase::Ok, true, KGuiItem( i18n( "Reply" ), "mail_reply" ) )
+    KDialogBase( parent, "showmaildialog", true, caption, KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::User1, KDialogBase::Ok, true, KGuiItem( i18n( "Reply" ), "mail-reply-sender" ) )
 {
   //create main widget
   TQWidget* mainWidget = new TQWidget( this );

Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kshowmail

diff --git a/cmake b/cmake
index 08c6f54..47d7755 160000
--- a/cmake
+++ b/cmake
-Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c
+Subproject commit 47d775518c382c77f663a70bb23fad93e6810090