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

List:       kde-commits
Subject:    playground/network/kcall
From:       George Kiagiadakis <gkiagiad () csd ! uoc ! gr>
Date:       2009-06-18 9:50:39
Message-ID: 1245318639.823195.12059.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 983412 by gkiagia:

Move the streamed media channel handler in a separate binary, kcall_handler.

 M  +2 -3      CMakeLists.txt  
 M  +1 -1      abstractclientapprover.cpp  
 D             callhandler.cpp  
 D             callhandler.h  
 D             callwindow.cpp  
 D             callwindow.h  
 M  +1 -1      contactlistcontroller.cpp  
 A             kcall_handler (directory)  
 A             kcall_handler/CMakeLists.txt  
 A             kcall_handler/callhandler.cpp   callhandler.cpp#983109 [License: LGPL \
(v2.1+)]  A             kcall_handler/callhandler.h   callhandler.h#983109 [License: \
LGPL (v2.1+)]  A             kcall_handler/callwindow.cpp   callwindow.cpp#983109 \
[License: GPL (v2+)]  A             kcall_handler/callwindow.h   callwindow.h#983109 \
[License: GPL (v2+)]  A             kcall_handler/kcall_handler.client  
 A             kcall_handler/main.cpp   [License: GPL (v2+)]
 A             kcall_handler/org.freedesktop.Telepathy.Client.kcall_handler.service.in \
  M  +0 -4      kcallapplication.cpp  


--- trunk/playground/network/kcall/CMakeLists.txt #983411:983412
@@ -10,6 +10,7 @@
                     ${KNOTIFICATIONITEM_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 add_definitions(${KDE4_DEFINITIONS})
 
+add_subdirectory(kcall_handler)
 add_subdirectory(callwindowpart)
 
 set(kcall_SRCS
@@ -17,8 +18,6 @@
     kcallapplication.cpp
     mainwindow.cpp
     contactlistcontroller.cpp
-    callwindow.cpp
-    callhandler.cpp
     abstractclientapprover.cpp
     systrayicon.cpp
     knotifyapprover.cpp
@@ -31,7 +30,7 @@
 
 kde4_add_ui_files(kcall_SRCS mainwindow.ui)
 kde4_add_executable(kcall ${kcall_SRCS})
-target_link_libraries(kcall ${KDE4_KPARTS_LIBS} ${TELEPATHY_QT4_LIBRARIES} \
${KNOTIFICATIONITEM_LIBRARIES}) +target_link_libraries(kcall ${KDE4_KDEUI_LIBS} \
${TELEPATHY_QT4_LIBRARIES} ${KNOTIFICATIONITEM_LIBRARIES})  
 install(TARGETS kcall ${INSTALL_TARGETS_DEFAULT_ARGS})
 #install(FILES kcallui.rc DESTINATION ${DATA_INSTALL_DIR}/kcall)
--- trunk/playground/network/kcall/abstractclientapprover.cpp #983411:983412
@@ -63,7 +63,7 @@
 
 void ApproverRequest::accept()
 {
-    d->dispatchOperation->handleWith("org.freedesktop.Telepathy.Client.kcall");
+    d->dispatchOperation->handleWith("org.freedesktop.Telepathy.Client.kcall_handler");
  emit finished(this);
 }
 
--- trunk/playground/network/kcall/contactlistcontroller.cpp #983411:983412
@@ -102,7 +102,7 @@
     request.insert(TELEPATHY_INTERFACE_CHANNEL ".TargetHandleType", \
                Tp::HandleTypeContact);
     request.insert(TELEPATHY_INTERFACE_CHANNEL ".TargetHandle", \
                contact->handle()[0]);
     request.insert(TELEPATHY_INTERFACE_CHANNEL_TYPE_STREAMED_MEDIA \
                ".FUTURE.InitialAudio", true);
-    account->ensureChannel(request, QDateTime::currentDateTime(), \
"org.freedesktop.Telepathy.Client.kcall"); +    account->ensureChannel(request, \
QDateTime::currentDateTime(), "org.freedesktop.Telepathy.Client.kcall_handler");  }
 
 void ContactListController::setStatus(int statusIndex)
--- trunk/playground/network/kcall/kcallapplication.cpp #983411:983412
@@ -16,7 +16,6 @@
 */
 #include "kcallapplication.h"
 #include "mainwindow.h"
-#include "callhandler.h"
 #include "systrayicon.h"
 #include "knotifyapprover.h"
 #include "models/contactsmodel.h"
@@ -31,7 +30,6 @@
     ContactsModel *contactsModel;
     Tp::AccountManagerPtr accountManager;
     Tp::ClientRegistrarPtr registrar;
-    Tp::SharedPtr<CallHandler> callHandler;
     Tp::SharedPtr<SystrayIcon> systrayIcon;
     Tp::SharedPtr<KNotifyApprover> knotifyApprover;
 };
@@ -47,8 +45,6 @@
             SLOT(onAccountManagerReady(Tp::PendingOperation *)));
 
     d->registrar = Tp::ClientRegistrar::create();
-    d->callHandler = Tp::SharedPtr<CallHandler>(new CallHandler());
-    d->registrar->registerClient(Tp::AbstractClientPtr::dynamicCast(d->callHandler), \
"kcall");  d->systrayIcon = Tp::SharedPtr<SystrayIcon>(new SystrayIcon());
     d->registrar->registerClient(Tp::AbstractClientPtr::dynamicCast(d->systrayIcon), \
                "kcall_approver_systray");
     d->knotifyApprover = Tp::SharedPtr<KNotifyApprover>(new KNotifyApprover());


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