--- a/src/hbcore/gui/hbtoolbarextension.cpp	Thu Sep 02 20:44:51 2010 +0300
+++ b/src/hbcore/gui/hbtoolbarextension.cpp	Fri Sep 17 08:32:10 2010 +0300
@@ -153,14 +153,12 @@
     mAlignment(Qt::AlignTop),
     mDefaultContentWidget(false),
     // default values, in case CSS parsing fails
-    mMargins(0),
     mRowsPortrait(4),
     mRowsLandscape(3),
     mColsPortrait(3),
     mColsLandscape(4),
     lazyInitDone(false),
     orientationConnectDone(false),
-    //
     mExtendedButton(0),
     mToolBar(0)
 {
@@ -231,7 +229,7 @@
     }
 
     mLayout = new QGraphicsGridLayout();
-    mLayout->setContentsMargins( mMargins, mMargins, mMargins, mMargins );
+    mLayout->setContentsMargins(0, 0, 0, 0);
     mLayout->setSpacing(0.0);  // if non zero spacing needed, add to css
     for ( int i(0), j(0), ie(mToolButtons.count()); i < ie; ++i ) {
         HbToolButton *button = mToolButtons.at(i);
@@ -376,9 +374,9 @@
         } else {
             HbToolBarExtensionPrivate::d_ptr(q)->setAlignment(Qt::AlignRight);
         }
+        q->close();
     }
     q->repolish();
-    doLayout();
 }
 
 void HbToolBarExtensionPrivate::_q_animateButtonClicked()
@@ -538,7 +536,7 @@
         d->actionAdded( static_cast<QActionEvent *>(event) );
         return true;
     } else if ( event->type() == QEvent::ActionRemoved ) {
-        d->actionRemoved( static_cast<QActionEvent *>(event) );    
+        d->actionRemoved( static_cast<QActionEvent *>(event) );
         return true;
     } else if (event->type() == QEvent::ActionChanged ) {
         d->actionChanged();
@@ -558,13 +556,11 @@
     if (isVisible()) {
         Q_D(HbToolBarExtension);
         d->doLazyInit();
-        const QLatin1String Margins("content-margins");
         const QLatin1String RowsPortrait("max-rows-portrait");
         const QLatin1String RowsLandscape("max-rows-landscape");
         const QLatin1String ColsPortrait("max-columns-portrait");
         const QLatin1String ColsLandscape("max-columns-landscape");
 
-        params.addParameter( Margins );
         params.addParameter( RowsPortrait );
         params.addParameter( RowsLandscape );
         params.addParameter( ColsPortrait );
@@ -572,12 +568,10 @@
         d->initialiseContent();
         if (d->mDefaultContentWidget) {
             HbDialog::polish(params);
-            if ( params.value( Margins ).isValid()
-                && params.value( RowsPortrait ).isValid()
+            if ( params.value( RowsPortrait ).isValid()
                 && params.value( RowsLandscape ).isValid()
                 && params.value( ColsPortrait ).isValid()
                 && params.value( ColsLandscape ).isValid() ) {
-                d->mMargins = params.value( Margins ).toReal();
                 d->mRowsPortrait  = params.value( RowsPortrait ).toInt();
                 d->mRowsLandscape = params.value( RowsLandscape ).toInt();
                 d->mColsPortrait  = params.value( ColsPortrait ).toInt();
@@ -598,8 +592,8 @@
         if (value.toBool()) {
             HbMainWindow* w(mainWindow());
             if(w && !d->orientationConnectDone) {
-                QObject::connect(w,SIGNAL(orientationChanged(Qt::Orientation)),
-                                 this, SLOT(_q_orientationChanged()));
+                QObject::disconnect( w , SIGNAL(aboutToChangeOrientation()), this, SLOT(_q_orientationChanged()));
+                QObject::connect( w , SIGNAL(aboutToChangeOrientation()), this, SLOT(_q_orientationChanged()));
                 d->orientationConnectDone = true;
             }
             d->placeToolBarExtension();