[Korganizer-devel] [Bug 130280] konqueror crashed when previewing a kwrite edited calendar file.

[Bram Schoenmakers]

------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
         
http://bugs.kde.org/show_bug.cgi?id=130280         
bramschoenmakers kde nl changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From bramschoenmakers kde nl  2006-12-22 23:40 -------
SVN commit 615849 by bram:

Do not use a static KOrg::AboutData, it makes KOrganizer behave funky (read: prepare to crash) when you embed it inside Konqueror.

I close both bugs regarding embedding Korg inside Konq, I was not able to reproduce both of them (before this patch I was able to)

BUG:130280
BUG:130290



 M  +0 -8      aboutdata.cpp  
 M  +0 -5      aboutdata.h  
 M  +1 -2      korganizer_part.cpp  


--- branches/KDE/3.5/kdepim/korganizer/aboutdata.cpp #615848:615849
 @ -28,8 +28,6  @
 
 using namespace KOrg;
 
-AboutData *AboutData::mSelf = 0;
-
 AboutData::AboutData()
   : KAboutData( "korganizer", I18N_NOOP("KOrganizer"), korgVersion,
                 I18N_NOOP("A Personal Organizer for KDE"),
 @ -75,9 +73,3  @
   addCredit("Thomas Zander");
   addCredit("Fester Zigterman");
 }
-
-AboutData *AboutData::self()
-{
-  if ( !mSelf ) mSelf = new AboutData;
-  return mSelf;
-}
--- branches/KDE/3.5/kdepim/korganizer/aboutdata.h #615848:615849
 @ -33,11 +33,6  @
 {
   public:
     AboutData();
-    
-    static AboutData *self();
-    
-  private:
-    static AboutData *mSelf;
 };
 
 }
--- branches/KDE/3.5/kdepim/korganizer/korganizer_part.cpp #615848:615849
 @ -43,7 +43,6  @
 #include <kpopupmenu.h>
 #include <kinstance.h>
 #include <klocale.h>
-#include <kaboutdata.h>
 #include <kiconloader.h>
 #include <kaction.h>
 #include <kdebug.h>
 @ -140,7 +139,7  @
 
 KAboutData *KOrganizerPart::createAboutData()
 {
-  return KOrg::AboutData::self();
+  return new KOrg::AboutData;
 }
 
 void KOrganizerPart::startCompleted( KProcess *process )