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

List:       kde-commits
Subject:    KDE/kdepim/akonadi/tray
From:       Frode M. Døving <frode () lnix ! net>
Date:       2008-04-12 14:16:08
Message-ID: 1208009768.529174.17103.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 796091 by fdoving:

Rename some dbus things.


 M  +3 -2      CMakeLists.txt  
 M  +2 -2      dock.cpp  
 M  +1 -1      dock.h  
 M  +1 -1      org.kde.Akonadi.Tray.xml  
 A             org.kde.akonaditray.xml  


--- trunk/KDE/kdepim/akonadi/tray/CMakeLists.txt #796090:796091
@@ -3,8 +3,9 @@
 
 SET(tray_sources main.cpp dock.cpp backup.cpp backupassistant.cpp restore.cpp \
restoreassistant.cpp)  
-qt4_generate_dbus_interface( ${CMAKE_CURRENT_SOURCE_DIR}/dock.h \
                org.kde.Akonadi.Tray.xml )
-qt4_add_dbus_adaptor( tray_sources org.kde.Akonadi.Tray.xml dock.h Dock )
+qt4_generate_dbus_interface( ${CMAKE_CURRENT_SOURCE_DIR}/dock.h
+org.kde.akonaditray.xml )
+qt4_add_dbus_adaptor( tray_sources org.kde.akonaditray.xml dock.h Dock )
 
 KDE4_ADD_EXECUTABLE(akonaditray ${tray_sources})
 TARGET_LINK_LIBRARIES(akonaditray ${KDE4_KDEUI_LIBRARY} ${KDE4_KNOTIFYCONFIG_LIBS} \
                akonadiprotocolinternals ${KDE4_AKONADI_LIBS})
--- trunk/KDE/kdepim/akonadi/tray/dock.cpp #796090:796091
@@ -19,7 +19,7 @@
 #include "dock.h"
 #include "backupassistant.h"
 #include "restoreassistant.h"
-#include "trayadaptor.h"
+#include "akonaditrayadaptor.h"
 
 #include <QDBusInterface>
 #include <QDBusConnectionInterface>
@@ -63,7 +63,7 @@
     KMenu *menu = new KMenu();
     m_title = menu->addTitle( i18n( "Akonadi" ) );
 
-    new TrayAdaptor( this );
+    new AkonaditrayAdaptor( this );
     QDBusConnection dbus = QDBusConnection::sessionBus();
     dbus.registerObject( "/Actions", this );
 
--- trunk/KDE/kdepim/akonadi/tray/dock.h #796090:796091
@@ -41,7 +41,7 @@
 class Dock : public KSystemTrayIcon
 {
     Q_OBJECT
-    Q_CLASSINFO( "D-Bus Interface", "org.kde.Akonadi.Tray" )
+    Q_CLASSINFO( "D-Bus Interface", "org.kde.akonaditray" )
 
 public:
     /**
--- trunk/KDE/kdepim/akonadi/tray/org.kde.Akonadi.Tray.xml #796090:796091
@@ -1,6 +1,6 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" \
"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">  <node>
-  <interface name="org.kde.Akonadi.Tray">
+  <interface name="org.kde.akonaditray">
     <method name="infoMessage">
       <arg type="s" direction="in"/>
       <arg type="s" direction="in"/>


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