--- a/qtmobility/examples/bearermonitor/bearermonitor.cpp	Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/examples/bearermonitor/bearermonitor.cpp	Mon May 03 13:18:40 2010 +0300
@@ -43,7 +43,7 @@
 #include "sessionwidget.h"
 
 #include <QDebug>
-
+#include <QMessageBox>
 #ifdef Q_OS_WIN
 #include <winsock2.h>
 #undef interface
@@ -57,15 +57,20 @@
 :   QWidget(parent)
 {
     setupUi(this);
+#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
+    newSessionButton->hide();
+    deleteSessionButton->hide();
+#else
     delete tabWidget->currentWidget();
     sessionGroup->hide();
-#if defined (Q_OS_SYMBIAN) || defined(Q_OS_WINCE)	
+#endif
+#if defined (Q_OS_SYMBIAN) || defined(Q_OS_WINCE) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
     setWindowState(Qt::WindowMaximized);
 #endif
     updateConfigurations();
-
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     onlineStateChanged(!manager.allConfigurations(QNetworkConfiguration::Active).isEmpty());
-
+#endif
     QNetworkConfiguration defaultConfiguration = manager.defaultConfiguration();
     for (int i = 0; i < treeWidget->topLevelItemCount(); ++i) {
         QTreeWidgetItem *item = treeWidget->topLevelItem(i);
@@ -101,9 +106,10 @@
 
     connect(newSessionButton, SIGNAL(clicked()),
             this, SLOT(createNewSession()));
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     connect(deleteSessionButton, SIGNAL(clicked()),
             this, SLOT(deleteSession()));
-
+#endif
     connect(scanButton, SIGNAL(clicked()),
             this, SLOT(performScan()));
 }
@@ -234,9 +240,15 @@
 void BearerMonitor::onlineStateChanged(bool isOnline)
 {
     if (isOnline)
+#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
+        QMessageBox::information(this, "Connection state changed", "Online", QMessageBox::Close);
+    else
+        QMessageBox::information(this, "Connection state changed", "Offline", QMessageBox::Close);
+#else
         onlineState->setText(tr("Online"));
     else
         onlineState->setText(tr("Offline"));
+#endif
 }
 
 #ifdef Q_OS_WIN
@@ -362,7 +374,9 @@
 
     tabWidget->addTab(session, conf.name());
 
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     sessionGroup->show();
+#endif
 
     sessionWidgets.append(session);
 }
@@ -374,6 +388,7 @@
     createSessionFor(item);
 }
 
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
 void BearerMonitor::deleteSession()
 {
     SessionWidget *session = qobject_cast<SessionWidget *>(tabWidget->currentWidget());
@@ -386,6 +401,7 @@
             sessionGroup->hide();
     }
 }
+#endif
 
 void BearerMonitor::performScan()
 {