alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

prevent getting called twice (fixes crash on removing panels)

Browse Source 
svn path=/trunk/KDE/kdelibs/; revision=964500
This commit is contained in:
Aaron J. Seigo 2009-05-06 19:08:29 +00:00
parent 53476746bc
commit 5f7fb0c500
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
containment.cpp
View File

@ -567,12 +567,9 @@ void ContainmentPrivate::appletActions(KMenu &desktopMenu, Applet *applet, bool
} }
QAction *closeApplet = applet->d->actions->action("remove"); QAction *closeApplet = applet->d->actions->action("remove");
if (!closeApplet) { //unlikely but not impossible if (closeApplet) {
closeApplet = new QAction(i18nc("%1 is the name of the applet", "Remove this %1", applet->name()), &desktopMenu); desktopMenu.addAction(closeApplet);
closeApplet->setIcon(KIcon("edit-delete"));
QObject::connect(closeApplet, SIGNAL(triggered(bool)), applet, SLOT(destroy()));
} }
desktopMenu.addAction(closeApplet);
} }
KMenu *containmentMenu = new KMenu(i18nc("%1 is the name of the containment", "%1 Options", q->name()), &desktopMenu); KMenu *containmentMenu = new KMenu(i18nc("%1 is the name of the containment", "%1 Options", q->name()), &desktopMenu);
@ -1611,7 +1608,7 @@ void ContainmentPrivate::requestConfiguration()
void Containment::destroy(bool confirm) void Containment::destroy(bool confirm)
{ {
if (immutability() != Mutable) { if (immutability() != Mutable || Applet::d->transient) {
return; return;
} }