Prevent that the popup of the URL navigator is opened if the button has already been...

svn path=/trunk/KDE/kdebase/apps/; revision=634549

diff --git a/src/urlnavigator.cpp b/src/urlnavigator.cpp
index 70cae4708d517568e106306b8d71b5a6b38e072c..d700be2a09fd9fbf9395ca6d85e61439b99ec509 100644 (file)
--- a/src/urlnavigator.cpp
+++ b/src/urlnavigator.cpp
@@ -272,7 +272,6 @@ void UrlNavigator::setUrl(const KUrl& url)
 
 void UrlNavigator::requestActivation()
 {
 
 void UrlNavigator::requestActivation()
 {

-    kDebug() << "--------------------------- request activation" << endl;

     setActive(true);
 }
 
     setActive(true);
 }
 

diff --git a/src/urlnavigatorbutton.cpp b/src/urlnavigatorbutton.cpp
index fd8b7c225975188d9e8998ad6e5ac399ea7d40b4..3be037ced8d6b5d876e75aa78803e47f6e32bad4 100644 (file)
--- a/src/urlnavigatorbutton.cpp
+++ b/src/urlnavigatorbutton.cpp
@@ -45,6 +45,7 @@ UrlNavigatorButton::UrlNavigatorButton(int index, UrlNavigator* parent) :
     connect(this, SIGNAL(clicked()), this, SLOT(updateNavigatorUrl()));
 
     m_popupDelay = new QTimer(this);
     connect(this, SIGNAL(clicked()), this, SLOT(updateNavigatorUrl()));
 
     m_popupDelay = new QTimer(this);

+    m_popupDelay->setSingleShot(true);

     connect(m_popupDelay, SIGNAL(timeout()), this, SLOT(startListJob()));
     connect(this, SIGNAL(pressed()), this, SLOT(startPopupDelay()));
 }
     connect(m_popupDelay, SIGNAL(timeout()), this, SLOT(startListJob()));
     connect(this, SIGNAL(pressed()), this, SLOT(startPopupDelay()));
 }


@@ -235,6 +236,8 @@ void UrlNavigatorButton::dragLeaveEvent(QDragLeaveEvent* event)
 
 void UrlNavigatorButton::updateNavigatorUrl()
 {
 
 void UrlNavigatorButton::updateNavigatorUrl()
 {

+    stopPopupDelay();
+

     if (m_index < 0) {
         return;
     }
     if (m_index < 0) {
         return;
     }


@@ -244,18 +247,17 @@ void UrlNavigatorButton::updateNavigatorUrl()
 
 void UrlNavigatorButton::startPopupDelay()
 {
 
 void UrlNavigatorButton::startPopupDelay()
 {

-    if (m_popupDelay->isActive() || m_listJob || m_index < 0) {
+    if (m_popupDelay->isActive() || (m_listJob != 0) || (m_index < 0)) {

         return;
     }
 
         return;
     }
 

-    m_popupDelay->setSingleShot(true);

     m_popupDelay->start(300);
 }
 
 void UrlNavigatorButton::stopPopupDelay()
 {
     m_popupDelay->stop();
     m_popupDelay->start(300);
 }
 
 void UrlNavigatorButton::stopPopupDelay()
 {
     m_popupDelay->stop();

-    if (m_listJob) {
+    if (m_listJob != 0) {

         m_listJob->kill();
         m_listJob = 0;
     }
         m_listJob->kill();
         m_listJob = 0;
     }


@@ -263,7 +265,7 @@ void UrlNavigatorButton::stopPopupDelay()
 
 void UrlNavigatorButton::startListJob()
 {
 
 void UrlNavigatorButton::startListJob()
 {

-    if (m_listJob) {
+    if (m_listJob != 0) {

         return;
     }
 
         return;
     }