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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/generic/applets/systemtray
From:       Marco Martin <notmart () gmail ! com>
Date:       2009-11-01 15:53:27
Message-ID: 1257090807.868034.16332.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1043457 by mart:

renamle the last signal/slots that were forgotten


 M  +4 -4      protocols/dbussystemtray/dbussystemtrayprotocol.cpp  
 M  +2 -2      statusnotifierwatcher/statusnotifierwatcher.cpp  
 M  +2 -2      statusnotifierwatcher/statusnotifierwatcher.h  


--- trunk/KDE/kdebase/workspace/plasma/generic/applets/systemtray/protocols/dbussystemtray/dbussystemtrayprotocol.cpp \
#1043456:1043457 @@ -141,8 +141,8 @@
                                                                           \
QDBusConnection::sessionBus());  if (m_statusNotifierWatcher->isValid() &&
             m_statusNotifierWatcher->property("ProtocolVersion").toBool() == \
                s_protocolVersion) {
-            connect(m_statusNotifierWatcher, SIGNAL(ServiceRegistered(const \
                QString&)), this, SLOT(serviceRegistered(const QString &)));
-            connect(m_statusNotifierWatcher, SIGNAL(ServiceUnregistered(const \
QString&)), this, SLOT(serviceUnregistered(const QString&))); +            \
connect(m_statusNotifierWatcher, SIGNAL(StatusNotifierItemRegistered(const \
QString&)), this, SLOT(serviceRegistered(const QString &))); +            \
connect(m_statusNotifierWatcher, SIGNAL(StatusNotifierItemUnregistered(const \
QString&)), this, SLOT(serviceUnregistered(const QString&)));  
             m_statusNotifierWatcher->call(QDBus::NoBlock, \
"RegisterStatusNotifierHost", m_serviceName);  
@@ -163,8 +163,8 @@
     if (service == "org.kde.StatusNotifierWatcher") {
         kDebug()<<"org.kde.StatusNotifierWatcher disappeared";
 
-        disconnect(m_statusNotifierWatcher, SIGNAL(ServiceRegistered(const \
                QString&)), this, SLOT(serviceRegistered(const QString &)));
-        disconnect(m_statusNotifierWatcher, SIGNAL(ServiceUnregistered(const \
QString&)), this, SLOT(serviceUnregistered(const QString&))); +        \
disconnect(m_statusNotifierWatcher, SIGNAL(StatusNotifierItemRegistered(const \
QString&)), this, SLOT(serviceRegistered(const QString &))); +        \
disconnect(m_statusNotifierWatcher, SIGNAL(StatusNotifierItemUnregistered(const \
QString&)), this, SLOT(serviceUnregistered(const QString&)));  
         foreach (DBusSystemTrayTask *task, m_tasks) {
             if (task) {
--- trunk/KDE/kdebase/workspace/plasma/generic/applets/systemtray/statusnotifierwatcher/statusnotifierwatcher.cpp \
#1043456:1043457 @@ -73,7 +73,7 @@
                                         QDBusConnection::sessionBus());
         if (trayclient.isValid()) {
             m_registeredServices.append(service);
-            emit ServiceRegistered(service);
+            emit StatusNotifierItemRegistered(service);
         }
     }
 }
@@ -94,7 +94,7 @@
     if (newOwner.isEmpty()) {
         if (m_registeredServices.contains(name)) {
             m_registeredServices.removeAll(name);
-            emit ServiceUnregistered(name);
+            emit StatusNotifierItemUnregistered(name);
         }
 
         if (m_statusNotifierHostServices.contains(name)) {
--- trunk/KDE/kdebase/workspace/plasma/generic/applets/systemtray/statusnotifierwatcher/statusnotifierwatcher.h \
#1043456:1043457 @@ -56,9 +56,9 @@
                        const QString& newOwner);
 
 Q_SIGNALS:
-    void ServiceRegistered(const QString &service);
+    void StatusNotifierItemRegistered(const QString &service);
     //TODO: decide if this makes sense, the systray itself could notice the \
                vanishing of items, but looks complete putting it here
-    void ServiceUnregistered(const QString &service);
+    void StatusNotifierItemUnregistered(const QString &service);
     void StatusNotifierHostRegistered();
 
 private:


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