[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeaddons/konq-plugins/searchbar
From:       Maks Orlovich <maksim () kde ! org>
Date:       2004-07-01 16:20:48
Message-ID: 20040701162048.C157199A2 () office ! kde ! org
[Download RAW message or body]

CVS commit by orlovich: 

Try to fix http://lists.kde.org/?l=kfm-devel&m=108868991724862&w=2


  M +3 -3      searchbar.cpp   1.19
  M +2 -1      searchbar.h   1.10


--- kdeaddons/konq-plugins/searchbar/searchbar.cpp  #1.18:1.19
@@ -69,7 +69,7 @@ SearchBarPlugin::SearchBarPlugin(QObject
                                 this, SLOT(selectSearchEngine()), 0, 2);
 
-        KWidgetAction *searchComboAction = new KWidgetAction(m_searchCombo, \
i18n("Search Bar"), 0, +        m_searchComboAction = new \
                KWidgetAction(m_searchCombo, i18n("Search Bar"), 0,
                                                              0, 0, \
                actionCollection(), "toolbar_search_bar");
-        searchComboAction->setShortcutConfigurable(false);
+        m_searchComboAction->setShortcutConfigurable(false);
 
         connect(m_searchCombo, SIGNAL(activated(const QString &)),
@@ -250,5 +250,5 @@ void SearchBarPlugin::partChanged(KParts
 void SearchBarPlugin::updateComboVisibility()
 {
-        if (m_part.isNull())
+        if (m_part.isNull() || !m_searchComboAction->isPlugged())
                 m_searchCombo->hide();
         else

--- kdeaddons/konq-plugins/searchbar/searchbar.h  #1.9:1.10
@@ -138,4 +138,5 @@ class SearchBarPlugin : public KParts::P
                 QGuardedPtr<KHTMLPart> m_part;
                 SearchBarCombo *m_searchCombo;
+                KWidgetAction  *m_searchComboAction;
                 QPopupMenu     *m_popupMenu;
                 QPixmap         m_searchIcon;


[prev in list] [next in list] [prev in thread] [next in thread]