Version 2.2

ChangeLog.adoc

@@ -16,7 +16,7 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
 
 
 [[v2.2]]
-== Version 2.2 (under dev)
+== Version 2.2 (2018-07-14)
 
 New features::
 
@@ -56,6 +56,7 @@ Bug fixes::
   * irc: send whole IRC message including IRCv3 tags in the signals irc_in, irc_in2, irc_raw_in and irc_raw_in2 (issue #787)
   * irc: fix memory leak when receiving a message with IRCv3 tags
   * guile: fix memory leak in 7 functions returning allocated strings
+  * lua: fix macros used to return values
   * php: fix return code of functions config_write_option and config_write_line
   * php: fix memory leak in 72 functions returning allocated strings
   * python: fix crash when loading a script with Python >= 3.7 (issue #1219)

ReleaseNotes.adoc

@@ -18,7 +18,7 @@ https://weechat.org/files/changelog/ChangeLog-devel.html[ChangeLog]
 
 
 [[v2.2]]
-== Version 2.2 (under dev)
+== Version 2.2 (2018-07-14)
 
 [[v2.2_default_hotlist_conditions]]
 === Default conditions for hotlist

src/gui/curses/gui-curses-main.c

@@ -281,7 +281,7 @@ gui_main_signal_sigwinch ()
 void
 gui_main_handle_quit_signals ()
 {
-    char str_signal[64], str_weechat_signal[64];
+    char str_signal[32], str_weechat_signal[64];
     int rc;
 
     switch (weechat_quit_signal)

src/gui/gui-color.c

@@ -240,7 +240,7 @@ const char *
 gui_color_get_custom (const char *color_name)
 {
     int fg, bg, fg_term, bg_term, term_color;
-    static char color[32][32];
+    static char color[32][96];
     static int index_color = 0;
     char color_fg[32], color_bg[32];
     char *pos_delim, *str_fg, *pos_bg, *error, *color_attr;

src/plugins/lua/weechat-lua-api.c

@@ -70,38 +70,56 @@
 #define API_STATIC_STRING(__string)                                     \
     plugin_script_get_static_string(&lua_data, __string);
 #define API_RETURN_OK                                                   \
-    lua_pushinteger (L, 1);                                             \
+    {                                                                   \
-    return 1
+        lua_pushinteger (L, 1);                                         \
+        return 1;                                                       \
+    }
 #define API_RETURN_ERROR                                                \
-    lua_pushinteger (L, 0);                                             \
+    {                                                                   \
-    return 1
+        lua_pushinteger (L, 0);                                         \
+        return 1;                                                       \
+    }
 #define API_RETURN_EMPTY                                                \
-    lua_pushstring (L, "");                                             \
+    {                                                                   \
-    return 0
+        lua_pushstring (L, "");                                         \
+        return 0;                                                       \
+    }
 #define API_RETURN_STRING(__string)                                     \
-    lua_pushstring (L,                                                  \
+    {                                                                   \
-                    (__string) ? __string : "");                        \
+        lua_pushstring (L,                                              \
-    return 1
+                        (__string) ? __string : "");                    \
+        return 1;                                                       \
+    }
 #define API_RETURN_STRING_FREE(__string)                                \
-    lua_pushstring (L,                                                  \
+    {                                                                   \
-                    (__string) ? __string : "");                        \
+        lua_pushstring (L,                                              \
-    if (__string)                                                       \
+                        (__string) ? __string : "");                    \
-        free (__string);                                                \
+        if (__string)                                                   \
-    return 1
+            free (__string);                                            \
+        return 1;                                                       \
+    }
 #if LUA_VERSION_NUM >= 503
 #define API_RETURN_INT(__int)                                           \
-    lua_pushinteger (L, __int);                                          \
+    {                                                                   \
-    return 1
+        lua_pushinteger (L, __int);                                     \
+        return 1;                                                       \
+    }
 #define API_RETURN_LONG(__long)                                         \
-    lua_pushinteger (L, __long);                                         \
+    {                                                                   \
-    return 1
+        lua_pushinteger (L, __long);                                    \
+        return 1;                                                       \
+    }
 #else
 #define API_RETURN_INT(__int)                                           \
-    lua_pushnumber (L, __int);                                          \
+    {                                                                   \
-    return 1
+        lua_pushnumber (L, __int);                                      \
+        return 1;                                                       \
+    }
 #define API_RETURN_LONG(__long)                                         \
-    lua_pushnumber (L, __long);                                         \
+    {                                                                   \
-    return 1
+        lua_pushnumber (L, __long);                                     \
+        return 1;                                                       \
+    }
 #endif /* LUA_VERSION_NUM >= 503 */
 
 

src/plugins/relay/irc/relay-irc.c

@@ -599,7 +599,7 @@ relay_irc_get_line_info (struct t_relay_client *client,
                          char **tags, char **message)
 {
     int i, num_tags, command, action, all_tags, length;
-    char str_tag[256], *pos, *message_no_color, str_time[256];
+    char str_tag[512], *pos, *message_no_color, str_time[256];
     const char *ptr_tag, *ptr_message, *ptr_nick, *ptr_nick1, *ptr_nick2;
     const char *ptr_host, *localvar_nick, *time_format;
     time_t msg_date;

tests/scripts/test-scripts.cpp

@@ -120,7 +120,7 @@ TEST_GROUP(Scripts)
 TEST(Scripts, API)
 {
     char path_testapigen[PATH_MAX], path_testapi[PATH_MAX];
-    char *path_testapi_output_dir, str_command[4096];
+    char *path_testapi_output_dir, str_command[(PATH_MAX * 2) + 128];
     char *test_scripts_dir;
     struct timeval time_start, time_end;
     long long diff;

version.sh

@@ -32,9 +32,9 @@
 #     devel-patch  the patch version of devel (e.g. 2 for version 1.4.2)
 #
 
-WEECHAT_STABLE=2.1
+WEECHAT_STABLE=2.2
 WEECHAT_DEVEL=2.2
-WEECHAT_DEVEL_FULL=2.2-rc2
+WEECHAT_DEVEL_FULL=2.2
 
 if [ $# -lt 1 ]; then
     echo >&2 "Syntax: $0 stable|devel|devel-full|devel-major|devel-minor|devel-patch"

weechat.spec

@@ -23,7 +23,7 @@
 #
 
 %define name weechat
-%define version 2.1
+%define version 2.2
 %define release 1
 
 Name:      %{name}
@@ -77,6 +77,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_prefix}/share/icons/hicolor/32x32/apps/weechat.png
 
 %changelog
+* Sat Jul 14 2018 Sébastien Helleu <flashcode@flashtux.org> 2.2-1
+- Released version 2.2
 * Sun Mar 18 2018 Sébastien Helleu <flashcode@flashtux.org> 2.1-1
 - Released version 2.1
 * Wed Dec 20 2017 Sébastien Helleu <flashcode@flashtux.org> 2.0.1-1