--- a/ginebra2/emulator/BrowserMainS60.h	Wed Jun 23 17:59:43 2010 +0300
+++ b/ginebra2/emulator/BrowserMainS60.h	Tue Jul 06 14:03:49 2010 +0300
@@ -29,6 +29,7 @@
 #include <QtGui>
 
 #include "browser.h"
+#include "singleton.h"
 
 /*
  * Handles calls from other apps to QDesktopServices.openUrl
@@ -54,11 +55,11 @@
     CEikAppUi *CreateAppUiL();
 };
 
-class BrowserMainApplicationS60 : public QS60MainApplication, CCoeStatic
+class BrowserMainApplicationS60 : public  QS60MainApplication
 {
-  // BrowserMainApp is a singleton so we can get at it from anywhere
+  
   public:
-    static BrowserMainApplicationS60* Instance();
+    BrowserMainApplicationS60();
     void SetInitialUrl(QString url) { initialUrl = url; }
     QString InitialUrl() { return initialUrl; }
     void setUrlHandler(GinebraBrowser *uh);
@@ -68,11 +69,11 @@
     CApaDocument *CreateDocumentL();
 
   private:
-    BrowserMainApplicationS60();
-
-  private:
     QString initialUrl;
     GinebraBrowser *urlHandler;
 };
 
+// Define the Meyer's singleton for BrowserMainApplicationS60
+typedef Singleton<BrowserMainApplicationS60, CreateGamma> CBrowserMainAppSingleton;
+
 #endif /* BROWSERMAINS60_H_ */