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

List:       kde-commits
Subject:    KDE_3_2_BRANCH: kdebase/kicker/extensions/childpanel
From:       John Firebaugh <jfirebaugh () kde ! org>
Date:       2004-03-31 2:08:03
Message-ID: 20040331020803.016A699D8 () office ! kde ! org
[Download RAW message or body]

CVS commit by firebaugh: 

Backport fix for bug #68511.


  M +3 -4      childpanelextension.cpp   1.41.2.1
  M +1 -0      childpanelextension.h   1.17.2.1


--- kdebase/kicker/extensions/childpanel/childpanelextension.cpp  #1.41:1.41.2.1
@@ -61,4 +61,5 @@ ChildPanelExtension::ChildPanelExtension
     , _opMnu( 0 )
     , _configFile(configFile)
+    , _built( false )
 {
     QVBoxLayout* layout = new QVBoxLayout( this );
@@ -264,10 +265,8 @@ void ChildPanelExtension::addAppletConta
 void ChildPanelExtension::slotBuildOpMenu()
 {
-    static bool built = false;
-
-    if (built || !_opMnu)
+    if (_built || !_opMnu)
         return;
 
-    built = true;
+    _built = true;
     // setup addmenu and removemenu
     AddContainerMenu* addMnu = new AddContainerMenu(_containerArea, true, this);

--- kdebase/kicker/extensions/childpanel/childpanelextension.h  #1.17:1.17.2.1
@@ -84,4 +84,5 @@ private:
     QPopupMenu       *_sizeMnu;
     QString          _configFile;
+    bool             _built;
 };
 


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