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

List:       kde-commits
Subject:    branches/KDE/4.4/kdelibs/plasma
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2010-03-09 5:13:50
Message-ID: 1268111630.649679.4961.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1100977 by aseigo:

guard against multiple connections due to errant StartupCompleted constraints


 M  +5 -5      applet.cpp  


--- branches/KDE/4.4/kdelibs/plasma/applet.cpp #1100976:1100977
@@ -1158,15 +1158,15 @@
         if (closeApplet) {
             closeApplet->setEnabled(unlocked);
             closeApplet->setVisible(unlocked);
-            connect(closeApplet, SIGNAL(triggered(bool)), this, \
SLOT(selectItemToDestroy())); +            connect(closeApplet, \
SIGNAL(triggered(bool)), this, SLOT(selectItemToDestroy()), Qt::UniqueConnection);  }
 
         QAction *configAction = d->actions->action("configure");
         if (configAction) {
             if (d->isContainment) {
-                connect(configAction, SIGNAL(triggered()), this, \
SLOT(requestConfiguration())); +                connect(configAction, \
SIGNAL(triggered(bool)), this, SLOT(requestConfiguration()), Qt::UniqueConnection);  \
                } else {
-                connect(configAction, SIGNAL(triggered(bool)), this, \
SLOT(showConfigurationInterface())); +                connect(configAction, \
SIGNAL(triggered(bool)), this, SLOT(showConfigurationInterface()), \
Qt::UniqueConnection);  }
 
             bool canConfig = unlocked || \
KAuthorized::authorize("plasma/allow_configure_when_locked"); @@ -1176,13 +1176,13 @@
 
         QAction *runAssociatedApplication = d->actions->action("run associated \
application");  if (runAssociatedApplication) {
-            connect(runAssociatedApplication, SIGNAL(triggered(bool)), this, \
SLOT(runAssociatedApplication())); +            connect(runAssociatedApplication, \
SIGNAL(triggered(bool)), this, SLOT(runAssociatedApplication()), \
Qt::UniqueConnection);  }
 
         d->updateShortcuts();
         Corona * corona = qobject_cast<Corona*>(scene());
         if (corona) {
-            connect(corona, SIGNAL(shortcutsChanged()), this, \
SLOT(updateShortcuts())); +            connect(corona, SIGNAL(shortcutsChanged()), \
this, SLOT(updateShortcuts()), Qt::UniqueConnection);  }
     }
 


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