From kde-commits Sun Sep 26 11:28:50 2010 From: George Kiagiadakis Date: Sun, 26 Sep 2010 11:28:50 +0000 To: kde-commits Subject: playground/network/kcall Message-Id: <20100926112850.2B58BAC857 () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=128550019512599 SVN commit 1179881 by gkiagia: Move codec-preferences.ini in libtelepathy-kde-call. D kcall_handler/farsight/codec-preferences.ini M +1 -0 libtelepathy-kde-call/CMakeLists.txt M +1 -1 libtelepathy-kde-call/callchannelhandler.cpp A libtelepathy-kde-call/codec-preferences.ini kcall_handler/farsight/codec-preferences.ini#1179470 --- trunk/playground/network/kcall/libtelepathy-kde-call/CMakeLists.txt #1179880:1179881 @@ -13,3 +13,4 @@ target_link_libraries(telepathy-kde-call qtpfarsight ${KDE4_KDECORE_LIBS} ${KDE4_SOLID_LIBS} ${QTGSTREAMER_UI_LIBRARIES} ${TELEPATHY_QT4_LIBRARIES}) install(TARGETS telepathy-kde-call ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(FILES codec-preferences.ini DESTINATION ${DATA_INSTALL_DIR}/libtelepathy-kde-call) --- trunk/playground/network/kcall/libtelepathy-kde-call/callchannelhandler.cpp #1179880:1179881 @@ -87,7 +87,7 @@ connect(m_qtfchannel, SIGNAL(videoSrcPadRemoved(QGst::PadPtr)), SLOT(videoSrcPadRemoved(QGst::PadPtr))); - QString codecsFile = KStandardDirs::locate("appdata", "codec-preferences.ini"); + QString codecsFile = KStandardDirs::locate("data", "libtelepathy-kde-call/codec-preferences.ini"); if ( !codecsFile.isEmpty() ) { kDebug() << "Reading codec preferences from" << codecsFile; m_qtfchannel->setCodecsConfigFile(codecsFile);