[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-09-22 19:33:34
Message-ID: 1222112014.130184.19697.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 863666 by weilbach:

Fix KNotifcations and DBus interface. Works again now.


 M  +4 -4      CMakeLists.txt  
 M  +3 -3      LeaveNoteHelperDaemon.cpp  
 M  +2 -2      LeaveNoteHelperDaemon.h  
 M  +9 -6      dbus/DaemonDBusHandler.cpp  
 M  +1 -1      dbus/org.kde.LeaveNoteHelperDaemon.daemon.xml  
 AM            leavenotehelperdaemon.notifyrc   simplemessagedaemon.notifyrc#862563
 D             simplemessagedaemon.notifyrc  


--- trunk/playground/base/plasma/applets/leavenote/LeaveNoteHelperDaemon/CMakeLists.txt \
#863665:863666 @@ -1,19 +1,19 @@
 set(kded_leavenotehelperdaemon_SRCS 
 #    main.cpp
     LeaveNoteHelperDaemon.cpp
-    dbus/RootDBusHandler.cpp
+#    dbus/RootDBusHandler.cpp
     dbus/DaemonDBusHandler.cpp
 )
 
-qt4_add_dbus_adaptor(kded_leavenotehelperdaemon_SRCS \
dbus/org.kde.LeaveNoteHelperDaemon.root.xml dbus/RootDBusHandler.h \
LeaveNoteHelperDaemon::RootDBusHandler RootAdaptor RootAdaptor) \
+#qt4_add_dbus_adaptor(kded_leavenotehelperdaemon_SRCS \
dbus/org.kde.LeaveNoteHelperDaemon.root.xml dbus/RootDBusHandler.h \
LeaveNoteHelperDaemon::RootDBusHandler RootAdaptor RootAdaptor)  \
qt4_add_dbus_adaptor(kded_leavenotehelperdaemon_SRCS \
dbus/org.kde.LeaveNoteHelperDaemon.daemon.xml dbus/DaemonDBusHandler.h \
LeaveNoteHelperDaemon::DaemonDBusHandler DaemonAdaptor DaemonAdaptor)  
 #kde4_add_executable(leavenotehelperdaemon ${leavenotehelperdaemon_SRCS})
 kde4_add_plugin(kded_leavenotehelperdaemon ${kded_leavenotehelperdaemon_SRCS})
 
 target_link_libraries(kded_leavenotehelperdaemon ${KDE4_KDECORE_LIBS} \
                ${KDE4_KDEUI_LIBS} )
-#install(FILES simplemessagedaemon.notifyrc 
-#        DESTINATION ${DATA_INSTALL_DIR}/leavenotehelperdaemon)
+install(FILES leavenotehelperdaemon.notifyrc 
+        DESTINATION ${DATA_INSTALL_DIR}/leavenotehelperdaemon)
 #install(TARGETS leavenotehelperdaemon ${INSTALL_TARGETS_DEFAULT_ARGS})
 install(TARGETS kded_leavenotehelperdaemon  DESTINATION ${PLUGIN_INSTALL_DIR} )
 install(FILES dbus/org.kde.LeaveNoteHelperDaemon.root.xml
--- trunk/playground/base/plasma/applets/leavenote/LeaveNoteHelperDaemon/LeaveNoteHelperDaemon.cpp \
#863665:863666 @@ -17,7 +17,7 @@
  */
 
 #include "LeaveNoteHelperDaemon.h"
-#include "dbus/RootDBusHandler.h"
+//#include "dbus/RootDBusHandler.h"
 #include "dbus/DaemonDBusHandler.h"
 
 #include <KPluginFactory>
@@ -35,13 +35,13 @@
 Daemon::Daemon(QObject* parent, const QList<QVariant>&) 
         : KDEDModule (parent)
 {
-    mRootDBus = new RootDBusHandler();
+//    mRootDBus = new RootDBusHandler();
     mDaemonDBus = new DaemonDBusHandler();
 }
 
 Daemon::~Daemon()
 {
-    delete mRootDBus;
+//    delete mRootDBus;
     delete mDaemonDBus;
 }
 
--- trunk/playground/base/plasma/applets/leavenote/LeaveNoteHelperDaemon/LeaveNoteHelperDaemon.h \
#863665:863666 @@ -30,7 +30,7 @@
 namespace LeaveNoteHelperDaemon
 {
 
-    class RootDBusHandler;
+//    class RootDBusHandler;
     class DaemonDBusHandler;
 
 //class Daemon : public KUniqueApplication
@@ -42,7 +42,7 @@
     ~Daemon();
 
 private:
-    RootDBusHandler* mRootDBus;
+//    RootDBusHandler* mRootDBus;
     DaemonDBusHandler* mDaemonDBus;
 
 };
--- trunk/playground/base/plasma/applets/leavenote/LeaveNoteHelperDaemon/dbus/DaemonDBusHandler.cpp \
#863665:863666 @@ -48,7 +48,7 @@
     setObjectName("DaemonDBusHandler");
 
     new DaemonAdaptor(this);
-    QDBusConnection::sessionBus().registerObject("/Daemon", this);
+    QDBusConnection::sessionBus().registerObject("/modules/leavenotehelperdaemon", \
this);  }
 
 DaemonDBusHandler::~DaemonDBusHandler()
