phonesettings/cpphonesettingsplugins/barringplugin/src/cpbarringplugingroup.cpp
changeset 72 c76a0b1755b9
parent 56 5bcb308bd24d
child 74 d1c62c765e48
--- a/phonesettings/cpphonesettingsplugins/barringplugin/src/cpbarringplugingroup.cpp	Thu Sep 02 20:26:16 2010 +0300
+++ b/phonesettings/cpphonesettingsplugins/barringplugin/src/cpbarringplugingroup.cpp	Fri Sep 17 08:29:19 2010 +0300
@@ -46,6 +46,7 @@
     m_editBarringPasswordItem(0),
     m_barringStatusRequestOngoing(false),
     m_activeNoteId(0),
+    m_activeProgressNoteId(0),
     m_phoneNotes(0),
     m_barringPasswordValidator(0),
     m_delayedBarringActivationNote(false),
@@ -131,7 +132,6 @@
     DPRINT << ": OUT";
 }
 
-
 /*!
   CpBarringPluginGroup::setupConnectionsToWrapper.
  */
@@ -296,6 +296,8 @@
         // query again for uncompleted items when user expands/opens barring 
         // settings group again.
         m_phoneNotes->cancelNote(m_activeNoteId);
+        m_phoneNotes->cancelNote(m_activeProgressNoteId);
+        m_activeProgressNoteId = 0;
         m_phoneNotes->showGlobalErrorNote(m_activeNoteId, result);
         m_barringRequestQueue.clear();
         return;
@@ -324,6 +326,8 @@
     }
     if (m_barringRequestQueue.isEmpty()) {
         m_phoneNotes->cancelNote(m_activeNoteId);
+        m_phoneNotes->cancelNote(m_activeProgressNoteId);
+        m_activeProgressNoteId = 0;
         if (m_delayedBarringActivationNote) {
             m_delayedBarringActivationNote = false;
             m_phoneNotes->showNotificationDialog(hbTrId("txt_phone_info_barring_activated"));
@@ -452,10 +456,10 @@
         
         m_barringStatusRequestOngoing = true;
         
-        if (!m_phoneNotes->noteShowing()) {
+        if (!m_activeProgressNoteId && !m_phoneNotes->noteShowing()) {
             // Launch progress note only once for status update.
             m_phoneNotes->showGlobalProgressNote(
-                m_activeNoteId, hbTrId("txt_common_info_requesting"));
+                m_activeProgressNoteId, hbTrId("txt_common_info_requesting"));
         }
     }