--- a/src/hbwidgets/widgets/hbcombobox_p.h	Tue Jul 06 14:36:53 2010 +0300
+++ b/src/hbwidgets/widgets/hbcombobox_p.h	Wed Aug 18 10:05:37 2010 +0300
@@ -89,6 +89,7 @@
     void showPopup( QAbstractItemModel* aModel, QModelIndex aIndex = QModelIndex( ) );
     void createDropDown( );
     void calculateListItemHeight( );
+    void resetGeometryChangeFlag( );
 
 public:
     HbCustomLineEdit* mLineEdit;
@@ -112,6 +113,7 @@
     qreal mListItemHeight;
     int mDropDownRowsInPortrait;
     int mDropDownRowsInLandscape;
+    QMap< QGraphicsWidget *, bool > widgetGeometryChange;
 };
 
 class HbComboListViewItem : public HbListViewItem
@@ -138,11 +140,6 @@
     }
 
     ~HbCustomLineEdit() {
-        HbEditorInterface editorInterface( this );
-        HbVkbHost *host = editorInterface.vkbHost( );
-        if( host ) {
-            host->disconnect();
-        }
     }
 
     void setLongPressEnabled( bool enable = true ) {
@@ -157,7 +154,7 @@
     void focusInEvent( QFocusEvent *event ) {
         HbEditorInterface editorInterface( this );
         HbVkbHost *host = editorInterface.vkbHost( );
-        if ( host && !VkbLaunched ) {
+        if ( host && comboBoxPrivate->mDropDown && !VkbLaunched ) {
             VkbLaunched = true;
             connect( host, SIGNAL( keypadClosed (  ) ), comboBoxPrivate->mDropDown,
                 SLOT( keypadClosed(  ) ) );