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

List:       kde-commits
Subject:    playground/base/plasma/applets/leavenote/LeaveNoteHelperDaemon
From:       Christian Weilbach <christian () whiletaker ! homeip ! net>
Date:       2008-08-09 12:49:08
Message-ID: 1218286148.248795.6169.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 844350 by weilbach:

Continue moving to LeaveNoteHelper daemon.


 M  +12 -10    CMakeLists.txt  
 AM            LeaveNoteHelperDaemon.cpp   SimpleMessageDaemon.cpp#844343 [License: \
LGPL (v2)]  AM            LeaveNoteHelperDaemon.h   SimpleMessageDaemon.h#844343 \
[License: LGPL (v2)]  D             SimpleMessageDaemon.cpp  
 D             SimpleMessageDaemon.h  
 M  +2 -2      dbus/DaemonDBusHandler.cpp  
 M  +1 -1      dbus/DaemonDBusHandler.h  
 M  +3 -3      dbus/RootDBusHandler.cpp  
 M  +1 -1      dbus/RootDBusHandler.h  
 D             dbus/org.freedesktop.SimpleMessageDaemon.daemon.xml  
 D             dbus/org.freedesktop.SimpleMessageDaemon.root.xml  
 AM            dbus/org.kde.LeaveNoteHelperDaemon.daemon.xml   \
dbus/org.freedesktop.SimpleMessageDaemon.daemon.xml#844343  AM            \
dbus/org.kde.LeaveNoteHelperDaemon.root.xml   \
dbus/org.freedesktop.SimpleMessageDaemon.root.xml#844343  M  +5 -5      main.cpp  


--- trunk/playground/base/plasma/applets/leavenote/LeaveNoteHelperDaemon/CMakeLists.txt \
#844349:844350 @@ -1,17 +1,19 @@
-set(simplemessagedaemon_SRCS 
+set(leavenotehelperdaemon_SRCS 
     main.cpp
-    SimpleMessageDaemon.cpp
+    LeaveNoteHelperDaemon.cpp
     dbus/RootDBusHandler.cpp
     dbus/DaemonDBusHandler.cpp
 )
 
-qt4_add_dbus_adaptor(simplemessagedaemon_SRCS \
dbus/org.freedesktop.SimpleMessageDaemon.root.xml dbus/RootDBusHandler.h \
                SimpleMessageDaemon::RootDBusHandler RootAdaptor RootAdaptor)
-qt4_add_dbus_adaptor(simplemessagedaemon_SRCS \
dbus/org.freedesktop.SimpleMessageDaemon.daemon.xml dbus/DaemonDBusHandler.h \
SimpleMessageDaemon::DaemonDBusHandler DaemonAdaptor DaemonAdaptor) \
+qt4_add_dbus_adaptor(leavenotehelperdaemon_SRCS \
dbus/org.kde.LeaveNoteHelperDaemon.root.xml dbus/RootDBusHandler.h \
LeaveNoteHelperDaemon::RootDBusHandler RootAdaptor RootAdaptor) \
+qt4_add_dbus_adaptor(leavenotehelperdaemon_SRCS \
dbus/org.kde.LeaveNoteDaemon.daemon.xml dbus/DaemonDBusHandler.h \
LeaveNoteHelperDaemon::DaemonDBusHandler DaemonAdaptor DaemonAdaptor)  
-kde4_add_executable(simplemessagedaemon ${simplemessagedaemon_SRCS})
-target_link_libraries(simplemessagedaemon ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} )
-install(FILES simplemessagedaemon.notifyrc 
+kde4_add_executable(leavenotehelperdaemon ${leavenotehelperdaemon_SRCS})
+target_link_libraries(leavenotehelperdaemon ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} \
) +install(FILES leavenotehelperdaemon.notifyrc 
         DESTINATION ${DATA_INSTALL_DIR}/simplemessagedaemon)
