SOURCES: kde4-kdepim-akonadi.patch (NEW) - fix build with new akonadi

[shadzik]

Author: shadzik                      Date: Fri May  9 19:11:57 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fix build with new akonadi

---- Files affected:
SOURCES:
   kde4-kdepim-akonadi.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/kde4-kdepim-akonadi.patch
diff -u /dev/null SOURCES/kde4-kdepim-akonadi.patch:1.1
--- /dev/null	Fri May  9 21:11:57 2008
+++ SOURCES/kde4-kdepim-akonadi.patch	Fri May  9 21:11:52 2008
@@ -0,0 +1,82 @@
+diff -Nru akonadi/clients/akonadiconsole/CMakeLists.txt akonadi-new/clients/akonadiconsole/CMakeLists.txt
+--- akonadi/clients/akonadiconsole/CMakeLists.txt	2008-05-07 11:06:01.000000000 +0200
++++ akonadi-new/clients/akonadiconsole/CMakeLists.txt	2008-05-09 20:24:20.000000000 +0200
+@@ -15,7 +15,7 @@
+ )
+ 
+ qt4_add_dbus_interfaces( akonadiconsole_bin_SRCS
+-  ${AKONADI_DBUS_INTERFACES_DIR}/org.freedesktop.Akonadi.TracerNotification.xml
++  ${AKONADI_DBUS_INTERFACES_DIR}/org.kde.Akonadi.TracerNotification.xml
+ )
+ 
+ kde4_add_ui_files(akonadiconsole_bin_SRCS
+diff -Nru akonadi/clients/akonadiconsole/connectionpage.cpp akonadi-new/clients/akonadiconsole/connectionpage.cpp
+--- akonadi/clients/akonadiconsole/connectionpage.cpp	2008-05-07 11:06:01.000000000 +0200
++++ akonadi-new/clients/akonadiconsole/connectionpage.cpp	2008-05-09 20:23:46.000000000 +0200
+@@ -36,7 +36,7 @@
+ 
+   layout->addWidget( mDataView );
+ 
+-  org::freedesktop::Akonadi::TracerNotification *iface = new org::freedesktop::Akonadi::TracerNotification( QString(), "/tracing/notifications", QDBusConnection::sessionBus(), this );
++  org::kde::Akonadi::TracerNotification *iface = new org::kde::Akonadi::TracerNotification( QString(), "/tracing/notifications", QDBusConnection::sessionBus(), this );
+ 
+   connect( iface, SIGNAL( connectionDataInput( const QString&, const QString& ) ),
+            this, SLOT( connectionDataInput( const QString&, const QString& ) ) );
+diff -Nru akonadi/clients/akonadiconsole/debugwidget.cpp akonadi-new/clients/akonadiconsole/debugwidget.cpp
+--- akonadi/clients/akonadiconsole/debugwidget.cpp	2008-05-07 11:06:01.000000000 +0200
++++ akonadi-new/clients/akonadiconsole/debugwidget.cpp	2008-05-09 20:23:20.000000000 +0200
+@@ -47,7 +47,7 @@
+   page->showAllConnections( true );
+   mConnectionPages->addTab( page, "All" );
+ 
+-  org::freedesktop::Akonadi::TracerNotification *iface = new org::freedesktop::Akonadi::TracerNotification( QString(), "/tracing/notifications", QDBusConnection::sessionBus(), this );
++  org::kde::Akonadi::TracerNotification *iface = new org::kde::Akonadi::TracerNotification( QString(), "/tracing/notifications", QDBusConnection::sessionBus(), this );
+ 
+   connect( iface, SIGNAL( connectionStarted( const QString&, const QString& ) ),
+            this, SLOT( connectionStarted( const QString&, const QString& ) ) );
+diff -Nru akonadi/tray/dock.cpp akonadi-new/tray/dock.cpp
+--- akonadi/tray/dock.cpp	2008-05-07 11:06:00.000000000 +0200
++++ akonadi-new/tray/dock.cpp	2008-05-09 20:27:31.000000000 +0200
+@@ -99,7 +99,7 @@
+ 
+ void Dock::slotServiceChanged( const QString& service, const QString& oldOwner, const QString& newOwner )
+ {
+-    if ( service != "org.freedesktop.Akonadi.Control" )
++    if ( service != "org.kde.Akonadi.Control" )
+         return;
+ 
+     if ( oldOwner.isEmpty() ) {
+@@ -115,7 +115,7 @@
+ 
+ void Dock::slotStopAkonadi()
+ {
+-    QDBusInterface dbus( "org.freedesktop.Akonadi.Control", "/ControlManager", "org.freedesktop.Akonadi.ControlManager" );
++    QDBusInterface dbus( "org.kde.Akonadi.Control", "/ControlManager", "org.kde.Akonadi.ControlManager" );
+     dbus.call( "shutdown" );
+ }
+ 
+@@ -126,13 +126,13 @@
+ 
+ void Dock::slotActivated()
+ {
+-    bool registered = QDBusConnection::sessionBus().interface()->isServiceRegistered( "org.freedesktop.Akonadi.Control" );
++    bool registered = QDBusConnection::sessionBus().interface()->isServiceRegistered( "org.kde.Akonadi.Control" );
+     updateMenu( registered );
+ }
+ 
+ void Dock::slotStartBackup()
+ {
+-    bool registered = QDBusConnection::sessionBus().interface()->isServiceRegistered( "org.freedesktop.Akonadi.Control" );
++    bool registered = QDBusConnection::sessionBus().interface()->isServiceRegistered( "org.kde.Akonadi.Control" );
+     Q_ASSERT( registered );
+ 
+     QPointer<BackupAssistant> backup = new BackupAssistant( parentWidget() );
+@@ -142,7 +142,7 @@
+ 
+ void Dock::slotStartRestore()
+ {
+-    bool registered = QDBusConnection::sessionBus().interface()->isServiceRegistered( "org.freedesktop.Akonadi.Control" );
++    bool registered = QDBusConnection::sessionBus().interface()->isServiceRegistered( "org.kde.Akonadi.Control" );
+     Q_ASSERT( registered );
+ 
+     QPointer<RestoreAssistant> restore = new RestoreAssistant( parentWidget() );
================================================================