SVN commit 814263 by casanova: * Removed the old Jingle part from hodosh to make it compilable. M +4 -4 CMakeLists.txt M +2 -0 jabberaccount.cpp M +2 -2 jabbercontact.cpp M +42 -60 jingle/CMakeLists.txt D jingle/jinglevoicesessiondialogbase.ui A jingle/ui (directory) A jingle/ui/jinglevoicesessiondialogbase.ui jingle/jinglevoicesessiondialogbase.ui#814206 --- branches/work/soc-kopete-jingle/kopete/protocols/jabber/CMakeLists.txt #814262:814263 @@ -18,7 +18,7 @@ ${CMAKE_CURRENT_SOURCE_DIR}/libiris/cutestuff/ ${CMAKE_CURRENT_SOURCE_DIR}/libiris/iris/ ${QCA2_INCLUDE_DIR} -${CMAKE_CURRENT_SOURCE_DIR}/jingle/ +#${CMAKE_CURRENT_SOURCE_DIR}/jingle/ ) @@ -60,7 +60,6 @@ ui/dlgjabbereditaccountwidget.ui ui/dlgchatjoin.ui ui/dlgchatroomslist.ui - jingle/jinglevoicesessiondialogbase.ui ui/privacyrule.ui ui/privacy.ui ) @@ -103,9 +102,10 @@ kde4_add_plugin(kopete_jabber ${kopete_jabber_PART_SRCS}) -add_subdirectory( jingle ) +#add_subdirectory( jingle ) -target_link_libraries(kopete_jabber ${KDE4_KDE3SUPPORT_LIBS} ${QCA2_LIBRARIES} kopete iris_kopete kopete_jabberjingle) +target_link_libraries(kopete_jabber ${KDE4_KDE3SUPPORT_LIBS} ${QCA2_LIBRARIES} kopete iris_kopete) +#target_link_libraries(kopete_jabber ${KDE4_KDE3SUPPORT_LIBS} ${QCA2_LIBRARIES} kopete iris_kopete kopete_jabberjingle) install(TARGETS kopete_jabber DESTINATION ${PLUGIN_INSTALL_DIR}) --- branches/work/soc-kopete-jingle/kopete/protocols/jabber/jabberaccount.cpp #814262:814263 @@ -78,6 +78,8 @@ #include +#undef SUPPORT_JINGLE //Jingle support Hardly disabled + #ifdef SUPPORT_JINGLE #include "voicecaller.h" #include "jinglevoicecaller.h" --- branches/work/soc-kopete-jingle/kopete/protocols/jabber/jabbercontact.cpp #814262:814263 @@ -59,6 +59,8 @@ #include "jabbertransport.h" #include "dlgjabbervcard.h" +#undef SUPPORT_JINGLE //Jingle support Hardly disabled + #ifdef SUPPORT_JINGLE #include "jinglesessionmanager.h" #include "jinglevoicesession.h" @@ -1253,7 +1255,6 @@ // If the jid resource is empty, get the JID from best resource for this contact. jid = bestResource->jid(); } -#if 1 //TODO iterate through resources until we find one that supports voice if( account()->sessionManager() && bestResource->features().canVoice() ) { @@ -1265,7 +1266,6 @@ }else{ KMessageBox::sorry(0,i18n("The contact you selected does not have a jabber resource with voice support right now."), i18n("Unable to make voice call")); } -#endif } else { --- branches/work/soc-kopete-jingle/kopete/protocols/jabber/jingle/CMakeLists.txt #814262:814263 @@ -1,30 +1,10 @@ -#add_subdirectory(libjingle) +add_definitions(-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS) -MACRO (QMAKE_WRAP filename outfiles ) - # get include dirs - QT4_GET_MOC_INC_DIRS(moc_includes) +#add_subdirectory( ui ) +#add_subdirectory( icons ) +#add_subdirectory( libiris ) - FOREACH (it ${ARGN}) - GET_FILENAME_COMPONENT(it ${it} ABSOLUTE) - GET_FILENAME_COMPONENT(outfile ${it} NAME_WE) - - SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/${filename}) - ADD_CUSTOM_COMMAND(OUTPUT ${outfile} - COMMAND ${QT_MOC_EXECUTABLE} - ARGS ${moc_includes} -o ${outfile} ${it} - DEPENDS ${it}) - SET(${outfiles} ${${outfiles}} ${outfile}) - ENDFOREACH(it) -ENDMACRO (QMAKE_WRAP) - -MACRO (QMAKE_WRAP_CPP outfiles ) - QMAKE_WRAP("\${outfile}.moc" ${outfiles} ${ARGN}) -ENDMACRO (QMAKE_WRAP_CPP) - -MACRO (QMAKE_WRAP_H outfiles ) - QMAKE_WRAP("moc_\${outfile}.cpp" ${outfiles} ${ARGN}) -ENDMACRO (QMAKE_WRAP_H) - +#message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: skipped subdir $(JINGLE)") include_directories( ${KOPETE_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/../ui/ @@ -41,43 +21,51 @@ ${CMAKE_CURRENT_SOURCE_DIR}/libjingle/ ) -link_directories( ${CMAKE_CURRENT_BINARY_DIR}/../libiris/iris/xmpp-im ) +link_directories( ${CMAKE_CURRENT_BINARY_DIR}/../libiris/iris/xmpp-im ./) + ########### next target ############### -set(kopete_jingle_PART_SRCS +set(kopete_jabber_jingle_ui_SRCS + ui/jinglevoicesessiondialogbase.ui +) - jinglefoosession.cpp - jinglefootransport.cpp - jinglejabberxml.cpp - jinglesession.cpp - jinglesessionmanager.cpp - #jinglevoicesession.cpp this one'll get put back - jinglevoicesessiondialog.cpp - voicecaller.h - jinglewatchsessiontask.cpp - #jinglenetwork.cpp - #${CMAKE_CURRENT_SOURCE_DIR}/../libiris/iris/xmpp-im/xmpp_xmlcommon.cpp - #${CMAKE_CURRENT_SOURCE_DIR}/../libiris/iris/xmpp-core/stream.cpp +kde4_add_ui_files(kopete_jabber_jingle_ui_SRCS) + +set(kopete_jabber_jingle_PART_SRCS + ${kopete_jabber_jingle_ui_SRCS} + jinglefoosession.cpp + jinglejabberxml.cpp + jinglewatchsessiontask.cpp + jinglesessionmanager.cpp +# jinglevoicesession.cpp + jinglefootransport.cpp +# jinglenetwork.cpp + jinglevoicesessiondialog.cpp + jinglesession.cpp + jinglevoicecaller.cpp ) -QT4_WRAP_UI( - kopete_jingle_UIS_H - jinglevoicesessiondialogbase.ui +set (kopete_jingle_Q_OBJECT_FILES + voicecaller.h + jinglesession.h + jinglevoicesession.h + jinglevoicecaller.h +# jinglenetwork.h + jinglewatchsessiontask.h + jinglevoicesessiondialog.h + jingleconnectioncandidate.h + jinglesessionmanager.h + jinglefoosession.h ) -set(moc_source jinglevoicecaller.cpp) -set(moc_head voicecaller.h) +qt4_wrap_cpp(kopete_jingle_MOC_FILES ${kopete_jingle_Q_OBJECT_FILES}) +kde4_add_library(kopete_jabberjingle STATIC + ${kopete_jabber_jingle_PART_SRCS} + ${kopete_jingle_MOC_FILES} +) -QMAKE_WRAP_CPP(kopete_jingle_PART_SRCS ${moc_source}) -QMAKE_WRAP_H(kopete_jingle_PART_SRCS ${moc_head}) - - -qt4_wrap_cpp(kopete_jingle_MOC_FILES ${kopete_jingle_PART_SRCS}) - -kde4_add_library(kopete_jabberjingle STATIC ${kopete_jingle_UIS_H} ${kopete_jingle_PART_SRCS} ${kopete_jingle_MOC_FILES}) - link_directories( ${CMAKE_CURRENT_SOURCE_DIR}/libjingle/talk/session/phone/.libs/ ${CMAKE_CURRENT_SOURCE_DIR}/libjingle/talk/p2p/client/.libs/ @@ -89,10 +77,6 @@ ${CMAKE_BINARY_DIR}/lib/ ) - -#target_link_libraries(kopete_jabberjingle ${KDE4_KDE3SUPPORT_LIBS} ${QCA2_LIBRARIES} kopete iris_kopete jinglebase-0.3 jinglep2pbase-0.3 jinglep2pclient-0.3 jinglesessiontunnel-0.3 jinglexmpp-0.3) - - target_link_libraries(kopete_jabberjingle ${KDE4_KDE3SUPPORT_LIBS} ${QCA2_LIBRARIES} speex ortp glib-2.0 gmodule-2.0 gthread-2.0 asound expat kopete iris_kopete ${CMAKE_CURRENT_SOURCE_DIR}/libjingle/talk/session/phone/.libs/libcricketsessionphone.a @@ -105,12 +89,10 @@ ) - - install(TARGETS kopete_jabberjingle DESTINATION ${LIB_INSTALL_DIR}) ########### install files ############### -#install( FILES kopete_jabber.desktop xmpp.protocol DESTINATION ${SERVICES_INSTALL_DIR}) -#install( FILES jabberchatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete_jabber) +install( FILES kopete_jabber.desktop xmpp.protocol DESTINATION ${SERVICES_INSTALL_DIR}) +install( FILES jabberchatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete_jabber)