1 files changed, 8 insertions, 2 deletions
diff --git a/Swift/QtUI/QtSystemTray.cpp b/Swift/QtUI/QtSystemTray.cpp
index aa9bac2..4393c74 100644
--- a/Swift/QtUI/QtSystemTray.cpp
+++ b/Swift/QtUI/QtSystemTray.cpp
@@ -11,9 +11,10 @@
 #include <QResource>
 
 namespace Swift {
-QtSystemTray::QtSystemTray() : QObject(), onlineIcon_(":icons/online.png"), awayIcon_(":icons/away.png"), dndIcon_(":icons/dnd.png"), offlineIcon_(":icons/offline.png"), newMessageIcon_(":icons/new-chat.png"), throbberIcon_(":/icons/throbber.gif"), unreadMessages_(false), connecting_(false) {
+QtSystemTray::QtSystemTray() : QObject(), onlineIcon_(":icons/online.png"), awayIcon_(":icons/away.png"), dndIcon_(":icons/dnd.png"), offlineIcon_(":icons/offline.png"), newMessageIcon_(":icons/new-chat.png"), throbberMovie_(":/icons/throbber.gif"), unreadMessages_(false), connecting_(false) {
 	trayIcon_ = new QSystemTrayIcon(offlineIcon_);
 	connect(trayIcon_, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(handleIconActivated(QSystemTrayIcon::ActivationReason)));
+	connect(&throbberMovie_, SIGNAL(frameChanged(int)), this, SLOT(handleThrobberFrameChanged(int)));
 	trayIcon_->show();
 }
 
@@ -26,6 +27,10 @@ void QtSystemTray::setUnreadMessages(bool some) {
 	updateStatusIcon();
 }
 
+void QtSystemTray::handleThrobberFrameChanged(int /*frameNumber*/) {
+	trayIcon_->setIcon(QIcon(throbberMovie_.currentPixmap()));
+}
+
 void QtSystemTray::setConnecting() {
 	connecting_ = true;
 	updateStatusIcon();
@@ -43,10 +48,11 @@ void QtSystemTray::setStatusType(StatusShow::Type type) {
 }
 
 void QtSystemTray::updateStatusIcon() {
+	throbberMovie_.stop();
 	if (unreadMessages_) {
 		trayIcon_->setIcon(newMessageIcon_);
 	} else if (connecting_) {
-		trayIcon_->setIcon(throbberIcon_);
+		throbberMovie_.start();
 	}	else {
 		switch (statusType_) {
 			case StatusShow::Online : trayIcon_->setIcon(onlineIcon_);break;