@@ -60,6 +60,7 @@
 void DaemonDBusHandler::newMessage(const QString& title, const QString& msg,
                                    bool useKNotes, bool useNotification)
 {
+    kDebug();
     /* test for the dbus interface */
     QDBusInterface knotesDBusTest("org.kde.knotes", "/KNotes", \
"org.freedesktop.DBus.Introspectable");  QDBusReply<QString>reply = \
knotesDBusTest.call("Introspect"); @@ -98,6 +99,7 @@
 
 void DaemonDBusHandler::slotWaitForKNotes()
 {
+    kDebug();
     /* now we can empty the message cash */
     QList<QHash<QString, QVariant> >::iterator i;
     for (i = mMsgCache.begin(); i != mMsgCache.end(); ++i) {
@@ -116,10 +118,10 @@
 void DaemonDBusHandler::notificationSender(const QString& title, const QString& msg,
         bool useKNotes)
 {
-    mNotification = new KNotification("incomingNote", 0L,
-                                      KNotification::Persistent);
+    kDebug();
+    mNotification = new KNotification("incomingNote", 0L, \
KNotification::Persistent); +    \
mNotification->setComponentData(KComponentData("leavenotehelperdaemon"));  \
                mNotification->setText(i18n("Left note: %1", msg));
-    // FIXME
     KIcon knotesIcon("knotes");
     mNotification->setPixmap(knotesIcon.pixmap(16, 16));
     mNotification->setActions(QStringList() << i18n("Load")
@@ -134,6 +136,7 @@
 
 void DaemonDBusHandler::slotNotificationAction(unsigned int action)
 {
+    kDebug();
     QString title = mNotificationToNote[sender()]["title"].toString();
     QString msg = mNotificationToNote[sender()]["msg"].toString();
 
@@ -142,7 +145,7 @@
         createNote(title, msg, mNotificationToNote[sender()]["useKNotes"].toBool());
         break;
     default:
-        return;
+	break;
     };
 
     mNotificationToNote.remove(sender());
@@ -152,12 +155,12 @@
 void DaemonDBusHandler::createNote(const QString& title, const QString& msg,
                                    bool useKNotes)
 {
+    kDebug();
     if (useKNotes) {
         QDBusInterface knotesDBus("org.kde.knotes", "/KNotes", "org.kde.KNotes");
         knotesDBus.call("newNote", title, msg);
     } else {
         QWidget* widget = new QWidget(0);
-//             widget->setAttribute( Qt::WA_QuitOnClose, false ); // TODO remove
         widget->setWindowTitle(title);
         KTextEdit *msgTextEdit = new KTextEdit(msg, widget);
         msgTextEdit->setReadOnly(true);
--- trunk/playground/base/plasma/applets/leavenote/LeaveNoteHelperDaemon/dbus/org.kde.LeaveNoteHelperDaemon.daemon.xml \
#863665:863666 @@ -3,7 +3,7 @@
 
 
 <node>
-  <interface name="org.kde.LeaveNoteHelperDaemon">
+  <interface name="org.kde.kded">
 
     <method name="newMessage">
         <arg type="s" direction="in"/>
** trunk/playground/base/plasma/applets/leavenote/LeaveNoteHelperDaemon/leavenotehelperdaemon.notifyrc \
#property svn:mergeinfo  + 


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