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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/applets
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2008-04-25 17:25:03
Message-ID: 1209144303.340304.24774.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 801104 by aseigo:

launchActivated sanity


 M  +1 -3      icon/icon.cpp  
 M  +1 -4      kickoff/applet/applet.cpp  
 M  +2 -6      trash/trash.cpp  


--- trunk/KDE/kdebase/workspace/plasma/applets/icon/icon.cpp #801103:801104
@@ -121,9 +121,7 @@
 void IconApplet::openUrl()
 {
     if (m_url.isValid()) {
-        if (containment()) {
-            containment()->emitLaunchActivated();
-        }
+        emit launchActivated();
         KRun::runUrl(m_url, m_mimetype->name(), 0);
     }
 }
--- trunk/KDE/kdebase/workspace/plasma/applets/kickoff/applet/applet.cpp \
#801103:801104 @@ -211,10 +211,7 @@
         }
 
         d->launcher->setLauncherOrigin( iconPosition, loc );
-
-        if (containment()) {
-            containment()->emitLaunchActivated();
-        }
+        emit launchActivated();
     }
 
     d->launcher->setVisible(!d->launcher->isVisible());
--- trunk/KDE/kdebase/workspace/plasma/applets/trash/trash.cpp #801103:801104
@@ -171,17 +171,13 @@
 
 void Trash::slotOpen()
 {
-    if (containment()) {
-        containment()->emitLaunchActivated();
-    }
+    emit launchActivated();
     KRun::runUrl(m_trashUrl, "inode/directory", 0);
 }
 
 void Trash::slotEmpty()
 {
-    if (containment()) {
-        containment()->emitLaunchActivated();
-    }
+    emit launchActivated();
     const QString text(i18nc("@info", "Do you really want to empty the trash? All \
items will be deleted."));  const bool del = \
KMessageBox::warningContinueCancel(&m_menu,  text,


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