Index: /home/wwwchrisde/svn/konversation/src/konversationmainwindow.cpp
===================================================================
--- /home/wwwchrisde/svn/konversation/src/konversationmainwindow.cpp	(revision 499443)
+++ /home/wwwchrisde/svn/konversation/src/konversationmainwindow.cpp	(revision 499444)
@@ -128,7 +128,7 @@
 
     //used for event compression. See header file for resetHasDirtySettings()
     connect(KonversationApplication::instance(), SIGNAL(appearanceChanged()), this, SLOT(resetHasDirtySettings()));
-
+    connect(KonversationApplication::instance(), SIGNAL(appearanceChanged()), this, SLOT(updateTrayIcon()));
                                                   // file_quit
     KStdAction::quit(this,SLOT(quitProgram()),actionCollection());
 
@@ -373,25 +373,23 @@
 
 void KonversationMainWindow::settingsChangedSlot()
 {
-    if(!m_hasDirtySettings) {
-        //This is for compressing the events. m_hasDirtySettings is set to true
-        //when the settings have changed, then set to false when the app reacts to it
-	//via the appearanceChanged signal.  This prevents a series of settingsChanged signals
-	//causing the app expensively rereading its settings many times.
-	//The appearanceChanged signal is connected to resetHasDirtySettings to reset this bool
+    // This is for compressing the events. m_hasDirtySettings is set to true
+    // when the settings have changed, then set to false when the app reacts to it
+    // via the appearanceChanged signal.  This prevents a series of settingsChanged signals
+    // causing the app expensively rereading its settings many times.
+    // The appearanceChanged signal is connected to resetHasDirtySettings to reset this bool
+    if(!m_hasDirtySettings) 
+    {
         QTimer::singleShot(0, KonversationApplication::instance(), SIGNAL(appearanceChanged()));
-	m_hasDirtySettings = true;
-	kdDebug() << "Seen settingsChanged signal" << endl;
-	
-    } else {
-	kdDebug() << "IGNORING settingsChanged signal" << endl;
+        m_hasDirtySettings = true;
     }
 }
-void KonversationMainWindow::resetHasDirtySettings() {
+
+void KonversationMainWindow::resetHasDirtySettings() 
+{
     m_hasDirtySettings = false;
 }
 
-
 void KonversationMainWindow::openKeyBindings()
 {
     KKeyDialog::configure(actionCollection());
@@ -1703,24 +1701,17 @@
 
 void KonversationMainWindow::updateTrayIcon()
 {
+    tray->setNotificationEnabled(Preferences::trayNotify());
+
     if(Preferences::showTrayIcon())
-    {
         tray->show();
-    }
     else
         tray->hide();
 
-    tray->setNotificationEnabled(Preferences::trayNotify());
-
-    if(Preferences::showTrayIcon() &&
-        Preferences::systrayOnly())
-    {
+    if(Preferences::showTrayIcon() && Preferences::systrayOnly())
         KWin::setState(winId(), NET::SkipTaskbar);
-    }
     else
-    {
         KWin::clearState(winId(), NET::SkipTaskbar);
-    }
 }
 
 void KonversationMainWindow::addIRCColor()
Index: /home/wwwchrisde/svn/konversation/src/trayicon.cpp
===================================================================
--- /home/wwwchrisde/svn/konversation/src/trayicon.cpp	(revision 499443)
+++ /home/wwwchrisde/svn/konversation/src/trayicon.cpp	(revision 499444)
@@ -39,8 +39,7 @@
         m_blinkTimer = new QTimer(this);
         connect(m_blinkTimer, SIGNAL(timeout()), SLOT(blinkTimeout()));
 
-        if(Preferences::showTrayIcon() &&
-            Preferences::systrayOnly())
+        if(Preferences::showTrayIcon() && Preferences::systrayOnly())
             KWin::setState(parent->winId(), NET::SkipTaskbar);
 
         QToolTip::add(this,i18n("Konversation - IRC Client"));