-install(TARGETS simplemessagedaemon ${INSTALL_TARGETS_DEFAULT_ARGS})
-install(FILES dbus/org.freedesktop.SimpleMessageDaemon.root.xml
-              DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
\ No newline at end of file
+install(TARGETS leavenotehelperdaemon ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(FILES dbus/org.kde.LeaveNoteHelper.root.xml
+              DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
+install(FILES dbus/org.kde.LeaveNoteHelper.daemon.xml
+              DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
** trunk/playground/base/plasma/applets/leavenote/LeaveNoteHelperDaemon/LeaveNoteHelperDaemon.cpp \
#property svn:mergeinfo  + 
** trunk/playground/base/plasma/applets/leavenote/LeaveNoteHelperDaemon/LeaveNoteHelperDaemon.h \
#property svn:mergeinfo  + 
--- trunk/playground/base/plasma/applets/leavenote/LeaveNoteHelperDaemon/dbus/DaemonDBusHandler.cpp \
#844349:844350 @@ -30,7 +30,7 @@
 #include <KTextEdit>
 #include <KNotification>
 
-namespace SimpleMessageDaemon
+namespace LeaveNoteHelperDaemon
 {
 
     DaemonDBusHandler *DaemonDBusHandler::s_instance = 0;
@@ -134,6 +134,6 @@
         };
     }
 
-} // namespace SimpleMessageDaemon
+} // namespace LeaveNoteHelperDaemon
 
 #include "DaemonDBusHandler.moc"
--- trunk/playground/base/plasma/applets/leavenote/LeaveNoteHelperDaemon/dbus/DaemonDBusHandler.h \
#844349:844350 @@ -25,7 +25,7 @@
 
 #include <KNotification>
 
-namespace SimpleMessageDaemon
+namespace LeaveNoteHelperDaemon
 {
     class DaemonDBusHandler : public QObject
     {
--- trunk/playground/base/plasma/applets/leavenote/LeaveNoteHelperDaemon/dbus/RootDBusHandler.cpp \
#844349:844350 @@ -19,7 +19,7 @@
 
 #include "RootDBusHandler.h"
 
-#include "SimpleMessageDaemon.h"
+#include "LeaveNoteHelperDaemon.h"
 
 #include "RootAdaptor.h"
 
@@ -42,7 +42,7 @@
 }
 
 
-namespace SimpleMessageDaemon
+namespace LeaveNoteHelperDaemon
 {
 
     RootDBusHandler::RootDBusHandler()
@@ -56,7 +56,7 @@
 
     QString RootDBusHandler::Identity()
     {
-        return QString( "%1 %2" ).arg( "SimpleMessageDaemon", APP_VERSION );
+        return QString( "%1 %2" ).arg( "LeaveNoteHelperDaemon", APP_VERSION );
     }
 
     void RootDBusHandler::Quit()
--- trunk/playground/base/plasma/applets/leavenote/LeaveNoteHelperDaemon/dbus/RootDBusHandler.h \
#844349:844350 @@ -36,7 +36,7 @@
 // Retrieve the DBusVersion data from the D-BUS argument
 const QDBusArgument &operator>>(const QDBusArgument &argument, Version &version);
 
-namespace SimpleMessageDaemon
+namespace LeaveNoteHelperDaemon
 {
     class RootDBusHandler : public QObject
     {
** trunk/playground/base/plasma/applets/leavenote/LeaveNoteHelperDaemon/dbus/org.kde.LeaveNoteHelperDaemon.daemon.xml \
#property svn:mergeinfo  + 
** trunk/playground/base/plasma/applets/leavenote/LeaveNoteHelperDaemon/dbus/org.kde.LeaveNoteHelperDaemon.root.xml \
#property svn:mergeinfo  + 
--- trunk/playground/base/plasma/applets/leavenote/LeaveNoteHelperDaemon/main.cpp \
#844349:844350 @@ -7,18 +7,18 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "SimpleMessageDaemon.h"
+#include "LeaveNoteHelperDaemon.h"
 
 #include <KAboutData>
 #include <KCmdLineArgs>
 #include <KDebug>
 
-using namespace SimpleMessageDaemon;
+using namespace LeaveNoteHelperDaemon;
 
 int main( int argc, char *argv[] )
 {
-    KAboutData about("simplemessagedaemon", 0, ki18n("SimpleMessageDaemon"), \
                "APP_VERSION", 
-                     ki18n("Small daemon to map between LeaveMsg Applet and the \
returned user." ), +    KAboutData about("leavenotehelperdaemon", 0, \
ki18n("LeaveNoteHelperDaemon"), "APP_VERSION",  +                     ki18n("Small \
                daemon to map between LeaveNote Applet and the returned user." ),
                      KAboutData::License_GPL, ki18n("(C) 2008 Christian Weilbach"), 
                      KLocalizedString(), 0, "dunsens@web.de");
     about.addAuthor( ki18n("Christian Weilbach"),
@@ -30,7 +30,7 @@
     KUniqueApplication::addCmdLineOptions();
 
     if( !KUniqueApplication::start() ) {
-        fprintf( stderr, "SimpleMessageDaemon is already running!\n" );
+        fprintf( stderr, "LeaveNoteHelperDaemon is already running!\n" );
         return 0;
     }
 


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