mirror of
https://invent.kde.org/network/krfb
synced 2024-07-01 07:24:29 +00:00
Port to telepathy-qt 0.9
svn path=/trunk/KDE/kdenetwork/krfb/; revision=1283925
This commit is contained in:
George Kiagiadakis
parent
2d778f6b18
commit
3428e62959
|
|
@ -16,7 +16,7 @@ if(NOT INSIDE_KDENETWORK)
|
|||
message(WARNING "You enabled experimental Tubes support. Expect breakage!!")
|
||||
|
||||
macro_optional_find_package(TelepathyQt4)
|
||||
macro_log_feature(TELEPATHY_QT4_FOUND "telepathy-qt4" "Telepathy Qt Bindings" "http://telepathy.freedesktop.org" FALSE "0.18" "Needed to build Telepathy Tubes support.")
|
||||
macro_log_feature(TelepathyQt4_FOUND "telepathy-qt" "Telepathy Qt Bindings" "http://telepathy.freedesktop.org" FALSE "0.9" "Needed to build Telepathy Tubes support.")
|
||||
endif (BUILD_EXPERIMENTAL_TUBES_SUPPORT)
|
||||
|
||||
set(CMAKE_REQUIRED_DEFINITIONS ${_KDE_PLATFORM_DEFINITIONS})
|
||||
|
|
|
|||
|
|
@ -1,39 +0,0 @@
|
|||
# Try to find the Qt4 binding of the Telepathy library
|
||||
# TELEPATHY_QT4_FOUND - system has TelepathyQt4
|
||||
# TELEPATHY_QT4_INCLUDE_DIR - the TelepathyQt4 include directory
|
||||
# TELEPATHY_QT4_LIBRARIES - Link these to use TelepathyQt4
|
||||
|
||||
# Copyright (c) 2008, Allen Winter <winter@kde.org>
|
||||
# Copyright (c) 2009, Andre Moreira Magalhaes <andrunko@gmail.com>
|
||||
#
|
||||
# Redistribution and use is allowed according to the terms of the BSD license.
|
||||
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
|
||||
|
||||
set(TELEPATHY_QT4_FIND_REQUIRED ${TelepathyQt4_FIND_REQUIRED})
|
||||
if(TELEPATHY_QT4_INCLUDE_DIR AND TELEPATHY_QT4_LIBRARIES)
|
||||
# Already in cache, be silent
|
||||
set(TELEPATHY_QT4_FIND_QUIETLY TRUE)
|
||||
endif(TELEPATHY_QT4_INCLUDE_DIR AND TELEPATHY_QT4_LIBRARIES)
|
||||
|
||||
find_package(PkgConfig)
|
||||
if(PKG_CONFIG_FOUND)
|
||||
pkg_check_modules(PC_TELEPATHY_QT4 QUIET TelepathyQt4>=0.1.8)
|
||||
endif(PKG_CONFIG_FOUND)
|
||||
|
||||
find_path(TELEPATHY_QT4_INCLUDE_DIR
|
||||
NAMES TelepathyQt4/Types
|
||||
HINTS
|
||||
${PC_TELEPATHY_QT4_INCLUDEDIR}
|
||||
${PC_TELEPATHY_QT4_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
find_library(TELEPATHY_QT4_LIBRARIES
|
||||
NAMES telepathy-qt4
|
||||
HINTS
|
||||
${PC_TELEPATHY_QT4_LIBDIR}
|
||||
${PC_TELEPATHY_QT4_LIBRARY_DIRS}
|
||||
)
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(TELEPATHY_QT4 DEFAULT_MSG
|
||||
TELEPATHY_QT4_LIBRARIES TELEPATHY_QT4_INCLUDE_DIR)
|
||||
|
|
@ -41,10 +41,10 @@ install (FILES
|
|||
# Second target: krfb - the app
|
||||
# itself.
|
||||
|
||||
if(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
|
||||
if(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TelepathyQt4_FOUND)
|
||||
add_definitions(-DKRFB_WITH_TELEPATHY_TUBES)
|
||||
include_directories(${TELEPATHY_QT4_INCLUDE_DIR})
|
||||
endif(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
|
||||
endif()
|
||||
|
||||
set (krfb_SRCS
|
||||
connectiondialog.cpp
|
||||
|
|
@ -65,13 +65,13 @@ set (krfb_SRCS
|
|||
invitationsrfbclient.cpp
|
||||
)
|
||||
|
||||
if (BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
|
||||
if(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TelepathyQt4_FOUND)
|
||||
set (krfb_SRCS
|
||||
${krfb_SRCS}
|
||||
tubesrfbserver.cpp
|
||||
tubesrfbclient.cpp
|
||||
)
|
||||
endif (BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
|
||||
endif()
|
||||
|
||||
kde4_add_kcfg_files (krfb_SRCS
|
||||
krfbconfig.kcfgc
|
||||
|
|
@ -86,9 +86,9 @@ kde4_add_ui_files (krfb_SRCS
|
|||
ui/personalinvitewidget.ui
|
||||
)
|
||||
|
||||
if (BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
|
||||
if(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TelepathyQt4_FOUND)
|
||||
kde4_add_ui_files(krfb_SRCS ui/tubesconnectionwidget.ui)
|
||||
endif(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
|
||||
endif()
|
||||
|
||||
kde4_add_executable (krfb
|
||||
${krfb_SRCS}
|
||||
|
|
@ -106,11 +106,11 @@ target_link_libraries (krfb
|
|||
${KDE4_KDEUI_LIBS}
|
||||
)
|
||||
|
||||
if (BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
|
||||
if(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TelepathyQt4_FOUND)
|
||||
target_link_libraries(krfb
|
||||
${TELEPATHY_QT4_LIBRARIES}
|
||||
)
|
||||
endif (BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
|
||||
endif()
|
||||
|
||||
if (X11_XTest_FOUND)
|
||||
target_link_libraries (krfb
|
||||
|
|
@ -122,14 +122,14 @@ install (TARGETS krfb
|
|||
${INSTALL_TARGETS_DEFAULT_ARGS}
|
||||
)
|
||||
|
||||
if (BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
|
||||
if(BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TelepathyQt4_FOUND)
|
||||
configure_file(org.freedesktop.Telepathy.Client.krfb_rfb_handler.service.in
|
||||
org.freedesktop.Telepathy.Client.krfb_rfb_handler.service)
|
||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.freedesktop.Telepathy.Client.krfb_rfb_handler.service
|
||||
DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
|
||||
|
||||
install(FILES krfb_rfb_handler.client DESTINATION ${CMAKE_INSTALL_PREFIX}/share/telepathy/clients/)
|
||||
endif (BUILD_EXPERIMENTAL_TUBES_SUPPORT AND TELEPATHY_QT4_FOUND)
|
||||
endif()
|
||||
|
||||
########### install files ###############
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
#define TUBESRFBCLIENT_H
|
||||
|
||||
#include "rfbclient.h"
|
||||
#include <TelepathyQt4/Contact>
|
||||
#include <TelepathyQt/Contact>
|
||||
|
||||
class TubesRfbClient : public RfbClient
|
||||
{
|
||||
|
|
|
|||
|
|
@ -23,14 +23,14 @@
|
|||
#include <KDebug>
|
||||
#include <KRandom>
|
||||
|
||||
#include <TelepathyQt4/Debug>
|
||||
#include <TelepathyQt4/Contact>
|
||||
#include <TelepathyQt4/AccountFactory>
|
||||
#include <TelepathyQt4/ConnectionFactory>
|
||||
#include <TelepathyQt4/ContactFactory>
|
||||
#include <TelepathyQt4/ChannelFactory>
|
||||
#include <TelepathyQt4/OutgoingStreamTubeChannel>
|
||||
#include <TelepathyQt4/StreamTubeServer>
|
||||
#include <TelepathyQt/Debug>
|
||||
#include <TelepathyQt/Contact>
|
||||
#include <TelepathyQt/AccountFactory>
|
||||
#include <TelepathyQt/ConnectionFactory>
|
||||
#include <TelepathyQt/ContactFactory>
|
||||
#include <TelepathyQt/ChannelFactory>
|
||||
#include <TelepathyQt/OutgoingStreamTubeChannel>
|
||||
#include <TelepathyQt/StreamTubeServer>
|
||||
|
||||
|
||||
struct TubesRfbServer::Private
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
#include "rfbserver.h"
|
||||
#include <QtNetwork/QHostAddress>
|
||||
#include <TelepathyQt4/Types>
|
||||
#include <TelepathyQt/Types>
|
||||
|
||||
class TubesRfbServer : public RfbServer
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user