diff options
| author | fiaxh <git@mx.ax.lt> | 2017-03-10 19:53:24 +0100 |
|---|---|---|
| committer | fiaxh <git@mx.ax.lt> | 2017-03-10 19:53:24 +0100 |
| commit | 24b55d83a1f9e21b028c8d5ac9778e75565f417d (patch) | |
| tree | 195b0f332e32d08e1a18fc3d8a5a6725c5ed11d7 /xmpp-vala | |
| parent | 4c48c5c16d5f5b010c2e5dfb1affcb59f937510c (diff) | |
| parent | 29ca70a6d534e1cd79963718c793ae740318cff1 (diff) | |
| download | dino-24b55d83a1f9e21b028c8d5ac9778e75565f417d.tar.gz dino-24b55d83a1f9e21b028c8d5ac9778e75565f417d.zip | |
Merge branch 'master' of github.com:dino/dino
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; } |