Merge branch 'KDE/4.11' into KDE/4.12

kmkernel.cpp

@@ -458,6 +458,13 @@ void KMKernel::checkMail () //might create a new reader but won't show!!
   }
 }
 
+void KMKernel::setSystrayUnreadCountEnabled(bool enabled)
+{
+    GlobalSettings::self()->systemTrayShowUnreadItem()->setValue(enabled);
+    mSystemTray->setShowUnread(enabled);
+    GlobalSettings::self()->writeConfig();
+}
+
 QStringList KMKernel::accounts()
 {
   QStringList accountLst;

kmkernel.h

@@ -118,6 +118,8 @@ public Q_SLOTS:
   Q_SCRIPTABLE void checkMail();
   Q_SCRIPTABLE void openReader() { openReader( false ); }
 
+  Q_SCRIPTABLE void setSystrayUnreadCountEnabled(bool enabled);
+
   /**
    * Pauses all background jobs and does not
    * allow new background jobs to be started.