diff options
| author | Marvin W <git@larma.de> | 2017-03-10 19:34:56 +0100 |
|---|---|---|
| committer | Marvin W <git@larma.de> | 2017-03-10 19:50:34 +0100 |
| commit | 29ca70a6d534e1cd79963718c793ae740318cff1 (patch) | |
| tree | 295bc0a88b9f31f103bc970fbdcd2d940d6c83e2 /xmpp-vala | |
| parent | cf51e1dee22273366700c41a185c4bea343dddfe (diff) | |
| download | dino-29ca70a6d534e1cd79963718c793ae740318cff1.tar.gz dino-29ca70a6d534e1cd79963718c793ae740318cff1.zip | |
Initial plugin system
Diffstat (limited to 'xmpp-vala')
| -rw-r--r-- | xmpp-vala/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | xmpp-vala/src/core/xmpp_stream.vala | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/xmpp-vala/CMakeLists.txt b/xmpp-vala/CMakeLists.txt index 95c9c44b..a0e91841 100644 --- a/xmpp-vala/CMakeLists.txt +++ b/xmpp-vala/CMakeLists.txt @@ -9,7 +9,7 @@ set(ENGINE_PACKAGES gee-0.8 gio-2.0 glib-2.0 - gtk+-3.0 + gdk-3.0 ) pkg_check_modules(ENGINE REQUIRED ${ENGINE_PACKAGES}) @@ -80,10 +80,10 @@ OPTIONS --vapidir=${CMAKE_SOURCE_DIR}/vapi ) -set(CFLAGS ${ENGINE_CFLAGS} ${GPGME_CFLAGS} ${LIBUUID_CFLAGS} -g ${VALA_CFLAGS} -I${CMAKE_BINARY_DIR}/gpgme-vala) +set(CFLAGS ${VALA_CFLAGS} ${ENGINE_CFLAGS} ${GPGME_CFLAGS} ${LIBUUID_CFLAGS} -I${CMAKE_BINARY_DIR}/gpgme-vala) add_definitions(${CFLAGS}) add_library(xmpp-vala SHARED ${ENGINE_VALA_C}) -add_dependencies(xmpp-vala gpgme-vala gpgme-vapi) +add_dependencies(xmpp-vala gpgme-vapi) target_link_libraries(xmpp-vala gpgme-vala ${ENGINE_LIBRARIES} ${GPGME_LIBRARIES} ${LIBUUID_LIBRARIES}) add_custom_target(xmpp-vala-vapi diff --git a/xmpp-vala/src/core/xmpp_stream.vala b/xmpp-vala/src/core/xmpp_stream.vala index 5f92113d..2cba2b54 100644 --- a/xmpp-vala/src/core/xmpp_stream.vala +++ b/xmpp-vala/src/core/xmpp_stream.vala @@ -93,7 +93,7 @@ public class XmppStream { } } - public IOStream get_stream() { + public IOStream? get_stream() { return stream; } |