--- a/messagingapp/msgui/msgapp/inc/msgmainwindow.h	Tue Oct 05 13:58:47 2010 +0530
+++ b/messagingapp/msgui/msgapp/inc/msgmainwindow.h	Tue Oct 19 11:30:16 2010 +0530
@@ -27,6 +27,7 @@
 class MsgViewManager;
 class MsgServiceInterface;
 class MsgSendServiceInterface;
+class MsgActivityHandler;
 
 /**
  * Main window of the messaging application. Activates the
@@ -40,7 +41,8 @@
     /**
      * Constructor
      */
-    MsgMainWindow(bool serviceRequest,
+    MsgMainWindow(bool serviceRequest, 
+                  MsgActivityHandler *handler,
                    QWidget *parent = 0);
 
     /**
@@ -53,6 +55,7 @@
      */
     MsgViewManager* viewManager();
     
+
 protected:
 
     /**
@@ -60,7 +63,12 @@
      * @see QGraphicsItem
      */
     void keyPressEvent(QKeyEvent *event);
-    
+
+    /**
+     * Event filter on application
+     */
+    bool eventFilter(QObject *obj, QEvent *event);
+	    
 private:
     /**
      * This initializes the member objects
@@ -71,11 +79,15 @@
     MsgServiceInterface* mMsgSI;
     MsgSendServiceInterface* mMsgSendSI;
     MsgViewManager* mViewManager;
+	/**
+	 * Not owned
+	 */
+    MsgActivityHandler* mActivityHandler;
     
     /**
      * Unit Testing
      */
-    #ifdef MSGUI_UNIT_TEST
+    #ifdef MSGUI_MSGAPP_UNIT_TEST
       friend class TestMsgMainWindow;
     #endif