diff -ur scribus-0.8/scribus/mpalette.cpp scribus-0.8.02/scribus/mpalette.cpp --- scribus-0.8/scribus/mpalette.cpp Sat Sep 14 12:26:16 2002 +++ scribus-0.8.02/scribus/mpalette.cpp Sun Oct 27 08:15:56 2002 @@ -430,8 +430,8 @@ connect(FrameScale, SIGNAL(clicked()), this, SLOT(ChangeScaling())); connect(Aspect, SIGNAL(clicked()), this, SLOT(ChangeScaling())); connect(this, SIGNAL(placeChanged(QDockWindow::Place)), this, SLOT(Docken(QDockWindow::Place))); - setCloseMode(Always); - undock(); + pa->moveDockWindow(this, DockTornOff); + setCloseMode(Always); resize(sizeHint()); setResizeEnabled(true); Fram->raiseWidget(4); diff -ur scribus-0.8/scribus/scribus.cpp scribus-0.8.02/scribus/scribus.cpp --- scribus-0.8/scribus/scribus.cpp Tue Sep 24 22:09:45 2002 +++ scribus-0.8.02/scribus/scribus.cpp Sat Oct 26 16:37:53 2002 @@ -4686,7 +4686,7 @@ pda.Zeiger = 0; pda.Datei = ""; pda.Typ = 0; - if (DLLName(d[dc], &nam, &ty, pda.Zeiger)) + if (DLLName(d[dc], &nam, &ty, &pda.Zeiger)) { if (ty == 1) extraMenu->insertItem(tr(nam)); @@ -4698,7 +4698,7 @@ helpMenu->insertItem(tr(nam)); pda.Datei = d[dc]; pda.Typ = ty; - PluginMap[tr(nam)] = pda; + PluginMap.insert(tr(nam), pda); } } connect(extraMenu, SIGNAL(activated(int)), this, SLOT(RunPlug(int))); @@ -4742,7 +4742,7 @@ dlclose(mo); } -bool ScribusApp::DLLName(QString name, QString *PName, int *typ, void *Zeig) +bool ScribusApp::DLLName(QString name, QString *PName, int *typ, void **Zeig) { void *mo; char *error; @@ -4773,7 +4773,7 @@ return false; } *typ = (*demo1)(); - Zeig = mo; + *Zeig = mo; if (*typ != 4) dlclose(mo); else diff -ur scribus-0.8/scribus/scribus.h scribus-0.8.02/scribus/scribus.h --- scribus-0.8/scribus/scribus.h Tue Sep 24 22:09:58 2002 +++ scribus-0.8.02/scribus/scribus.h Sat Oct 26 16:34:00 2002 @@ -98,7 +98,7 @@ void UpdateRecent(QString fn); void InitPlugs(); void FinalizePlugs(); - bool DLLName(QString name, QString *PName, int *typ, void *Zeig); + bool DLLName(QString name, QString *PName, int *typ, void **Zeig); void CallDLL(QString name); PSLib* getPSDriver(bool psart, SCFonts &AllFonts, QMap DocFonts, CListe DocColors, bool pdf); void closePSDriver();