diff options
| author | Marvin W <git@larma.de> | 2017-03-10 16:02:32 +0100 |
|---|---|---|
| committer | Marvin W <git@larma.de> | 2017-03-10 16:09:47 +0100 |
| commit | 7a1aa8c806a63cfd031c082524501e26d4a181ee (patch) | |
| tree | 9d7895ce184d87e329d3ad62d8cda1d10c2596d2 /client | |
| parent | 5fc0435cc1227bf445d06a3931343020faaecd10 (diff) | |
| download | dino-7a1aa8c806a63cfd031c082524501e26d4a181ee.tar.gz dino-7a1aa8c806a63cfd031c082524501e26d4a181ee.zip | |
Do not expose UUID lib dependency outside vala-xmpp library
Diffstat (limited to 'client')
| -rw-r--r-- | client/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | client/src/service/connection_manager.vala | 2 | ||||
| -rw-r--r-- | client/src/service/message_manager.vala | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index ac42ecff..1ce8c1ee 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -1,7 +1,6 @@ find_package(Vala REQUIRED) find_package(PkgConfig REQUIRED) find_package(GPGME REQUIRED) -find_package(LIBUUID REQUIRED) include(${VALA_USE_FILE}) include(GlibCompileResourcesSupport) @@ -127,7 +126,6 @@ SOURCES PACKAGES ${CLIENT_PACKAGES} gpgme - uuid vala-xmpp qlite GRESOURCES diff --git a/client/src/service/connection_manager.vala b/client/src/service/connection_manager.vala index 91664af5..75155e98 100644 --- a/client/src/service/connection_manager.vala +++ b/client/src/service/connection_manager.vala @@ -136,7 +136,7 @@ public class ConnectionManager { print(@"recovering in $wait_sec\n"); Timeout.add_seconds(wait_sec, () => { if (stream_error_flag.resource_rejected) { - connect_(account, account.resourcepart + "-" + UUID.generate_random_unparsed()); + connect_(account, account.resourcepart + "-" + random_uuid()); } else { connect_(account); } diff --git a/client/src/service/message_manager.vala b/client/src/service/message_manager.vala index 054db518..ec7a35c8 100644 --- a/client/src/service/message_manager.vala +++ b/client/src/service/message_manager.vala @@ -141,7 +141,7 @@ public class MessageManager : StreamInteractionModule, Object { private Entities.Message create_out_message(string text, Conversation conversation) { Entities.Message message = new Entities.Message(); - message.stanza_id = UUID.generate_random_unparsed(); + message.stanza_id = random_uuid(); message.account = conversation.account; message.body = text; message.time = new DateTime.now_utc(); |