From: Zoltan Papp <zoltan.papp@ixonos.com>
Date: Mon, 1 Jun 2009 06:41:31 +0000 (+0300)
Subject: Merge branch 'master' into dev_local
X-Git-Url: http://vcs.maemo.org/git/?p=qtmeetings;a=commitdiff_plain;h=b1a79d56592e493c6206a198883caadca7bc74b0

Merge branch 'master' into dev_local
---

b1a79d56592e493c6206a198883caadca7bc74b0
diff --cc src/UserInterface/Views/RoomStatusIndicatorWidget.h
index 4740f1f,73957b6..4d8966c
--- a/src/UserInterface/Views/RoomStatusIndicatorWidget.h
+++ b/src/UserInterface/Views/RoomStatusIndicatorWidget.h
@@@ -60,14 -60,10 +60,16 @@@ public slots
  	 */
  	void statusChanged( const Room::Status aStatus, const QTime aUntil );
  	
+ 	void currentRoomChanged( Room *aRoom );
+ 	
  	void viewResized(const QSize &newSize, const QSize &oldSize) { }
  
 +	void connectionEstablished();
 +	
 +	void connectionLost();
 +	
 +	void currentRoomChanged( Room *aRoom );
 +	
  private:
  	//! Translates the status into human readable text.
  	/*!