diff options
| author | Sebastien Helleu <flashcode@flashtux.org> | 2012-08-14 18:29:32 +0200 |
|---|---|---|
| committer | Sebastien Helleu <flashcode@flashtux.org> | 2012-08-14 18:29:32 +0200 |
| commit | a99d136018eae1099ffa32b660259632694ee6ed (patch) | |
| tree | ca67b7cc3a7422461ce4acf53342a01ed67cb159 /src/plugins/relay | |
| parent | 3a245686caa30294a6b5cfefa78ee92513c56daa (diff) | |
| download | weechat-a99d136018eae1099ffa32b660259632694ee6ed.zip | |
core: add new plugin "script" (scripts manager, replacing scripts weeget.py and script.pl)
Diffstat (limited to 'src/plugins/relay')
| -rw-r--r-- | src/plugins/relay/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/plugins/relay/weechat/relay-weechat-msg.c | 7 | ||||
| -rw-r--r-- | src/plugins/relay/weechat/relay-weechat.c | 4 |
3 files changed, 3 insertions, 12 deletions
diff --git a/src/plugins/relay/CMakeLists.txt b/src/plugins/relay/CMakeLists.txt index cf02a5e8e..bdd827632 100644 --- a/src/plugins/relay/CMakeLists.txt +++ b/src/plugins/relay/CMakeLists.txt @@ -37,9 +37,7 @@ SET_TARGET_PROPERTIES(relay PROPERTIES PREFIX "") SET (LINK_LIBS) -IF(ZLIB_FOUND) - LIST(APPEND LINK_LIBS ${ZLIB_LIBRARY}) -ENDIF(ZLIB_FOUND) +LIST(APPEND LINK_LIBS ${ZLIB_LIBRARY}) IF(GNUTLS_FOUND) INCLUDE_DIRECTORIES(${GNUTLS_INCLUDE_PATH}) diff --git a/src/plugins/relay/weechat/relay-weechat-msg.c b/src/plugins/relay/weechat/relay-weechat-msg.c index 2a5f785ea..91c05c30f 100644 --- a/src/plugins/relay/weechat/relay-weechat-msg.c +++ b/src/plugins/relay/weechat/relay-weechat-msg.c @@ -30,10 +30,7 @@ #include <sys/time.h> #include <errno.h> #include <arpa/inet.h> - -#ifdef HAVE_ZLIB #include <zlib.h> -#endif #include "../../weechat-plugin.h" #include "../relay.h" @@ -964,7 +961,6 @@ relay_weechat_msg_send (struct t_relay_client *client, { uint32_t size32; char compression; -#ifdef HAVE_ZLIB int rc; Bytef *dest; uLongf dest_size; @@ -1009,7 +1005,8 @@ relay_weechat_msg_send (struct t_relay_client *client, free (dest); } } -#endif + + /* compression with zlib failed (or not asked), send uncompressed message */ /* set size and compression flag */ size32 = htonl ((uint32_t)msg->data_size); diff --git a/src/plugins/relay/weechat/relay-weechat.c b/src/plugins/relay/weechat/relay-weechat.c index c82323ecf..5728b8055 100644 --- a/src/plugins/relay/weechat/relay-weechat.c +++ b/src/plugins/relay/weechat/relay-weechat.c @@ -201,11 +201,7 @@ relay_weechat_alloc (struct t_relay_client *client) if (client->protocol_data) { RELAY_WEECHAT_DATA(client, password_ok) = (password && password[0]) ? 0 : 1; -#ifdef HAVE_ZLIB RELAY_WEECHAT_DATA(client, compression) = 1; -#else - RELAY_WEECHAT_DATA(client, compression) = 0; -#endif RELAY_WEECHAT_DATA(client, buffers_sync) = weechat_hashtable_new (16, WEECHAT_HASHTABLE_STRING, |