1
0
mirror of https://github.com/weechat/weechat.git synced 2026-06-16 16:14:46 +02:00

Compare commits

...

42 Commits

Author SHA1 Message Date
Sébastien Helleu 6292416687 core: fix screenshot URL in README 2016-12-17 10:00:23 +01:00
Sébastien Helleu f2f21e14ad Version 1.0.1 2014-09-28 08:59:19 +02:00
Sébastien Helleu 8967ba37f1 core: check that data is not NULL in function string_iconv_fprintf
(cherry picked from commit 08d2b9aaeb)
2014-09-28 08:20:21 +02:00
Sébastien Helleu 066216481b relay: fix send of signals "relay_client_xxx" (closes #214)
The signals about relay client status changes were sent only when the client
has ended. Now it is went on any status change.

(cherry picked from commit c99df96ebd)
2014-09-26 04:09:40 +02:00
Sébastien Helleu 53de7764a1 core: fix crash on buffer close when option weechat.look.hotlist_remove is set to "merged" (closes #199)
(cherry picked from commit c1aa51fa9c)
2014-09-24 21:45:15 +02:00
Sébastien Helleu 782d812720 irc: fix type of value stored in hashtable when joining a channel (closes #211)
(cherry picked from commit f91f57f12c)
2014-09-22 07:44:47 +02:00
Sébastien Helleu 415414a0e7 doc: update auto-generated files 2014-09-21 16:02:43 +02:00
Sébastien Helleu 1f9432d322 Merge pull request #208 from l/1.0_translation_ja
core: update Japanese translations
2014-09-21 16:00:02 +02:00
AYANOKOUZI, Ryuunosuke 0118911849 core: update Japanese translations 2014-09-21 22:49:48 +09:00
Sébastien Helleu 87cc51e3ec core: fix highlight of IRC action messages when option irc.look.nick_mode is set to "action" or "both" (closes #206)
(cherry picked from commit 1a20ef41c0)
2014-09-21 11:53:13 +02:00
Sébastien Helleu 1ee8790e64 core: fix compilation of plugin API functions (macros) when compiler optimizations are enabled (closes #200)
(cherry picked from commit 03c0067272)
2014-09-20 17:39:12 +02:00
Nils Görs 2b6d97990e core: update German translations 2014-09-20 16:38:42 +02:00
Krzysztof Korościk 5609fb894e doc: updated polish translations 2014-09-20 16:30:45 +02:00
Krzysztof Korościk a96c65d57c core: update polish translations 2014-09-20 16:28:15 +02:00
Sébastien Helleu c6165e2dda core: fix sentence in ChangeLog
(cherry picked from commit 061f94aee9)
2014-09-20 15:46:23 +02:00
Sébastien Helleu 23deeed800 guile: fix compilation with Guile < 2.0.4 (closes #198)
(cherry picked from commit 6a2bef6fb7)
2014-09-20 15:46:06 +02:00
Sébastien Helleu ed133e51a4 trigger: do not allow any changes on a trigger when it is currently running (closes #189)
(cherry picked from commit d1b4281d20)
2014-09-20 14:59:08 +02:00
Sébastien Helleu b9ec938fab aspell: fix compilation with enchant version older than 1.6.0 (closes #192)
(cherry picked from commit 6860aa491f)
2014-09-20 11:06:26 +02:00
Sébastien Helleu c1b65bd075 core: fix window/buffer pointers used in command /eval
(cherry picked from commit 421c0752d8)
2014-08-29 19:11:30 +02:00
Sébastien Helleu 7b637f3fb5 api: fix bug in function hdata_move when absolute value of count is greater than 1
(cherry picked from commit 9fe6ce1cdc)
2014-08-27 07:35:39 +02:00
Sébastien Helleu 1ce55d8774 perl: fix detection of Perl >= 5.20 with autotools
(cherry picked from commit bf723ba7bf)
2014-08-26 07:42:17 +02:00
Sébastien Helleu 90373f22da core: fix build of tests with autotools
(cherry picked from commit 5424c5f9de)
2014-08-25 20:26:55 +02:00
Sébastien Helleu 1838314167 tests: fix build of tests when the build directory is outside source tree (closes #178)
(cherry picked from commit f39b37351c)
2014-08-25 07:39:31 +02:00
Sébastien Helleu 28fb1b1cbe core: sync debian files with debian git repository
(cherry picked from commit 8672430acd)
2014-08-24 20:00:03 +02:00
nils_2 35ddf45063 doc: update German documentation
core: update German translations
2014-08-23 21:15:59 +02:00
Sébastien Helleu cf69bfaed4 irc: remove a trailing comma in help of server capabilities option
(cherry picked from commit fa4436b262)
2014-08-23 21:11:46 +02:00
Sébastien Helleu 53cc60bb32 core: fix typo in French translation of /help set
(cherry picked from commit 285de35d21)
2014-08-23 11:33:38 +02:00
Sébastien Helleu 8af713928e irc: add "server-time" in help of server option "capabilities"
(cherry picked from commit 83ffdb9ecd)
2014-08-23 11:30:29 +02:00
Sébastien Helleu 5b8bd33a77 script: fix crash on "/script update" if a script detail is displayed in buffer (closes #177)
(cherry picked from commit 067f310be6)
2014-08-22 20:49:54 +02:00
Sébastien Helleu 73b51f9bf4 trigger: fix regex used in default triggers to hide passwords (closes #172)
"\S" is not supported on *BSD, so it is replaced by "[^ ]" (which should be
enough, since there should be no tabs or other whitespace different from
spaces in command line).

(cherry picked from commit 333253e5b9)
2014-08-22 07:40:45 +02:00
Sébastien Helleu 33a8cb5c2b doc: add tags for missing translations in Japanese developer's guide
(cherry picked from commit 4c12639f61)
2014-08-20 22:48:11 +02:00
Sébastien Helleu df748bd7d9 core: fix modifier "weechat_print": discard only one line when several lines are displayed in same message (closes #171)
When several lines are displayed in a message (separated by "\n"), the
modifier "weechat_print" will now discard just one line (if return value is
an empty string), instead of discarding the whole message.

(cherry picked from commit 7310a7e398)
2014-08-20 22:41:49 +02:00
Sébastien Helleu 4dd2ec87c7 doc: add missing files sec.conf and exec.conf in man page
(cherry picked from commit be00ef006b)
2014-08-20 22:37:47 +02:00
Sébastien Helleu ab371fb231 core: remove obsolete WeeChat version in weechat.pot
(cherry picked from commit e27083cddf)
2014-08-20 22:35:59 +02:00
Sébastien Helleu 570b74569d aspell: display an error if command "/aspell setdict" is called without a dictionary
(cherry picked from commit dac076c242)
2014-08-20 22:35:40 +02:00
Sébastien Helleu 06414d1410 core: update ChangeLog
(cherry picked from commit 2d5f563d89)
2014-08-20 22:32:38 +02:00
Sébastien Helleu 9e220a7bda aspell: remove unneeded else condition
(cherry picked from commit 3f3eb55c6d)
2014-08-20 22:31:25 +02:00
nils_2 addf755902 aspell: fix crash with command "/aspell addword" if no word is given (closes #164)
(cherry picked from commit 2629fd8c74)
2014-08-20 22:31:19 +02:00
Sébastien Helleu 52625d22da core: add gettext-devel dependency for Cygwin packaging
(cherry picked from commit 1b7352e379)
2014-08-20 22:29:10 +02:00
Sébastien Helleu 4ccfd48743 core: install extra files for Cygwin in share/doc/weechat
(cherry picked from commit 8c3b85a05b)
2014-08-20 22:28:45 +02:00
Sébastien Helleu 82eb8aef08 tests: fix memory leak in tests launcher
(cherry picked from commit bc34c3cfc2)
2014-08-20 22:22:06 +02:00
Sébastien Helleu ffca6c3bf0 Version 1.0.1-dev 2014-08-20 22:16:39 +02:00
81 changed files with 1062 additions and 642 deletions
+12 -1
View File
@@ -35,7 +35,7 @@ endif()
# version # version
set(VERSION_MAJOR "1") set(VERSION_MAJOR "1")
set(VERSION_MINOR "0") set(VERSION_MINOR "0")
set(VERSION_PATCH "") set(VERSION_PATCH "1")
if(VERSION_PATCH STREQUAL "") if(VERSION_PATCH STREQUAL "")
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}) set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR})
else() else()
@@ -241,6 +241,17 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${LIBDIR}/../pk
# cygport file (used to build Cygwin packages) # cygport file (used to build Cygwin packages)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/weechat.cygport.in ${CMAKE_CURRENT_BINARY_DIR}/weechat-${VERSION}-1.cygport @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/weechat.cygport.in ${CMAKE_CURRENT_BINARY_DIR}/weechat-${VERSION}-1.cygport @ONLY)
# install some files (only on Cygwin)
if(CYGWIN)
install(FILES
${CMAKE_CURRENT_SOURCE_DIR}/AUTHORS.asciidoc
${CMAKE_CURRENT_SOURCE_DIR}/ChangeLog.asciidoc
${CMAKE_CURRENT_SOURCE_DIR}/Contributing.asciidoc
${CMAKE_CURRENT_SOURCE_DIR}/README.asciidoc
${CMAKE_CURRENT_SOURCE_DIR}/ReleaseNotes.asciidoc
DESTINATION ${SHAREDIR}/doc/${PROJECT_NAME})
endif()
# icon # icon
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.png DESTINATION ${SHAREDIR}/icons/hicolor/32x32/apps) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.png DESTINATION ${SHAREDIR}/icons/hicolor/32x32/apps)
+33
View File
@@ -13,6 +13,39 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
(file 'ReleaseNotes.asciidoc' in sources). (file 'ReleaseNotes.asciidoc' in sources).
== Version 1.0.1 (2014-09-28)
=== Bugs fixed
* core: fix crash on buffer close when option weechat.look.hotlist_remove is
set to "merged" (closes #199)
* core: fix highlight of IRC action messages when option irc.look.nick_mode is
set to "action" or "both" (closes #206)
* core: fix compilation of plugin API functions (macros) when compiler
optimizations are enabled (closes #200)
* core: fix window/buffer pointers used in command /eval
* core: fix modifier "weechat_print": discard only one line when several lines
are displayed in same message (closes #171)
* api: fix bug in function hdata_move when absolute value of count is greater
than 1
* tests: fix build of tests when the build directory is outside source tree
(closes #178)
* tests: fix memory leak in tests launcher
* aspell: fix compilation with Enchant < 1.6.0 (closes #192)
* aspell: fix crash with command "/aspell addword" if no word is given
(closes #164, closes #165)
* irc: fix type of value stored in hashtable when joining a channel
(closes #211)
* guile: fix compilation with Guile < 2.0.4 (closes #198)
* perl: fix detection of Perl >= 5.20 with autotools
* relay: fix send of signals "relay_client_xxx" (closes #214)
* script: fix crash on "/script update" if a script detail is displayed in
buffer (closes #177)
* trigger: do not allow any changes on a trigger when it is currently running
(closes #189)
* trigger: fix regex used in default triggers to hide passwords ("\S" is not
supported on *BSD) (closes #172)
== Version 1.0 (2014-08-15) == Version 1.0 (2014-08-15)
=== New features === New features
+1 -1
View File
@@ -24,7 +24,7 @@ image:https://travis-ci.org/weechat/weechat.svg?branch=master["Build Status", li
* Developed from scratch. * Developed from scratch.
* Free software, released under GPLv3. * Free software, released under GPLv3.
image::http://static.weechat.org/images/screenshots/weechat/medium/weechat_2013-04-27_phlux_shadow.png[align="center"] image::https://weechat.org/media/images/screenshots/weechat/medium/weechat_2013-04-27_phlux_shadow.png[align="center"]
== Install == Install
+4
View File
@@ -15,6 +15,10 @@ http://weechat.org/files/changelog/ChangeLog-devel.html[ChangeLog]
(file 'ChangeLog.asciidoc' in sources). (file 'ChangeLog.asciidoc' in sources).
== Version 1.0.1 (2014-09-28)
Bug fix and maintenance release.
== Version 1.0 (2014-08-15) == Version 1.0 (2014-08-15)
=== Channel type not added by default on /join === Channel type not added by default on /join
+3 -1
View File
@@ -42,12 +42,14 @@ find_library(ASPELL_LIBRARY
) )
if(ASPELL_INCLUDE_PATH AND ASPELL_LIBRARY) if(ASPELL_INCLUDE_PATH AND ASPELL_LIBRARY)
set(ASPELL_FOUND TRUE)
# check if function aspell_version_string() exists
set(CMAKE_REQUIRED_INCLUDES ${ASPELL_INCLUDE_PATH}) set(CMAKE_REQUIRED_INCLUDES ${ASPELL_INCLUDE_PATH})
set(CMAKE_REQUIRED_LIBRARIES ${ASPELL_LIBRARY}) set(CMAKE_REQUIRED_LIBRARIES ${ASPELL_LIBRARY})
check_symbol_exists(aspell_version_string "aspell.h" HAVE_ASPELL_VERSION_STRING) check_symbol_exists(aspell_version_string "aspell.h" HAVE_ASPELL_VERSION_STRING)
set(CMAKE_REQUIRED_INCLUDES) set(CMAKE_REQUIRED_INCLUDES)
set(CMAKE_REQUIRED_LIBRARIES) set(CMAKE_REQUIRED_LIBRARIES)
set(ASPELL_FOUND TRUE)
endif() endif()
mark_as_advanced( mark_as_advanced(
+7
View File
@@ -41,4 +41,11 @@ else()
mark_as_advanced(ENCHANT_INCLUDE_DIR ENCHANT_LIBRARIES) mark_as_advanced(ENCHANT_INCLUDE_DIR ENCHANT_LIBRARIES)
# check if function enchant_get_version() exists
set(CMAKE_REQUIRED_INCLUDES ${ENCHANT_INCLUDE_DIR})
set(CMAKE_REQUIRED_LIBRARIES ${ENCHANT_LIBRARIES})
check_symbol_exists(enchant_get_version "enchant.h" HAVE_ENCHANT_GET_VERSION)
set(CMAKE_REQUIRED_INCLUDES)
set(CMAKE_REQUIRED_LIBRARIES)
endif() endif()
+8
View File
@@ -34,4 +34,12 @@ endif()
find_package(PkgConfig) find_package(PkgConfig)
if(PKG_CONFIG_FOUND) if(PKG_CONFIG_FOUND)
pkg_search_module(GUILE guile-2.0) pkg_search_module(GUILE guile-2.0)
if(GUILE_FOUND)
# check if variable "scm_install_gmp_memory_functions" exists
set(CMAKE_REQUIRED_INCLUDES ${GUILE_INCLUDE_DIRS})
set(CMAKE_REQUIRED_LIBRARIES ${GUILE_LDFLAGS})
check_symbol_exists(scm_install_gmp_memory_functions "libguile.h" HAVE_GUILE_GMP_MEMORY_FUNCTIONS)
set(CMAKE_REQUIRED_INCLUDES)
set(CMAKE_REQUIRED_LIBRARIES)
endif()
endif() endif()
+2
View File
@@ -7,6 +7,8 @@
#cmakedefine HAVE_MALLINFO #cmakedefine HAVE_MALLINFO
#cmakedefine HAVE_EAT_NEWLINE_GLITCH #cmakedefine HAVE_EAT_NEWLINE_GLITCH
#cmakedefine HAVE_ASPELL_VERSION_STRING #cmakedefine HAVE_ASPELL_VERSION_STRING
#cmakedefine HAVE_ENCHANT_GET_VERSION
#cmakedefine HAVE_GUILE_GMP_MEMORY_FUNCTIONS
#define PACKAGE_VERSION "@VERSION@" #define PACKAGE_VERSION "@VERSION@"
#define PACKAGE "@PROJECT_NAME@" #define PACKAGE "@PROJECT_NAME@"
#define PACKAGE_NAME "@PROJECT_NAME@" #define PACKAGE_NAME "@PROJECT_NAME@"
+41 -3
View File
@@ -24,7 +24,7 @@
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_PREREQ(2.56) AC_PREREQ(2.56)
AC_INIT(WeeChat, 1.0, flashcode@flashtux.org) AC_INIT(WeeChat, 1.0.1, flashcode@flashtux.org)
AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_SRCDIR([configure.ac])
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE([foreign]) AM_INIT_AUTOMAKE([foreign])
@@ -102,6 +102,8 @@ AH_VERBATIM([HAVE_GNUTLS], [#undef HAVE_GNUTLS])
AH_VERBATIM([HAVE_FLOCK], [#undef HAVE_FLOCK]) AH_VERBATIM([HAVE_FLOCK], [#undef HAVE_FLOCK])
AH_VERBATIM([HAVE_EAT_NEWLINE_GLITCH], [#undef HAVE_EAT_NEWLINE_GLITCH]) AH_VERBATIM([HAVE_EAT_NEWLINE_GLITCH], [#undef HAVE_EAT_NEWLINE_GLITCH])
AH_VERBATIM([HAVE_ASPELL_VERSION_STRING], [#undef HAVE_ASPELL_VERSION_STRING]) AH_VERBATIM([HAVE_ASPELL_VERSION_STRING], [#undef HAVE_ASPELL_VERSION_STRING])
AH_VERBATIM([HAVE_ENCHANT_GET_VERSION], [#undef HAVE_ENCHANT_GET_VERSION])
AH_VERBATIM([HAVE_GUILE_GMP_MEMORY_FUNCTIONS], [#undef HAVE_GUILE_GMP_MEMORY_FUNCTIONS])
AH_VERBATIM([PLUGIN_ALIAS], [#undef PLUGIN_ALIAS]) AH_VERBATIM([PLUGIN_ALIAS], [#undef PLUGIN_ALIAS])
AH_VERBATIM([PLUGIN_ASPELL], [#undef PLUGIN_ASPELL]) AH_VERBATIM([PLUGIN_ASPELL], [#undef PLUGIN_ASPELL])
AH_VERBATIM([PLUGIN_CHARSET], [#undef PLUGIN_CHARSET]) AH_VERBATIM([PLUGIN_CHARSET], [#undef PLUGIN_CHARSET])
@@ -307,6 +309,23 @@ if test "x$enable_aspell" = "xyes" ; then
if test "x$ac_found_enchant_lib" = "xyes" ; then if test "x$ac_found_enchant_lib" = "xyes" ; then
CFLAGS="$CFLAGS -DUSE_ENCHANT" CFLAGS="$CFLAGS -DUSE_ENCHANT"
ASPELL_LIB_USED="enchant" ASPELL_LIB_USED="enchant"
# check if function enchant_get_version() exists
ac_save_CFLAGS="$CFLAGS"
ac_save_LDFLAGS="$LDFLAGS"
CFLAGS="$CFLAGS $ENCHANT_CFLAGS"
LDFLAGS="$LDFLAGS $ENCHANT_LIBS"
AC_CACHE_CHECK([for enchant_get_version() support], ac_cv_have_enchant_get_version, [
AC_LINK_IFELSE([AC_LANG_PROGRAM(
[[ #include <enchant.h>]],
[[ const char *version = enchant_get_version(); ]])],
[ ac_have_enchant_get_version="yes" ],
[ ac_have_enchant_get_version="no" ])])
CFLAGS="$ac_save_CFLAGS"
LDFLAGS="$ac_save_LDFLAGS"
if test "x$ac_have_enchant_get_version" = "xyes"; then
AC_DEFINE(HAVE_ENCHANT_GET_VERSION)
fi
else else
ASPELL_CFLAGS="" ASPELL_CFLAGS=""
ASPELL_LFLAGS="" ASPELL_LFLAGS=""
@@ -327,6 +346,8 @@ if test "x$enable_aspell" = "xyes" ; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
ASPELL_LFLAGS="$ASPELL_LFLAGS -laspell" ASPELL_LFLAGS="$ASPELL_LFLAGS -laspell"
ASPELL_LIB_USED="aspell" ASPELL_LIB_USED="aspell"
# check if function aspell_version_string() exists
ac_save_LDFLAGS="$LDFLAGS" ac_save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $ASPELL_LFLAGS" LDFLAGS="$LDFLAGS $ASPELL_LFLAGS"
AC_CACHE_CHECK([for aspell_version_string() support], ac_cv_have_aspell_version_string, [ AC_CACHE_CHECK([for aspell_version_string() support], ac_cv_have_aspell_version_string, [
@@ -444,7 +465,7 @@ if test "x$enable_perl" = "xyes" ; then
PERL_VERSION=`perl -V:version | sed "s/version='\(.*\)';/\1/"` PERL_VERSION=`perl -V:version | sed "s/version='\(.*\)';/\1/"`
AC_MSG_CHECKING(for Perl headers files) AC_MSG_CHECKING(for Perl headers files)
PERL_HEADER_TEST=`PT=perltest.c ; echo "#include <EXTERN.h>" > $PT; echo "#include <perl.h>" >> $PT; echo "#include <XSUB.h>" >> $PT ; echo "int main() { return 0; }" >> $PT ; $CC -Wall $PT -o $PT.out $($PERL -MExtUtils::Embed -e ccopts) 1>/dev/null 2>&1; echo $?; rm -f $PT $PT.out 1>/dev/null 2>&1` PERL_HEADER_TEST=`PT=perltest.c ; echo "#include <EXTERN.h>" > $PT; echo "#include <perl.h>" >> $PT; echo "#include <XSUB.h>" >> $PT ; echo "int main() { return 0; }" >> $PT ; $CC -Wall $PT -o $PT.out $($PERL -MExtUtils::Embed -e ccopts -e ldopts) 1>/dev/null 2>&1; echo $?; rm -f $PT $PT.out 1>/dev/null 2>&1`
if test "x$PERL_HEADER_TEST" = "x0" ; then if test "x$PERL_HEADER_TEST" = "x0" ; then
PERL_CFLAGS=`$PERL -MExtUtils::Embed -e ccopts` PERL_CFLAGS=`$PERL -MExtUtils::Embed -e ccopts`
@@ -794,7 +815,24 @@ if test "x$enable_guile" = "xyes" ; then
fi fi
done done
if test "x$guile_found" = "xno" ; then if test "x$guile_found" = "xyes" ; then
# check if variable "scm_install_gmp_memory_functions" exists
ac_save_CFLAGS="$CFLAGS"
ac_save_LDFLAGS="$LDFLAGS"
CFLAGS="$CFLAGS $GUILE_CFLAGS"
LDFLAGS="$LDFLAGS $GUILE_LFLAGS"
AC_CACHE_CHECK([for variable scm_install_gmp_memory_functions], ac_cv_have_guile_gmp_memory_functions, [
AC_LINK_IFELSE([AC_LANG_PROGRAM(
[[ #include <libguile.h>]],
[[ scm_install_gmp_memory_functions = 0; ]])],
[ ac_have_guile_gmp_memory_functions="yes" ],
[ ac_have_guile_gmp_memory_functions="no" ])])
CFLAGS="$ac_save_CFLAGS"
LDFLAGS="$ac_save_LDFLAGS"
if test "x$ac_have_guile_gmp_memory_functions" = "xyes"; then
AC_DEFINE(HAVE_GUILE_GMP_MEMORY_FUNCTIONS)
fi
else
AC_MSG_WARN([ AC_MSG_WARN([
*** Guile >= 2.0 couldn't be found on your system. *** Guile >= 2.0 couldn't be found on your system.
*** WeeChat will be built without Guile (scheme) support.]) *** WeeChat will be built without Guile (scheme) support.])
+31
View File
@@ -1,3 +1,34 @@
weechat (1.0-1) unstable; urgency=medium
* New upstream release (Closes: #758230, #751108)
- Remove the patch to fix FTBFS while building against ruby 2.1
- Fix the way to install upstream changelog
- Add new plugins (exec, trigger)
- Fix the way to install docs (upstream changes to asciidoc)
* Re-enable the build of guile plugin
* Fix various typos in packaging
* Update copyright years in debian/copyright
* Add new doc-base files (Relay Protocol in Japanese)
* Add git-buildpackage configuration
-- Emmanuel Bouthenot <kolter@debian.org> Sun, 24 Aug 2014 17:40:36 +0200
weechat (0.4.3-4) unstable; urgency=medium
* Fix FTBFS by adding a missing Build Depends on docbook-xml
(Closes:#753166)
* Update libgnutls and libgcrypt Build Depends to libgnutls28-dev and
libgcrypt20-dev (Closes: #753167)
-- Emmanuel Bouthenot <kolter@debian.org> Wed, 02 Jul 2014 23:42:41 +0200
weechat (0.4.3-3) unstable; urgency=medium
* Add patch (backported from upstream) to fix a FTBFS while building
against ruby 2.1 (Closes: #747708)
-- Emmanuel Bouthenot <kolter@debian.org> Mon, 12 May 2014 12:49:14 +0200
weechat (0.4.3-2) unstable; urgency=medium weechat (0.4.3-2) unstable; urgency=medium
* Add missing symlink for Polish manpage * Add missing symlink for Polish manpage
+3 -2
View File
@@ -6,7 +6,8 @@ Build-Depends:
asciidoc (>= 8.5), asciidoc (>= 8.5),
source-highlight, source-highlight,
xsltproc, xsltproc,
docbook-xml, docbook-xsl, docbook-xsl,
docbook-xml,
debhelper (>= 9), debhelper (>= 9),
cmake, pkg-config, cmake, pkg-config,
libncursesw5-dev, libncursesw5-dev,
@@ -123,7 +124,7 @@ Package: weechat-dev
Section: devel Section: devel
Architecture: all Architecture: all
Depends: ${misc:Depends} Depends: ${misc:Depends}
Description: Fast, light and extensible chat client - developement headers Description: Fast, light and extensible chat client - development headers
WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client WeeChat (Wee Enhanced Environment for Chat) is a fast and light chat client
for many operating systems. Everything can be done with a keyboard. for many operating systems. Everything can be done with a keyboard.
. .
+1 -1
View File
@@ -11,7 +11,7 @@ License: GPL-3+
Files: debian/* Files: debian/*
Copyright: 2005-2008, Julien Louis <ptitlouis@sysif.net> Copyright: 2005-2008, Julien Louis <ptitlouis@sysif.net>
2008-2012, Emmanuel Bouthenot <kolter@openics.org> 2008-2014, Emmanuel Bouthenot <kolter@openics.org>
License: GPL-3+ License: GPL-3+
License: GPL-3+ License: GPL-3+
+5
View File
@@ -0,0 +1,5 @@
[DEFAULT]
upstream-branch = upstream
debian-branch = unstable
upstream-tag = v%(version)s
compression = xz
+3
View File
@@ -23,6 +23,9 @@ override_dh_auto_configure:
# debhelper try to use it but that's not needed # debhelper try to use it but that's not needed
echo echo
override_dh_installchangelogs:
dh_installchangelogs ChangeLog.asciidoc
override_dh_strip: override_dh_strip:
dh_strip --dbg-package=weechat-dbg dh_strip --dbg-package=weechat-dbg
+1
View File
@@ -0,0 +1 @@
debian/upstream-signing-key.pgp
+2
View File
@@ -0,0 +1,2 @@
unapply-patches
abort-on-upstream-changes
+1 -1
View File
@@ -479,7 +479,7 @@
** Werte: 0 .. 1000000 (Standardwert: `25`) ** Werte: 0 .. 1000000 (Standardwert: `25`)
* [[option_irc.server_default.capabilities]] *irc.server_default.capabilities* * [[option_irc.server_default.capabilities]] *irc.server_default.capabilities*
** Beschreibung: `durch Kommata getrennte Liste von erweiterten Client Fähigkeiten ("client capabilities"), welche vom Server angeboten und genutzt werden sollen. Fähigkeiten die von WeeChat unterstützt werden: multi-prefix, userhost-in-name, away-notify (Beispiel: "multi-prefix, userhost-in-name,away-notify")` ** Beschreibung: `durch Kommata getrennte Liste von erweiterten Client Fähigkeiten ("client capabilities"), welche vom Server angeboten und genutzt werden sollen. Fähigkeiten die von WeeChat unterstützt werden: away-notify, multi-prefix, server-time, userhost-in-names (Beispiel: "away-notify,multi-prefix")`
** Typ: Zeichenkette ** Typ: Zeichenkette
** Werte: beliebige Zeichenkette (Standardwert: `""`) ** Werte: beliebige Zeichenkette (Standardwert: `""`)
+6
View File
@@ -53,6 +53,9 @@ $HOME/.weechat/weechat.conf::
$HOME/.weechat/plugins.conf:: $HOME/.weechat/plugins.conf::
Konfigurationsdatei für Erweiterungen Konfigurationsdatei für Erweiterungen
$HOME/.weechat/sec.conf::
Konfigurationsdatei für sensible Daten
$HOME/.weechat/alias.conf:: $HOME/.weechat/alias.conf::
Konfigurationsdatei für 'alias' Erweiterung Konfigurationsdatei für 'alias' Erweiterung
@@ -62,6 +65,9 @@ $HOME/.weechat/aspell.conf::
$HOME/.weechat/charset.conf:: $HOME/.weechat/charset.conf::
Konfigurationsdatei für 'charset' Erweiterung Konfigurationsdatei für 'charset' Erweiterung
$HOME/.weechat/exec.conf::
Konfigurationsdatei für 'exec' Erweiterung
$HOME/.weechat/irc.conf:: $HOME/.weechat/irc.conf::
Konfigurationsdatei für 'irc' Erweiterung Konfigurationsdatei für 'irc' Erweiterung
+1 -1
View File
@@ -479,7 +479,7 @@
** values: 0 .. 1000000 (default value: `25`) ** values: 0 .. 1000000 (default value: `25`)
* [[option_irc.server_default.capabilities]] *irc.server_default.capabilities* * [[option_irc.server_default.capabilities]] *irc.server_default.capabilities*
** description: `comma-separated list of client capabilities to enable for server if they are available; capabilities supported by WeeChat are: multi-prefix, userhost-in-names, away-notify (example: "multi-prefix,userhost-in-names,away-notify")` ** description: `comma-separated list of client capabilities to enable for server if they are available; capabilities supported by WeeChat are: away-notify, multi-prefix, server-time, userhost-in-names (example: "away-notify,multi-prefix")`
** type: string ** type: string
** values: any string (default value: `""`) ** values: any string (default value: `""`)
+6
View File
@@ -52,6 +52,9 @@ $HOME/.weechat/weechat.conf::
$HOME/.weechat/plugins.conf:: $HOME/.weechat/plugins.conf::
plugins configuration file plugins configuration file
$HOME/.weechat/sec.conf::
configuration file with secured data
$HOME/.weechat/alias.conf:: $HOME/.weechat/alias.conf::
configuration file for 'alias' plugin configuration file for 'alias' plugin
@@ -61,6 +64,9 @@ $HOME/.weechat/aspell.conf::
$HOME/.weechat/charset.conf:: $HOME/.weechat/charset.conf::
configuration file for 'charset' plugin configuration file for 'charset' plugin
$HOME/.weechat/exec.conf::
configuration file for 'exec' plugin
$HOME/.weechat/irc.conf:: $HOME/.weechat/irc.conf::
configuration file for 'irc' plugin configuration file for 'irc' plugin
+1 -1
View File
@@ -479,7 +479,7 @@
** valeurs: 0 .. 1000000 (valeur par défaut: `25`) ** valeurs: 0 .. 1000000 (valeur par défaut: `25`)
* [[option_irc.server_default.capabilities]] *irc.server_default.capabilities* * [[option_irc.server_default.capabilities]] *irc.server_default.capabilities*
** description: `liste séparée par des virgules de capacités client ("client capabilities") à activer sur le serveur si elles sont disponibles ; les capacités supportées par WeeChat sont : multi-prefix, userhost-in-names, away-notify (exemple : "multi-prefix,userhost-in-names,away-notify")` ** description: `liste séparée par des virgules de capacités client ("client capabilities") à activer sur le serveur si elles sont disponibles ; les capacités supportées par WeeChat sont : away-notify, multi-prefix, server-time, userhost-in-names (exemple : "away-notify,multi-prefix")`
** type: chaîne ** type: chaîne
** valeurs: toute chaîne (valeur par défaut: `""`) ** valeurs: toute chaîne (valeur par défaut: `""`)
@@ -784,7 +784,7 @@ Exemples :
afficher la valeur de la variable d'environnement LANG : afficher la valeur de la variable d'environnement LANG :
/set env LANG /set env LANG
modifier la variable d'environnement LANG et l'utiliser : modifier la variable d'environnement LANG et l'utiliser :
/set env LANG=fr_FR.UTF-8 /set env LANG fr_FR.UTF-8
/upgrade /upgrade
réinitialiser la variable d'environnement ABC : réinitialiser la variable d'environnement ABC :
/set env ABC "" /set env ABC ""
+6
View File
@@ -54,6 +54,9 @@ $HOME/.weechat/weechat.conf::
$HOME/.weechat/plugins.conf:: $HOME/.weechat/plugins.conf::
fichier de configuration des extensions fichier de configuration des extensions
$HOME/.weechat/sec.conf::
configuration file with secured data
$HOME/.weechat/alias.conf:: $HOME/.weechat/alias.conf::
fichier de configuration pour l'extension 'alias' fichier de configuration pour l'extension 'alias'
@@ -63,6 +66,9 @@ $HOME/.weechat/aspell.conf::
$HOME/.weechat/charset.conf:: $HOME/.weechat/charset.conf::
fichier de configuration pour l'extension 'charset' fichier de configuration pour l'extension 'charset'
$HOME/.weechat/exec.conf::
fichier de configuration pour l'extension 'exec'
$HOME/.weechat/irc.conf:: $HOME/.weechat/irc.conf::
fichier de configuration pour l'extension 'irc' fichier de configuration pour l'extension 'irc'
+1 -1
View File
@@ -479,7 +479,7 @@
** valori: 0 .. 1000000 (valore predefinito: `25`) ** valori: 0 .. 1000000 (valore predefinito: `25`)
* [[option_irc.server_default.capabilities]] *irc.server_default.capabilities* * [[option_irc.server_default.capabilities]] *irc.server_default.capabilities*
** descrizione: `comma-separated list of client capabilities to enable for server if they are available; capabilities supported by WeeChat are: multi-prefix, userhost-in-names, away-notify (example: "multi-prefix,userhost-in-names,away-notify")` ** descrizione: `comma-separated list of client capabilities to enable for server if they are available; capabilities supported by WeeChat are: away-notify, multi-prefix, server-time, userhost-in-names (example: "away-notify,multi-prefix")`
** tipo: stringa ** tipo: stringa
** valori: qualsiasi stringa (valore predefinito: `""`) ** valori: qualsiasi stringa (valore predefinito: `""`)
+7
View File
@@ -53,6 +53,10 @@ $HOME/.weechat/weechat.conf::
$HOME/.weechat/plugins.conf:: $HOME/.weechat/plugins.conf::
plugins configuration file plugins configuration file
// TRANSLATION MISSING
$HOME/.weechat/sec.conf::
configuration file with secured data
$HOME/.weechat/alias.conf:: $HOME/.weechat/alias.conf::
configuration file for 'alias' plugin configuration file for 'alias' plugin
@@ -62,6 +66,9 @@ $HOME/.weechat/aspell.conf::
$HOME/.weechat/charset.conf:: $HOME/.weechat/charset.conf::
configuration file for 'charset' plugin configuration file for 'charset' plugin
$HOME/.weechat/exec.conf::
configuration file for 'exec' plugin
$HOME/.weechat/irc.conf:: $HOME/.weechat/irc.conf::
configuration file for 'irc' plugin configuration file for 'irc' plugin
+1 -1
View File
@@ -18,7 +18,7 @@ listdict: インストール済み辞書を表示
いくつかのコマンドを除いて '/' で始まる入力行はチェックされません (/set aspell.check.commands を参照)。 いくつかのコマンドを除いて '/' で始まる入力行はチェックされません (/set aspell.check.commands を参照)。
全てのバッファで aspell を有効化するには、"default_dict" オプションを設定した後に、aspell を有効化してください。例えば: 全てのバッファで aspell を有効化するには、"default_dict" オプションを設定した後に、aspell を有効化してください。例:
/set aspell.check.default_dict "en" /set aspell.check.default_dict "en"
/aspell enable /aspell enable
+1 -1
View File
@@ -684,7 +684,7 @@ listfull: 詳細情報を含めてサーバをリストアップ
hostname: サーバのホスト名か IP アドレス、ポート番号は任意 (デフォルト: 6667)、複数のアドレスはコンマで区切る hostname: サーバのホスト名か IP アドレス、ポート番号は任意 (デフォルト: 6667)、複数のアドレスはコンマで区切る
temp: 一時的なサーバを作成 (保存されない) temp: 一時的なサーバを作成 (保存されない)
option: サーバのオプションを設定 (ブールオプションでは値が無視される) option: サーバのオプションを設定 (ブールオプションでは値が無視される)
nooption: ブールオプションを 'off' に設定 (例えば: -nossl) nooption: ブールオプションを 'off' に設定 (例: -nossl)
copy: サーバを複製 copy: サーバを複製
rename: サーバをリネーム rename: サーバをリネーム
keep: 設定ファイルにサーバを保存 (一時的なサーバ用) keep: 設定ファイルにサーバを保存 (一時的なサーバ用)
+4 -4
View File
@@ -269,7 +269,7 @@
** 値: on, off (デフォルト値: `on`) ** 値: on, off (デフォルト値: `on`)
* [[option_irc.look.notice_welcome_tags]] *irc.look.notice_welcome_tags* * [[option_irc.look.notice_welcome_tags]] *irc.look.notice_welcome_tags*
** 説明: `ようこそ通知に使われ、チャンネルに転送するタグのコンマ区切りリスト、例えば: "notify_private"` ** 説明: `ようこそ通知に使われ、チャンネルに転送するタグのコンマ区切りリスト、例: "notify_private"`
** タイプ: 文字列 ** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `""`) ** 値: 未制約文字列 (デフォルト値: `""`)
@@ -279,7 +279,7 @@
** 値: 未制約文字列 (デフォルト値: `"notify_message"`) ** 値: 未制約文字列 (デフォルト値: `"notify_message"`)
* [[option_irc.look.notify_tags_whois]] *irc.look.notify_tags_whois* * [[option_irc.look.notify_tags_whois]] *irc.look.notify_tags_whois*
** 説明: `ニックネームの離席状態に変化があった場合の (whois コマンドの結果)、notify によって表示されたメッセージに使われたタグのコンマ区切りリスト、例えば: "notify_message"、"notify_private"、"notify_highlight"` ** 説明: `ニックネームの離席状態に変化があった場合の (whois コマンドの結果)、notify によって表示されたメッセージに使われたタグのコンマ区切りリスト、例: "notify_message"、"notify_private"、"notify_highlight"`
** タイプ: 文字列 ** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `"notify_message"`) ** 値: 未制約文字列 (デフォルト値: `"notify_message"`)
@@ -294,7 +294,7 @@
** 値: independent, merge_by_server, merge_all (デフォルト値: `independent`) ** 値: independent, merge_by_server, merge_all (デフォルト値: `independent`)
* [[option_irc.look.pv_tags]] *irc.look.pv_tags* * [[option_irc.look.pv_tags]] *irc.look.pv_tags*
** 説明: `プライベートメッセージに使われたタグのコンマ区切りリスト、例えば: "notify_message"、"notify_private"、"notify_highlight"` ** 説明: `プライベートメッセージに使われたタグのコンマ区切りリスト、例: "notify_message"、"notify_private"、"notify_highlight"`
** タイプ: 文字列 ** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `"notify_private"`) ** 値: 未制約文字列 (デフォルト値: `"notify_private"`)
@@ -479,7 +479,7 @@
** 値: 0 .. 1000000 (デフォルト値: `25`) ** 値: 0 .. 1000000 (デフォルト値: `25`)
* [[option_irc.server_default.capabilities]] *irc.server_default.capabilities* * [[option_irc.server_default.capabilities]] *irc.server_default.capabilities*
** 説明: `サーバで利用可能ならば有効化する "client capabilities" のコンマ区切りリスト; WeeChat で利用できる機能: multi-prefix、userhost-in-namesaway-notify (例: "multi-prefix,userhost-in-names,away-notify")` ** 説明: `サーバで利用可能ならば有効化する "client capabilities" のコンマ区切りリスト; WeeChat で利用できる機能: away-notify、multi-prefix、server-time、userhost-in-names (例: "away-notify,multi-prefix")`
** タイプ: 文字列 ** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `""`) ** 値: 未制約文字列 (デフォルト値: `""`)
@@ -147,7 +147,7 @@ localvar: 現在のバッファのローカル変数を表示
alias: ある色に別名を追加 alias: ある色に別名を追加
unalias: 別名の削除 unalias: 別名の削除
color: カラー番号 (0 以上、最大値はターミナル依存、多くの場合 63 か 255) color: カラー番号 (0 以上、最大値はターミナル依存、多くの場合 63 か 255)
name: カラーの別名 (例えば: "orange") name: カラーの別名 (例: "orange")
reset: 全てのカラーペアをリセット (自動的なリセットが無効化されており、これ以上のカラーペアが利用できない場合に必要、オプション weechat.look.color_pairs_auto_reset を参照) reset: 全てのカラーペアをリセット (自動的なリセットが無効化されており、これ以上のカラーペアが利用できない場合に必要、オプション weechat.look.color_pairs_auto_reset を参照)
term2rgb: ターミナル色 (0-255) を RGB 色に変換 term2rgb: ターミナル色 (0-255) を RGB 色に変換
rgb2term: RGB 色をターミナル色 (0-255) に変換 rgb2term: RGB 色をターミナル色 (0-255) に変換
@@ -254,7 +254,7 @@ expression: 評価する式、フォーマット、${variable} 型のフォー
式が NULL でない場合、空でない場合、"0" でない場合、式は "真" と評価されます。 式が NULL でない場合、空でない場合、"0" でない場合、式は "真" と評価されます。
両方の式が有効な整数である場合、比較は整数を使って行われます。 両方の式が有効な整数である場合、比較は整数を使って行われます。
文字列比較を強制するには、それぞれの式をダブルクォートで囲みます、例えば: 文字列比較を強制するには、それぞれの式をダブルクォートで囲みます、例:
50 > 100 ==> 0 50 > 100 ==> 0
"50" > "100" ==> 1 "50" > "100" ==> 1
@@ -936,7 +936,7 @@ scroll_unread: 未読マーカにスクロール
zoom: ウィンドウを拡大 zoom: ウィンドウを拡大
bare: 最小限表示を切り替える (自動的に標準表示モードに戻るまでの時間を秒単位で任意指定) bare: 最小限表示を切り替える (自動的に標準表示モードに戻るまでの時間を秒単位で任意指定)
splith と splitv に関しては、pct は新しいウィンドウのパーセンテージで、現在のウィンドウサイズに対する割合で計算されます。例えば25 は size = current_size / 4 の新しいウィンドウを作成します。 splith と splitv に関しては、pct は新しいウィンドウのパーセンテージで、現在のウィンドウサイズに対する割合で計算されます。例えば 25 は size = current_size / 4 の新しいウィンドウを作成します。
例: 例:
バッファ #1 を表示しているウィンドウに移動: バッファ #1 を表示しているウィンドウに移動:
+1 -1
View File
@@ -104,7 +104,7 @@
** 値: 0 .. 256 (デフォルト値: `20`) ** 値: 0 .. 256 (デフォルト値: `20`)
* [[option_xfer.look.pv_tags]] *xfer.look.pv_tags* * [[option_xfer.look.pv_tags]] *xfer.look.pv_tags*
** 説明: `プライベートメッセージに使われたタグのコンマ区切りリスト、例えば: "notify_message"、"notify_private"、"notify_highlight"` ** 説明: `プライベートメッセージに使われたタグのコンマ区切りリスト、例: "notify_message"、"notify_private"、"notify_highlight"`
** タイプ: 文字列 ** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `"notify_private"`) ** 値: 未制約文字列 (デフォルト値: `"notify_private"`)
+6
View File
@@ -51,6 +51,9 @@ $HOME/.weechat/weechat.conf::
$HOME/.weechat/plugins.conf:: $HOME/.weechat/plugins.conf::
プラグイン設定ファイル プラグイン設定ファイル
$HOME/.weechat/sec.conf::
保護されたデータを含む設定ファイル
$HOME/.weechat/alias.conf:: $HOME/.weechat/alias.conf::
'alias' プラグイン用の設定ファイル 'alias' プラグイン用の設定ファイル
@@ -60,6 +63,9 @@ $HOME/.weechat/aspell.conf::
$HOME/.weechat/charset.conf:: $HOME/.weechat/charset.conf::
'charset' プラグイン用の設定ファイル 'charset' プラグイン用の設定ファイル
$HOME/.weechat/exec.conf::
'exec' プラグイン用の設定ファイル
$HOME/.weechat/irc.conf:: $HOME/.weechat/irc.conf::
'irc' プラグイン用の設定ファイル 'irc' プラグイン用の設定ファイル
+4 -4
View File
@@ -290,10 +290,10 @@ WeeChat "core" は以下のディレクトリに配置されています:
[width="100%",cols="1v,5",options="header"] [width="100%",cols="1v,5",options="header"]
|=== |===
| パス/ファイル名 | 説明 | パス/ファイル名 | 説明
| tests/ | テストのルートディレクトリ | tests/ | テストのルートディレクトリ
| tests.cpp | Program used to run tests | tests.cpp | テスト実行に使うプログラム
| unit/ | 単体テストのルートディレクトリ | unit/ | 単体テストのルートディレクトリ
| core/ | Root of unit tests for core | core/ | core 向け単体テスト用のルートディレクトリ
| test-eval.cpp | テスト: 式の評価 | test-eval.cpp | テスト: 式の評価
| test-hashtble.cpp | テスト: ハッシュテーブル | test-hashtble.cpp | テスト: ハッシュテーブル
| test-hdata.cpp | テスト: hdata | test-hdata.cpp | テスト: hdata
+1 -1
View File
@@ -479,7 +479,7 @@
** wartości: 0 .. 1000000 (domyślna wartość: `25`) ** wartości: 0 .. 1000000 (domyślna wartość: `25`)
* [[option_irc.server_default.capabilities]] *irc.server_default.capabilities* * [[option_irc.server_default.capabilities]] *irc.server_default.capabilities*
** opis: `oddzielona przecinkami lista opcji klienta do włączenia dla serwera, jeśli są dostępne; opcje wspierane przez WeeChat: multi-prefix, userhost-in-names, away-notify (przykład: "multi-prefix,userhost-in-names,away-notify")` ** opis: `oddzielona przecinkami lista opcji klienta do włączenia dla serwera, jeśli są dostępne; opcje wspierane przez WeeChat: away-notify, multi-prefix, server-time, userhost-in-names (przykład: "away-notify,multi-prefix")`
** typ: ciąg ** typ: ciąg
** wartości: dowolny ciąg (domyślna wartość: `""`) ** wartości: dowolny ciąg (domyślna wartość: `""`)
+6
View File
@@ -52,6 +52,9 @@ $HOME/.weechat/weechat.conf::
$HOME/.weechat/plugins.conf:: $HOME/.weechat/plugins.conf::
plik konfiguracyjny wtyczek plik konfiguracyjny wtyczek
$HOME/.weechat/sec.conf::
plik konfiguracyjny z zabezpieczonymi danymi
$HOME/.weechat/alias.conf:: $HOME/.weechat/alias.conf::
plik konfiguracyjny wtyczki 'alias' plik konfiguracyjny wtyczki 'alias'
@@ -61,6 +64,9 @@ $HOME/.weechat/aspell.conf::
$HOME/.weechat/charset.conf:: $HOME/.weechat/charset.conf::
plik konfiguracyjny wtyczki 'charset' plik konfiguracyjny wtyczki 'charset'
$HOME/.weechat/exec.conf::
plik konfiguracyjny wtyczki 'exec'
$HOME/.weechat/irc.conf:: $HOME/.weechat/irc.conf::
plik konfiguracyjny wtyczki 'irc' plik konfiguracyjny wtyczki 'irc'
+9 -3
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat\n" "Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-08-02 16:12+0200\n" "POT-Creation-Date: 2014-09-20 14:54+0200\n"
"PO-Revision-Date: 2014-07-25 07:49+0200\n" "PO-Revision-Date: 2014-07-25 07:49+0200\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n" "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6617,8 +6617,8 @@ msgstr "příkaz spuštěný při startu WeeChat, před načtením pluginů"
#. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po) #. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
msgid "" msgid ""
"comma-separated list of client capabilities to enable for server if they are " "comma-separated list of client capabilities to enable for server if they are "
"available; capabilities supported by WeeChat are: multi-prefix, userhost-in-" "available; capabilities supported by WeeChat are: away-notify, multi-prefix, "
"names, away-notify (example: \"multi-prefix,userhost-in-names,away-notify\")" "server-time, userhost-in-names (example: \"away-notify,multi-prefix\")"
msgstr "" msgstr ""
msgid "" msgid ""
@@ -9981,6 +9981,12 @@ msgstr "Žádné rmodifikátory nejsou definovány"
msgid "List of default triggers:" msgid "List of default triggers:"
msgstr "Seznam aliasů:" msgstr "Seznam aliasů:"
#, c-format
msgid ""
"%s%s: action \"%s\" can not be executed on trigger \"%s\" because it is "
"currently running"
msgstr ""
#, fuzzy, c-format #, fuzzy, c-format
msgid "Trigger \"%s\" restarted" msgid "Trigger \"%s\" restarted"
msgstr "Pole \"%s\" vytvořeno" msgstr "Pole \"%s\" vytvořeno"
+14 -6
View File
@@ -22,8 +22,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat\n" "Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-07-25 20:37+0200\n" "POT-Creation-Date: 2014-09-20 14:54+0200\n"
"PO-Revision-Date: 2014-07-25 09:12+0100\n" "PO-Revision-Date: 2014-09-20 15:52+0100\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n" "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <weechatter@arcor.de>\n" "Language-Team: German <weechatter@arcor.de>\n"
"Language: de_DE\n" "Language: de_DE\n"
@@ -7514,13 +7514,13 @@ msgstr "Passwort für Server (Hinweis: Inhalt wird evaluiert, siehe /help eval)"
#. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po) #. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
msgid "" msgid ""
"comma-separated list of client capabilities to enable for server if they are " "comma-separated list of client capabilities to enable for server if they are "
"available; capabilities supported by WeeChat are: multi-prefix, userhost-in-" "available; capabilities supported by WeeChat are: away-notify, multi-prefix, "
"names, away-notify (example: \"multi-prefix,userhost-in-names,away-notify\")" "server-time, userhost-in-names (example: \"away-notify,multi-prefix\")"
msgstr "" msgstr ""
"durch Kommata getrennte Liste von erweiterten Client Fähigkeiten (\"client " "durch Kommata getrennte Liste von erweiterten Client Fähigkeiten (\"client "
"capabilities\"), welche vom Server angeboten und genutzt werden sollen. " "capabilities\"), welche vom Server angeboten und genutzt werden sollen. "
"Fähigkeiten die von WeeChat unterstützt werden: multi-prefix, userhost-in-" "Fähigkeiten die von WeeChat unterstützt werden: away-notify, multi-prefix, "
"name, away-notify (Beispiel: \"multi-prefix, userhost-in-name,away-notify\")" "server-time, userhost-in-names (Beispiel: \"away-notify,multi-prefix\")"
msgid "" msgid ""
"mechanism for SASL authentication: \"plain\" for plain text password, \"dh-" "mechanism for SASL authentication: \"plain\" for plain text password, \"dh-"
@@ -11224,6 +11224,14 @@ msgstr "Kein Trigger definiert"
msgid "List of default triggers:" msgid "List of default triggers:"
msgstr "Liste der standardmäßigen Trigger:" msgstr "Liste der standardmäßigen Trigger:"
#, c-format
msgid ""
"%s%s: action \"%s\" can not be executed on trigger \"%s\" because it is "
"currently running"
msgstr ""
"%s%s: Aktion \"%s\" kann nicht auf Trigger \"%s\" angewendet werden, da er "
"zur Zeit ausgeführt wird"
#, c-format #, c-format
msgid "Trigger \"%s\" restarted" msgid "Trigger \"%s\" restarted"
msgstr "Trigger \"%s\" neu gestartet" msgstr "Trigger \"%s\" neu gestartet"
+9 -3
View File
@@ -22,7 +22,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat\n" "Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-07-25 20:37+0200\n" "POT-Creation-Date: 2014-09-20 14:54+0200\n"
"PO-Revision-Date: 2014-07-25 07:49+0200\n" "PO-Revision-Date: 2014-07-25 07:49+0200\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n" "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6853,8 +6853,8 @@ msgstr "comando ejecutado cuando WeeChat inicia, antes de cargar los plugins"
#, fuzzy #, fuzzy
msgid "" msgid ""
"comma-separated list of client capabilities to enable for server if they are " "comma-separated list of client capabilities to enable for server if they are "
"available; capabilities supported by WeeChat are: multi-prefix, userhost-in-" "available; capabilities supported by WeeChat are: away-notify, multi-prefix, "
"names, away-notify (example: \"multi-prefix,userhost-in-names,away-notify\")" "server-time, userhost-in-names (example: \"away-notify,multi-prefix\")"
msgstr "" msgstr ""
"lista separada por comas de capabilidades del cliente (\"client capabilities" "lista separada por comas de capabilidades del cliente (\"client capabilities"
"\") para habilitar en el servidor si están disponibles (ejemplo: \"multi-" "\") para habilitar en el servidor si están disponibles (ejemplo: \"multi-"
@@ -10256,6 +10256,12 @@ msgstr "Ningún modificador regular definido"
msgid "List of default triggers:" msgid "List of default triggers:"
msgstr "Lista de alias:" msgstr "Lista de alias:"
#, c-format
msgid ""
"%s%s: action \"%s\" can not be executed on trigger \"%s\" because it is "
"currently running"
msgstr ""
#, fuzzy, c-format #, fuzzy, c-format
msgid "Trigger \"%s\" restarted" msgid "Trigger \"%s\" restarted"
msgstr "Barra \"%s\" creada" msgstr "Barra \"%s\" creada"
+15 -7
View File
@@ -21,8 +21,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat\n" "Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-07-25 20:37+0200\n" "POT-Creation-Date: 2014-09-20 14:54+0200\n"
"PO-Revision-Date: 2014-07-25 07:49+0200\n" "PO-Revision-Date: 2014-09-20 14:57+0200\n"
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: fr\n" "Language: fr\n"
@@ -2569,7 +2569,7 @@ msgstr ""
" afficher la valeur de la variable d'environnement LANG :\n" " afficher la valeur de la variable d'environnement LANG :\n"
" /set env LANG\n" " /set env LANG\n"
" modifier la variable d'environnement LANG et l'utiliser :\n" " modifier la variable d'environnement LANG et l'utiliser :\n"
" /set env LANG=fr_FR.UTF-8\n" " /set env LANG fr_FR.UTF-8\n"
" /upgrade\n" " /upgrade\n"
" réinitialiser la variable d'environnement ABC :\n" " réinitialiser la variable d'environnement ABC :\n"
" /set env ABC \"\"" " /set env ABC \"\""
@@ -7362,13 +7362,13 @@ msgstr ""
#. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po) #. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
msgid "" msgid ""
"comma-separated list of client capabilities to enable for server if they are " "comma-separated list of client capabilities to enable for server if they are "
"available; capabilities supported by WeeChat are: multi-prefix, userhost-in-" "available; capabilities supported by WeeChat are: away-notify, multi-prefix, "
"names, away-notify (example: \"multi-prefix,userhost-in-names,away-notify\")" "server-time, userhost-in-names (example: \"away-notify,multi-prefix\")"
msgstr "" msgstr ""
"liste séparée par des virgules de capacités client (\"client capabilities\") " "liste séparée par des virgules de capacités client (\"client capabilities\") "
"à activer sur le serveur si elles sont disponibles ; les capacités " "à activer sur le serveur si elles sont disponibles ; les capacités "
"supportées par WeeChat sont : multi-prefix, userhost-in-names, away-notify " "supportées par WeeChat sont : away-notify, multi-prefix, server-time, "
"(exemple : \"multi-prefix,userhost-in-names,away-notify\")" "userhost-in-names (exemple : \"away-notify,multi-prefix\")"
msgid "" msgid ""
"mechanism for SASL authentication: \"plain\" for plain text password, \"dh-" "mechanism for SASL authentication: \"plain\" for plain text password, \"dh-"
@@ -10976,6 +10976,14 @@ msgstr "Pas de trigger défini"
msgid "List of default triggers:" msgid "List of default triggers:"
msgstr "Liste des triggers par défaut :" msgstr "Liste des triggers par défaut :"
#, c-format
msgid ""
"%s%s: action \"%s\" can not be executed on trigger \"%s\" because it is "
"currently running"
msgstr ""
"%s%s : l'action \"%s\" ne peut pas être exécutée sur le trigger \"%s\" car "
"il est actuellement en cours d'exécution"
#, c-format #, c-format
msgid "Trigger \"%s\" restarted" msgid "Trigger \"%s\" restarted"
msgstr "Trigger \"%s\" redémarré" msgstr "Trigger \"%s\" redémarré"
+9 -3
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat\n" "Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-08-02 16:12+0200\n" "POT-Creation-Date: 2014-09-20 14:54+0200\n"
"PO-Revision-Date: 2014-07-25 07:49+0200\n" "PO-Revision-Date: 2014-07-25 07:49+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6115,8 +6115,8 @@ msgstr ""
#. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po) #. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
msgid "" msgid ""
"comma-separated list of client capabilities to enable for server if they are " "comma-separated list of client capabilities to enable for server if they are "
"available; capabilities supported by WeeChat are: multi-prefix, userhost-in-" "available; capabilities supported by WeeChat are: away-notify, multi-prefix, "
"names, away-notify (example: \"multi-prefix,userhost-in-names,away-notify\")" "server-time, userhost-in-names (example: \"away-notify,multi-prefix\")"
msgstr "" msgstr ""
msgid "" msgid ""
@@ -9356,6 +9356,12 @@ msgstr "Nincs aliasz definiálva.\n"
msgid "List of default triggers:" msgid "List of default triggers:"
msgstr "Aliaszok listája:\n" msgstr "Aliaszok listája:\n"
#, c-format
msgid ""
"%s%s: action \"%s\" can not be executed on trigger \"%s\" because it is "
"currently running"
msgstr ""
#, fuzzy, c-format #, fuzzy, c-format
msgid "Trigger \"%s\" restarted" msgid "Trigger \"%s\" restarted"
msgstr "A \"%s\" => \"%s\" aliasz elkészült\n" msgstr "A \"%s\" => \"%s\" aliasz elkészült\n"
+9 -3
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat\n" "Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-07-25 20:37+0200\n" "POT-Creation-Date: 2014-09-20 14:54+0200\n"
"PO-Revision-Date: 2014-07-25 07:49+0200\n" "PO-Revision-Date: 2014-07-25 07:49+0200\n"
"Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n" "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6997,8 +6997,8 @@ msgstr ""
#. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po) #. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
msgid "" msgid ""
"comma-separated list of client capabilities to enable for server if they are " "comma-separated list of client capabilities to enable for server if they are "
"available; capabilities supported by WeeChat are: multi-prefix, userhost-in-" "available; capabilities supported by WeeChat are: away-notify, multi-prefix, "
"names, away-notify (example: \"multi-prefix,userhost-in-names,away-notify\")" "server-time, userhost-in-names (example: \"away-notify,multi-prefix\")"
msgstr "" msgstr ""
msgid "" msgid ""
@@ -10434,6 +10434,12 @@ msgstr "Nessun rmodifier definito"
msgid "List of default triggers:" msgid "List of default triggers:"
msgstr "Elenco degli alias:" msgstr "Elenco degli alias:"
#, c-format
msgid ""
"%s%s: action \"%s\" can not be executed on trigger \"%s\" because it is "
"currently running"
msgstr ""
#, fuzzy, c-format #, fuzzy, c-format
msgid "Trigger \"%s\" restarted" msgid "Trigger \"%s\" restarted"
msgstr "Barra \"%s\" creata" msgstr "Barra \"%s\" creata"
+24 -16
View File
@@ -20,8 +20,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat\n" "Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-08-02 16:12+0200\n" "POT-Creation-Date: 2014-09-20 14:54+0200\n"
"PO-Revision-Date: 2014-08-03 00:32+0900\n" "PO-Revision-Date: 2014-09-20 23:10+0900\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n" "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/weechat/tree/translation_ja>\n" "Language-Team: Japanese <https://github.com/l/weechat/tree/translation_ja>\n"
"Language: ja\n" "Language: ja\n"
@@ -1266,7 +1266,7 @@ msgstr ""
" alias: ある色に別名を追加\n" " alias: ある色に別名を追加\n"
" unalias: 別名の削除\n" " unalias: 別名の削除\n"
" color: カラー番号 (0 以上、最大値はターミナル依存、多くの場合 63 か 255)\n" " color: カラー番号 (0 以上、最大値はターミナル依存、多くの場合 63 か 255)\n"
" name: カラーの別名 (例えば: \"orange\")\n" " name: カラーの別名 (例: \"orange\")\n"
" reset: 全てのカラーペアをリセット (自動的なリセットが無効化されており、こ" " reset: 全てのカラーペアをリセット (自動的なリセットが無効化されており、こ"
"れ以上のカラーペアが利用できない場合に必要、オプション weechat.look." "れ以上のカラーペアが利用できない場合に必要、オプション weechat.look."
"color_pairs_auto_reset を参照)\n" "color_pairs_auto_reset を参照)\n"
@@ -1498,7 +1498,7 @@ msgstr ""
"式が NULL でない場合、空でない場合、\"0\" でない場合、式は \"真\" と評価され" "式が NULL でない場合、空でない場合、\"0\" でない場合、式は \"真\" と評価され"
"ます。\n" "ます。\n"
"両方の式が有効な整数である場合、比較は整数を使って行われます。\n" "両方の式が有効な整数である場合、比較は整数を使って行われます。\n"
"文字列比較を強制するには、それぞれの式をダブルクォートで囲みます、例えば:\n" "文字列比較を強制するには、それぞれの式をダブルクォートで囲みます、例:\n"
" 50 > 100 ==> 0\n" " 50 > 100 ==> 0\n"
" \"50\" > \"100\" ==> 1\n" " \"50\" > \"100\" ==> 1\n"
"\n" "\n"
@@ -2797,7 +2797,7 @@ msgstr ""
"を秒単位で任意指定)\n" "を秒単位で任意指定)\n"
"\n" "\n"
"splith と splitv に関しては、pct は新しいウィンドウのパーセンテージで、現在の" "splith と splitv に関しては、pct は新しいウィンドウのパーセンテージで、現在の"
"ウィンドウサイズに対する割合で計算されます。例えば25 は size = " "ウィンドウサイズに対する割合で計算されます。例えば 25 は size = "
"current_size / 4 の新しいウィンドウを作成します。\n" "current_size / 4 の新しいウィンドウを作成します。\n"
"\n" "\n"
"例:\n" "例:\n"
@@ -4506,7 +4506,7 @@ msgid ""
msgstr "" msgstr ""
"バーを表示する条件 (\"window\" タイプのバー): 単純な条件: \"active" "バーを表示する条件 (\"window\" タイプのバー): 単純な条件: \"active"
"\"、\"inactive\"、\"nicklist\" (ウィンドウはアクティブ/非アクティブ、バッファ" "\"、\"inactive\"、\"nicklist\" (ウィンドウはアクティブ/非アクティブ、バッファ"
"にはニックネームリストが含まれる)、条件式 (/help eval を参照)、例えば: " "にはニックネームリストが含まれる)、条件式 (/help eval を参照)、例: "
"\"${nicklist} && ${window.win_width} > 100\" (式のローカル変数は " "\"${nicklist} && ${window.win_width} > 100\" (式のローカル変数は "
"${active}、${inactive}、${nicklist})" "${active}、${inactive}、${nicklist})"
@@ -4867,7 +4867,7 @@ msgstr ""
"aspell.check.commands を参照)。\n" "aspell.check.commands を参照)。\n"
"\n" "\n"
"全てのバッファで aspell を有効化するには、\"default_dict\" オプションを設定し" "全てのバッファで aspell を有効化するには、\"default_dict\" オプションを設定し"
"た後に、aspell を有効化してください。例えば:\n" "た後に、aspell を有効化してください。例:\n"
" /set aspell.check.default_dict \"en\"\n" " /set aspell.check.default_dict \"en\"\n"
" /aspell enable\n" " /aspell enable\n"
"\n" "\n"
@@ -6670,7 +6670,7 @@ msgstr ""
"6667)、複数のアドレスはコンマで区切る\n" "6667)、複数のアドレスはコンマで区切る\n"
" temp: 一時的なサーバを作成 (保存されない)\n" " temp: 一時的なサーバを作成 (保存されない)\n"
" option: サーバのオプションを設定 (ブールオプションでは値が無視される)\n" " option: サーバのオプションを設定 (ブールオプションでは値が無視される)\n"
"nooption: ブールオプションを 'off' に設定 (例えば: -nossl)\n" "nooption: ブールオプションを 'off' に設定 (例: -nossl)\n"
" copy: サーバを複製\n" " copy: サーバを複製\n"
" rename: サーバをリネーム\n" " rename: サーバをリネーム\n"
" keep: 設定ファイルにサーバを保存 (一時的なサーバ用)\n" " keep: 設定ファイルにサーバを保存 (一時的なサーバ用)\n"
@@ -7077,12 +7077,12 @@ msgstr ""
#. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po) #. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
msgid "" msgid ""
"comma-separated list of client capabilities to enable for server if they are " "comma-separated list of client capabilities to enable for server if they are "
"available; capabilities supported by WeeChat are: multi-prefix, userhost-in-" "available; capabilities supported by WeeChat are: away-notify, multi-prefix, "
"names, away-notify (example: \"multi-prefix,userhost-in-names,away-notify\")" "server-time, userhost-in-names (example: \"away-notify,multi-prefix\")"
msgstr "" msgstr ""
"サーバで利用可能ならば有効化する \"client capabilities\" のコンマ区切りリス" "サーバで利用可能ならば有効化する \"client capabilities\" のコンマ区切りリス"
"ト; WeeChat で利用できる機能: multi-prefix、userhost-in-names、away-notify " "ト; WeeChat で利用できる機能: away-notify、multi-prefix、server-time、"
"(例: \"multi-prefix,userhost-in-names,away-notify\")" "userhost-in-names (例: \"away-notify,multi-prefix\")"
msgid "" msgid ""
"mechanism for SASL authentication: \"plain\" for plain text password, \"dh-" "mechanism for SASL authentication: \"plain\" for plain text password, \"dh-"
@@ -7530,7 +7530,7 @@ msgid ""
"comma separated list of tags used in a welcome notices redirected to a " "comma separated list of tags used in a welcome notices redirected to a "
"channel, for example: \"notify_private\"" "channel, for example: \"notify_private\""
msgstr "" msgstr ""
"ようこそ通知に使われ、チャンネルに転送するタグのコンマ区切りリスト、例えば: " "ようこそ通知に使われ、チャンネルに転送するタグのコンマ区切りリスト、例: "
"\"notify_private\"" "\"notify_private\""
msgid "" msgid ""
@@ -7548,7 +7548,7 @@ msgid ""
"\"notify_message\", \"notify_private\" or \"notify_highlight\"" "\"notify_message\", \"notify_private\" or \"notify_highlight\""
msgstr "" msgstr ""
"ニックネームの離席状態に変化があった場合の (whois コマンドの結果)、notify に" "ニックネームの離席状態に変化があった場合の (whois コマンドの結果)、notify に"
"よって表示されたメッセージに使われたタグのコンマ区切りリスト、例えば: " "よって表示されたメッセージに使われたタグのコンマ区切りリスト、例: "
"\"notify_message\"、\"notify_private\"、\"notify_highlight\"" "\"notify_message\"、\"notify_private\"、\"notify_highlight\""
msgid "close buffer when /part is issued on a channel" msgid "close buffer when /part is issued on a channel"
@@ -7561,7 +7561,7 @@ msgid ""
"comma separated list of tags used in private messages, for example: " "comma separated list of tags used in private messages, for example: "
"\"notify_message\", \"notify_private\" or \"notify_highlight\"" "\"notify_message\", \"notify_private\" or \"notify_highlight\""
msgstr "" msgstr ""
"プライベートメッセージに使われたタグのコンマ区切りリスト、例えば: " "プライベートメッセージに使われたタグのコンマ区切りリスト、例: "
"\"notify_message\"、\"notify_private\"、\"notify_highlight\"" "\"notify_message\"、\"notify_private\"、\"notify_highlight\""
msgid "" msgid ""
@@ -10569,9 +10569,17 @@ msgstr "トリガは定義されていません"
msgid "List of default triggers:" msgid "List of default triggers:"
msgstr "デフォルトトリガのリスト:" msgstr "デフォルトトリガのリスト:"
#, c-format
msgid ""
"%s%s: action \"%s\" can not be executed on trigger \"%s\" because it is "
"currently running"
msgstr ""
"%1$s%2$s: トリガ \"%4$s\" に対するアクション \"%3$s\" は現在実行中であるため"
"実行できません"
#, c-format #, c-format
msgid "Trigger \"%s\" restarted" msgid "Trigger \"%s\" restarted"
msgstr "トリガ \"%s\" 再開されました" msgstr "トリガ \"%s\" 再開ました"
#, c-format #, c-format
msgid "%s%s: a disabled trigger can not be restarted" msgid "%s%s: a disabled trigger can not be restarted"
+14 -6
View File
@@ -21,8 +21,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat\n" "Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-07-25 20:37+0200\n" "POT-Creation-Date: 2014-09-20 14:54+0200\n"
"PO-Revision-Date: 2014-08-13 21:27+0100\n" "PO-Revision-Date: 2014-09-20 16:27+0100\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n" "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: pl\n" "Language: pl\n"
@@ -7217,12 +7217,12 @@ msgstr "hasło dla serwera ( zawartość jest przetwarzana, zobacz /help eval)"
#. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po) #. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
msgid "" msgid ""
"comma-separated list of client capabilities to enable for server if they are " "comma-separated list of client capabilities to enable for server if they are "
"available; capabilities supported by WeeChat are: multi-prefix, userhost-in-" "available; capabilities supported by WeeChat are: away-notify, multi-prefix, "
"names, away-notify (example: \"multi-prefix,userhost-in-names,away-notify\")" "server-time, userhost-in-names (example: \"away-notify,multi-prefix\")"
msgstr "" msgstr ""
"oddzielona przecinkami lista opcji klienta do włączenia dla serwera, jeśli " "oddzielona przecinkami lista opcji klienta do włączenia dla serwera, jeśli "
"są dostępne; opcje wspierane przez WeeChat: multi-prefix, userhost-in-names, " "są dostępne; opcje wspierane przez WeeChat: away-notify, multi-prefix, "
"away-notify (przykład: \"multi-prefix,userhost-in-names,away-notify\")" "server-time, userhost-in-names (przykład: \"away-notify,multi-prefix\")"
msgid "" msgid ""
"mechanism for SASL authentication: \"plain\" for plain text password, \"dh-" "mechanism for SASL authentication: \"plain\" for plain text password, \"dh-"
@@ -10762,6 +10762,14 @@ msgstr "Nie zdefiniowano triggerów"
msgid "List of default triggers:" msgid "List of default triggers:"
msgstr "Lista domyślnych triggerów:" msgstr "Lista domyślnych triggerów:"
#, c-format
msgid ""
"%s%s: action \"%s\" can not be executed on trigger \"%s\" because it is "
"currently running"
msgstr ""
"%s%s: akcja \"%s\" nie może zostać wykonana na trigerze \"%s\" ponieważ jest "
"on aktualnie wykonywany"
#, c-format #, c-format
msgid "Trigger \"%s\" restarted" msgid "Trigger \"%s\" restarted"
msgstr "Trigger \"%s\" został zrestartowany" msgstr "Trigger \"%s\" został zrestartowany"
+9 -3
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat\n" "Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-08-02 16:12+0200\n" "POT-Creation-Date: 2014-09-20 14:54+0200\n"
"PO-Revision-Date: 2014-07-14 18:44+0200\n" "PO-Revision-Date: 2014-07-14 18:44+0200\n"
"Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n" "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6358,8 +6358,8 @@ msgstr ""
#. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po) #. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
msgid "" msgid ""
"comma-separated list of client capabilities to enable for server if they are " "comma-separated list of client capabilities to enable for server if they are "
"available; capabilities supported by WeeChat are: multi-prefix, userhost-in-" "available; capabilities supported by WeeChat are: away-notify, multi-prefix, "
"names, away-notify (example: \"multi-prefix,userhost-in-names,away-notify\")" "server-time, userhost-in-names (example: \"away-notify,multi-prefix\")"
msgstr "" msgstr ""
msgid "" msgid ""
@@ -9626,6 +9626,12 @@ msgstr "Nenhuma rmodifier definido"
msgid "List of default triggers:" msgid "List of default triggers:"
msgstr "Lista de atalhos:" msgstr "Lista de atalhos:"
#, c-format
msgid ""
"%s%s: action \"%s\" can not be executed on trigger \"%s\" because it is "
"currently running"
msgstr ""
#, fuzzy, c-format #, fuzzy, c-format
msgid "Trigger \"%s\" restarted" msgid "Trigger \"%s\" restarted"
msgstr "Barra \"%s\" criada" msgstr "Barra \"%s\" criada"
+9 -3
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat\n" "Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-08-02 16:12+0200\n" "POT-Creation-Date: 2014-09-20 14:54+0200\n"
"PO-Revision-Date: 2014-07-25 07:50+0200\n" "PO-Revision-Date: 2014-07-25 07:50+0200\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n" "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6140,8 +6140,8 @@ msgstr ""
#. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po) #. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
msgid "" msgid ""
"comma-separated list of client capabilities to enable for server if they are " "comma-separated list of client capabilities to enable for server if they are "
"available; capabilities supported by WeeChat are: multi-prefix, userhost-in-" "available; capabilities supported by WeeChat are: away-notify, multi-prefix, "
"names, away-notify (example: \"multi-prefix,userhost-in-names,away-notify\")" "server-time, userhost-in-names (example: \"away-notify,multi-prefix\")"
msgstr "" msgstr ""
msgid "" msgid ""
@@ -9382,6 +9382,12 @@ msgstr "Сокращения не заданы.\n"
msgid "List of default triggers:" msgid "List of default triggers:"
msgstr "Список сокращений:\n" msgstr "Список сокращений:\n"
#, c-format
msgid ""
"%s%s: action \"%s\" can not be executed on trigger \"%s\" because it is "
"currently running"
msgstr ""
#, fuzzy, c-format #, fuzzy, c-format
msgid "Trigger \"%s\" restarted" msgid "Trigger \"%s\" restarted"
msgstr "Сокращение \"%s\" => \"%s\" создано\n" msgstr "Сокращение \"%s\" => \"%s\" создано\n"
+9 -3
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat\n" "Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-08-02 16:12+0200\n" "POT-Creation-Date: 2014-09-20 14:54+0200\n"
"PO-Revision-Date: 2014-07-25 07:50+0200\n" "PO-Revision-Date: 2014-07-25 07:50+0200\n"
"Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n" "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5459,8 +5459,8 @@ msgstr ""
#. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po) #. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
msgid "" msgid ""
"comma-separated list of client capabilities to enable for server if they are " "comma-separated list of client capabilities to enable for server if they are "
"available; capabilities supported by WeeChat are: multi-prefix, userhost-in-" "available; capabilities supported by WeeChat are: away-notify, multi-prefix, "
"names, away-notify (example: \"multi-prefix,userhost-in-names,away-notify\")" "server-time, userhost-in-names (example: \"away-notify,multi-prefix\")"
msgstr "" msgstr ""
msgid "" msgid ""
@@ -8443,6 +8443,12 @@ msgstr ""
msgid "List of default triggers:" msgid "List of default triggers:"
msgstr "filtrelerin listesi" msgstr "filtrelerin listesi"
#, c-format
msgid ""
"%s%s: action \"%s\" can not be executed on trigger \"%s\" because it is "
"currently running"
msgstr ""
#, fuzzy, c-format #, fuzzy, c-format
msgid "Trigger \"%s\" restarted" msgid "Trigger \"%s\" restarted"
msgstr "Filtre \"%s\" etkin" msgstr "Filtre \"%s\" etkin"
+12 -7
View File
@@ -19,17 +19,16 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n" "Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-08-02 16:12+0200\n" "POT-Creation-Date: 2014-09-20 14:54+0200\n"
"PO-Revision-Date: 2013-02-14 18:20+0100\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: \n" "Language: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
msgid "any string" msgid "any string"
msgstr "" msgstr ""
@@ -5401,8 +5400,8 @@ msgstr ""
#. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po) #. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
msgid "" msgid ""
"comma-separated list of client capabilities to enable for server if they are " "comma-separated list of client capabilities to enable for server if they are "
"available; capabilities supported by WeeChat are: multi-prefix, userhost-in-" "available; capabilities supported by WeeChat are: away-notify, multi-prefix, "
"names, away-notify (example: \"multi-prefix,userhost-in-names,away-notify\")" "server-time, userhost-in-names (example: \"away-notify,multi-prefix\")"
msgstr "" msgstr ""
msgid "" msgid ""
@@ -8377,6 +8376,12 @@ msgstr ""
msgid "List of default triggers:" msgid "List of default triggers:"
msgstr "" msgstr ""
#, c-format
msgid ""
"%s%s: action \"%s\" can not be executed on trigger \"%s\" because it is "
"currently running"
msgstr ""
#, c-format #, c-format
msgid "Trigger \"%s\" restarted" msgid "Trigger \"%s\" restarted"
msgstr "" msgstr ""
+18 -5
View File
@@ -1835,10 +1835,9 @@ COMMAND_CALLBACK(eval)
{ {
int i, print_only, condition; int i, print_only, condition;
char *result, *ptr_args, *expr, **commands; char *result, *ptr_args, *expr, **commands;
struct t_hashtable *options; struct t_hashtable *pointers, *options;
/* make C compiler happy */ /* make C compiler happy */
(void) buffer;
(void) data; (void) data;
(void) argv; (void) argv;
@@ -1870,12 +1869,24 @@ COMMAND_CALLBACK(eval)
if (ptr_args) if (ptr_args)
{ {
pointers = hashtable_new (32,
WEECHAT_HASHTABLE_STRING,
WEECHAT_HASHTABLE_POINTER,
NULL,
NULL);
if (pointers)
{
hashtable_set (pointers, "window",
gui_window_search_with_buffer (buffer));
hashtable_set (pointers, "buffer", buffer);
}
options = NULL; options = NULL;
if (condition) if (condition)
{ {
options = hashtable_new (32, options = hashtable_new (32,
WEECHAT_HASHTABLE_STRING, WEECHAT_HASHTABLE_STRING,
WEECHAT_HASHTABLE_POINTER, WEECHAT_HASHTABLE_STRING,
NULL, NULL,
NULL); NULL);
if (options) if (options)
@@ -1888,7 +1899,7 @@ COMMAND_CALLBACK(eval)
expr = string_remove_quotes (ptr_args, "\""); expr = string_remove_quotes (ptr_args, "\"");
if (expr) if (expr)
{ {
result = eval_expression (expr, NULL, NULL, options); result = eval_expression (expr, pointers, NULL, options);
gui_chat_printf_date_tags (NULL, 0, "no_log", "\t>> %s", ptr_args); gui_chat_printf_date_tags (NULL, 0, "no_log", "\t>> %s", ptr_args);
if (result) if (result)
{ {
@@ -1911,7 +1922,7 @@ COMMAND_CALLBACK(eval)
} }
else else
{ {
result = eval_expression (ptr_args, NULL, NULL, options); result = eval_expression (ptr_args, pointers, NULL, options);
if (result) if (result)
{ {
commands = string_split_command (result, ';'); commands = string_split_command (result, ';');
@@ -1933,6 +1944,8 @@ COMMAND_CALLBACK(eval)
} }
if (result) if (result)
free (result); free (result);
if (pointers)
hashtable_free (pointers);
if (options) if (options)
hashtable_free (options); hashtable_free (options);
} }
+3 -3
View File
@@ -562,11 +562,11 @@ hdata_move (struct t_hdata *hdata, void *pointer, int count)
for (i = 0; i < abs_count; i++) for (i = 0; i < abs_count; i++)
{ {
pointer = hdata_pointer (hdata, pointer, ptr_var); pointer = hdata_pointer (hdata, pointer, ptr_var);
if (pointer) if (!pointer)
return pointer; break;
} }
return NULL; return pointer;
} }
/* /*
+4
View File
@@ -2256,6 +2256,10 @@ string_iconv_fprintf (FILE *file, const char *data, ...)
int rc, num_written; int rc, num_written;
rc = 0; rc = 0;
if (!data)
return rc;
weechat_va_format (data); weechat_va_format (data);
if (vbuffer) if (vbuffer)
{ {
+1 -1
View File
@@ -1224,7 +1224,7 @@ gui_window_switch_to_buffer (struct t_gui_window *window,
gui_buffer_compute_num_displayed (); gui_buffer_compute_num_displayed ();
if (!weechat_upgrading && (old_buffer != buffer)) if (!weechat_upgrading && (old_buffer != buffer))
gui_hotlist_remove_buffer (buffer); gui_hotlist_remove_buffer (buffer, 0);
gui_bar_window_remove_unused_bars (window); gui_bar_window_remove_unused_bars (window);
gui_bar_window_add_missing_bars (window); gui_bar_window_add_missing_bars (window);
+3 -3
View File
@@ -1730,7 +1730,7 @@ gui_buffer_set (struct t_gui_buffer *buffer, const char *property,
if (error && !error[0]) if (error && !error[0])
{ {
if (number < 0) if (number < 0)
gui_hotlist_remove_buffer (buffer); gui_hotlist_remove_buffer (buffer, 0);
else else
(void) gui_hotlist_add (buffer, number, NULL); (void) gui_hotlist_add (buffer, number, NULL);
} }
@@ -2480,7 +2480,7 @@ gui_buffer_clear (struct t_gui_buffer *buffer)
} }
} }
gui_hotlist_remove_buffer (buffer); gui_hotlist_remove_buffer (buffer, 0);
gui_buffer_ask_chat_refresh (buffer, 2); gui_buffer_ask_chat_refresh (buffer, 2);
@@ -2601,7 +2601,7 @@ gui_buffer_close (struct t_gui_buffer *buffer)
} }
} }
gui_hotlist_remove_buffer (buffer); gui_hotlist_remove_buffer (buffer, 1);
if (gui_hotlist_initial_buffer == buffer) if (gui_hotlist_initial_buffer == buffer)
gui_hotlist_initial_buffer = NULL; gui_hotlist_initial_buffer = NULL;
+72 -68
View File
@@ -639,7 +639,7 @@ gui_chat_printf_date_tags (struct t_gui_buffer *buffer, time_t date,
const char *tags, const char *message, ...) const char *tags, const char *message, ...)
{ {
time_t date_printed; time_t date_printed;
int display_time, length, at_least_one_message_printed; int display_time, length, at_least_one_message_printed, msg_discarded;
char *pos, *pos_prefix, *pos_tab, *pos_end, *pos_lines; char *pos, *pos_prefix, *pos_tab, *pos_end, *pos_lines;
char *modifier_data, *new_msg, *ptr_msg, *lines_waiting; char *modifier_data, *new_msg, *ptr_msg, *lines_waiting;
struct t_gui_line *ptr_line; struct t_gui_line *ptr_line;
@@ -693,6 +693,7 @@ gui_chat_printf_date_tags (struct t_gui_buffer *buffer, time_t date,
/* call modifier for message printed ("weechat_print") */ /* call modifier for message printed ("weechat_print") */
new_msg = NULL; new_msg = NULL;
msg_discarded = 0;
if (buffer) if (buffer)
{ {
length = strlen (gui_buffer_get_plugin_name (buffer)) + 1 + length = strlen (gui_buffer_get_plugin_name (buffer)) + 1 +
@@ -718,9 +719,10 @@ gui_chat_printf_date_tags (struct t_gui_buffer *buffer, time_t date,
* print anything * print anything
*/ */
free (new_msg); free (new_msg);
goto end; new_msg = NULL;
msg_discarded = 1;
} }
if (strcmp (message, new_msg) == 0) else if (strcmp (message, new_msg) == 0)
{ {
/* no changes in new message */ /* no changes in new message */
free (new_msg); free (new_msg);
@@ -730,89 +732,92 @@ gui_chat_printf_date_tags (struct t_gui_buffer *buffer, time_t date,
} }
} }
pos_prefix = NULL; if (!msg_discarded)
display_time = 1; {
ptr_msg = (new_msg) ? new_msg : pos; pos_prefix = NULL;
display_time = 1;
ptr_msg = (new_msg) ? new_msg : pos;
/* space followed by tab => prefix ignored */ /* space followed by tab => prefix ignored */
if ((ptr_msg[0] == ' ') && (ptr_msg[1] == '\t')) if ((ptr_msg[0] == ' ') && (ptr_msg[1] == '\t'))
{
ptr_msg += 2;
}
else
{
/* if two first chars are tab, then do not display time */
if ((ptr_msg[0] == '\t') && (ptr_msg[1] == '\t'))
{ {
display_time = 0;
ptr_msg += 2; ptr_msg += 2;
} }
else else
{ {
/* if tab found, use prefix (before tab) */ /* if two first chars are tab, then do not display time */
pos_tab = strchr (ptr_msg, '\t'); if ((ptr_msg[0] == '\t') && (ptr_msg[1] == '\t'))
if (pos_tab)
{ {
pos_tab[0] = '\0'; display_time = 0;
pos_prefix = ptr_msg; ptr_msg += 2;
ptr_msg = pos_tab + 1;
}
}
}
if (gui_init_ok)
{
ptr_line = gui_line_add (buffer, (display_time) ? date : 0,
date_printed, tags, pos_prefix, ptr_msg);
if (ptr_line)
{
if (buffer && buffer->print_hooks_enabled)
hook_print_exec (buffer, ptr_line);
if (ptr_line->data->displayed)
at_least_one_message_printed = 1;
}
}
else
{
length = ((pos_prefix) ? strlen (pos_prefix) + 1 : 0) +
strlen (ptr_msg) + 1;
if (gui_chat_lines_waiting_buffer)
{
length += strlen (gui_chat_lines_waiting_buffer) + 1;
lines_waiting = realloc (gui_chat_lines_waiting_buffer, length);
if (lines_waiting)
{
gui_chat_lines_waiting_buffer = lines_waiting;
} }
else else
{ {
free (gui_chat_lines_waiting_buffer); /* if tab found, use prefix (before tab) */
gui_chat_lines_waiting_buffer = NULL; pos_tab = strchr (ptr_msg, '\t');
if (pos_tab)
{
pos_tab[0] = '\0';
pos_prefix = ptr_msg;
ptr_msg = pos_tab + 1;
}
}
}
if (gui_init_ok)
{
ptr_line = gui_line_add (buffer, (display_time) ? date : 0,
date_printed, tags, pos_prefix, ptr_msg);
if (ptr_line)
{
if (buffer && buffer->print_hooks_enabled)
hook_print_exec (buffer, ptr_line);
if (ptr_line->data->displayed)
at_least_one_message_printed = 1;
} }
} }
else else
{ {
gui_chat_lines_waiting_buffer = malloc (length); length = ((pos_prefix) ? strlen (pos_prefix) + 1 : 0) +
strlen (ptr_msg) + 1;
if (gui_chat_lines_waiting_buffer) if (gui_chat_lines_waiting_buffer)
gui_chat_lines_waiting_buffer[0] = '\0';
}
if (gui_chat_lines_waiting_buffer)
{
pos_lines = gui_chat_lines_waiting_buffer +
strlen (gui_chat_lines_waiting_buffer);
if (pos_lines > gui_chat_lines_waiting_buffer)
{ {
pos_lines[0] = '\n'; length += strlen (gui_chat_lines_waiting_buffer) + 1;
pos_lines++; lines_waiting = realloc (gui_chat_lines_waiting_buffer, length);
if (lines_waiting)
{
gui_chat_lines_waiting_buffer = lines_waiting;
}
else
{
free (gui_chat_lines_waiting_buffer);
gui_chat_lines_waiting_buffer = NULL;
}
} }
if (pos_prefix) else
{ {
memcpy (pos_lines, pos_prefix, strlen (pos_prefix)); gui_chat_lines_waiting_buffer = malloc (length);
pos_lines += strlen (pos_prefix); if (gui_chat_lines_waiting_buffer)
pos_lines[0] = '\t'; gui_chat_lines_waiting_buffer[0] = '\0';
pos_lines++; }
if (gui_chat_lines_waiting_buffer)
{
pos_lines = gui_chat_lines_waiting_buffer +
strlen (gui_chat_lines_waiting_buffer);
if (pos_lines > gui_chat_lines_waiting_buffer)
{
pos_lines[0] = '\n';
pos_lines++;
}
if (pos_prefix)
{
memcpy (pos_lines, pos_prefix, strlen (pos_prefix));
pos_lines += strlen (pos_prefix);
pos_lines[0] = '\t';
pos_lines++;
}
memcpy (pos_lines, ptr_msg, strlen (ptr_msg) + 1);
} }
memcpy (pos_lines, ptr_msg, strlen (ptr_msg) + 1);
} }
} }
@@ -825,7 +830,6 @@ gui_chat_printf_date_tags (struct t_gui_buffer *buffer, time_t date,
if (gui_init_ok && at_least_one_message_printed) if (gui_init_ok && at_least_one_message_printed)
gui_buffer_ask_chat_refresh (buffer, 1); gui_buffer_ask_chat_refresh (buffer, 1);
end:
free (vbuffer); free (vbuffer);
} }
+8 -4
View File
@@ -487,7 +487,8 @@ gui_hotlist_clear ()
*/ */
void void
gui_hotlist_remove_buffer (struct t_gui_buffer *buffer) gui_hotlist_remove_buffer (struct t_gui_buffer *buffer,
int force_remove_buffer)
{ {
int hotlist_changed, hotlist_remove, buffer_to_remove; int hotlist_changed, hotlist_remove, buffer_to_remove;
struct t_gui_hotlist *ptr_hotlist, *next_hotlist; struct t_gui_hotlist *ptr_hotlist, *next_hotlist;
@@ -504,19 +505,22 @@ gui_hotlist_remove_buffer (struct t_gui_buffer *buffer)
{ {
next_hotlist = ptr_hotlist->next_hotlist; next_hotlist = ptr_hotlist->next_hotlist;
buffer_to_remove = 0; buffer_to_remove = (force_remove_buffer) ?
(ptr_hotlist->buffer == buffer) : 0;
switch (hotlist_remove) switch (hotlist_remove)
{ {
case CONFIG_LOOK_HOTLIST_REMOVE_BUFFER: case CONFIG_LOOK_HOTLIST_REMOVE_BUFFER:
buffer_to_remove = (ptr_hotlist->buffer == buffer); buffer_to_remove |= (ptr_hotlist->buffer == buffer);
break; break;
case CONFIG_LOOK_HOTLIST_REMOVE_MERGED: case CONFIG_LOOK_HOTLIST_REMOVE_MERGED:
buffer_to_remove = buffer_to_remove |=
((ptr_hotlist->buffer->number == buffer->number) ((ptr_hotlist->buffer->number == buffer->number)
&& (!ptr_hotlist->buffer->zoomed && (!ptr_hotlist->buffer->zoomed
|| (ptr_hotlist->buffer->active == 2))); || (ptr_hotlist->buffer->active == 2)));
break; break;
} }
if (buffer_to_remove) if (buffer_to_remove)
{ {
gui_hotlist_free (&gui_hotlist, &last_gui_hotlist, ptr_hotlist); gui_hotlist_free (&gui_hotlist, &last_gui_hotlist, ptr_hotlist);
+2 -1
View File
@@ -59,7 +59,8 @@ extern struct t_gui_hotlist *gui_hotlist_add (struct t_gui_buffer *buffer,
struct timeval *creation_time); struct timeval *creation_time);
extern void gui_hotlist_resort (); extern void gui_hotlist_resort ();
extern void gui_hotlist_clear (); extern void gui_hotlist_clear ();
extern void gui_hotlist_remove_buffer (struct t_gui_buffer *buffer); extern void gui_hotlist_remove_buffer (struct t_gui_buffer *buffer,
int force_remove_buffer);
extern struct t_hdata *gui_hotlist_hdata_hotlist_cb (void *data, extern struct t_hdata *gui_hotlist_hdata_hotlist_cb (void *data,
const char *hdata_name); const char *hdata_name);
extern int gui_hotlist_add_to_infolist (struct t_infolist *infolist, extern int gui_hotlist_add_to_infolist (struct t_infolist *infolist,
+1 -1
View File
@@ -1383,7 +1383,7 @@ gui_input_jump_smart (struct t_gui_buffer *buffer)
if (!gui_hotlist_initial_buffer) if (!gui_hotlist_initial_buffer)
gui_hotlist_initial_buffer = window->buffer; gui_hotlist_initial_buffer = window->buffer;
gui_window_switch_to_buffer (window, gui_hotlist->buffer, 1); gui_window_switch_to_buffer (window, gui_hotlist->buffer, 1);
gui_hotlist_remove_buffer (window->buffer); gui_hotlist_remove_buffer (window->buffer, 0);
scroll_to_bottom = 1; scroll_to_bottom = 1;
} }
else else
+9
View File
@@ -782,7 +782,16 @@ gui_line_has_highlight (struct t_gui_line *line)
{ {
length = strlen (ptr_nick); length = strlen (ptr_nick);
if (strncmp (ptr_msg_no_color, ptr_nick, length) == 0) if (strncmp (ptr_msg_no_color, ptr_nick, length) == 0)
{
/* skip nick at beginning (for example: "FlashCode") */
ptr_msg_no_color += length; ptr_msg_no_color += length;
}
else if (ptr_msg_no_color[0]
&& (strncmp (ptr_msg_no_color + 1, ptr_nick, length) == 0))
{
/* skip prefix and nick at beginning (for example: "@FlashCode") */
ptr_msg_no_color += length + 1;
}
} }
/* /*
+1 -1
View File
@@ -1673,7 +1673,7 @@ gui_window_search_stop (struct t_gui_window *window)
} }
window->scroll->start_line = NULL; window->scroll->start_line = NULL;
window->scroll->start_line_pos = 0; window->scroll->start_line_pos = 0;
gui_hotlist_remove_buffer (window->buffer); gui_hotlist_remove_buffer (window->buffer, 0);
gui_buffer_ask_chat_refresh (window->buffer, 2); gui_buffer_ask_chat_refresh (window->buffer, 2);
} }
+15 -8
View File
@@ -420,14 +420,13 @@ weechat_aspell_command_cb (void *data, struct t_gui_buffer *buffer,
/* set dictionary for current buffer */ /* set dictionary for current buffer */
if (weechat_strcasecmp (argv[1], "setdict") == 0) if (weechat_strcasecmp (argv[1], "setdict") == 0)
{ {
if (argc > 2) if (argc < 3)
{ return WEECHAT_RC_ERROR;
dicts = weechat_string_replace (argv_eol[2], " ", ""); dicts = weechat_string_replace (argv_eol[2], " ", "");
weechat_aspell_command_set_dict (buffer, weechat_aspell_command_set_dict (buffer,
(dicts) ? dicts : argv[2]); (dicts) ? dicts : argv[2]);
if (dicts) if (dicts)
free (dicts); free (dicts);
}
return WEECHAT_RC_OK; return WEECHAT_RC_OK;
} }
@@ -441,10 +440,18 @@ weechat_aspell_command_cb (void *data, struct t_gui_buffer *buffer,
/* add word to personal dictionary */ /* add word to personal dictionary */
if (weechat_strcasecmp (argv[1], "addword") == 0) if (weechat_strcasecmp (argv[1], "addword") == 0)
{ {
if (argc < 3)
return WEECHAT_RC_ERROR;
if (argc > 3) if (argc > 3)
{
/* use a given dict */
weechat_aspell_command_add_word (buffer, argv[2], argv_eol[3]); weechat_aspell_command_add_word (buffer, argv[2], argv_eol[3]);
}
else else
{
/* use default dict */
weechat_aspell_command_add_word (buffer, NULL, argv_eol[2]); weechat_aspell_command_add_word (buffer, NULL, argv_eol[2]);
}
return WEECHAT_RC_OK; return WEECHAT_RC_OK;
} }
+5 -1
View File
@@ -1002,15 +1002,19 @@ weechat_aspell_debug_libs_cb (void *data, const char *signal,
(void) signal_data; (void) signal_data;
#ifdef USE_ENCHANT #ifdef USE_ENCHANT
#ifdef HAVE_ENCHANT_GET_VERSION
weechat_printf (NULL, " %s: enchant %s", weechat_printf (NULL, " %s: enchant %s",
ASPELL_PLUGIN_NAME, enchant_get_version ()); ASPELL_PLUGIN_NAME, enchant_get_version ());
#else
weechat_printf (NULL, " %s: enchant (?)", ASPELL_PLUGIN_NAME);
#endif /* HAVE_ENCHANT_GET_VERSION */
#else #else
#ifdef HAVE_ASPELL_VERSION_STRING #ifdef HAVE_ASPELL_VERSION_STRING
weechat_printf (NULL, " %s: aspell %s", weechat_printf (NULL, " %s: aspell %s",
ASPELL_PLUGIN_NAME, aspell_version_string ()); ASPELL_PLUGIN_NAME, aspell_version_string ());
#else #else
weechat_printf (NULL, " %s: aspell (?)", ASPELL_PLUGIN_NAME); weechat_printf (NULL, " %s: aspell (?)", ASPELL_PLUGIN_NAME);
#endif #endif /* HAVE_ASPELL_VERSION_STRING */
#endif /* USE_ENCHANT */ #endif /* USE_ENCHANT */
return WEECHAT_RC_OK; return WEECHAT_RC_OK;
+6
View File
@@ -19,6 +19,10 @@
* along with WeeChat. If not, see <http://www.gnu.org/licenses/>. * along with WeeChat. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#undef _ #undef _
#include <libguile.h> #include <libguile.h>
@@ -971,12 +975,14 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
guile_stdout = NULL; guile_stdout = NULL;
#ifdef HAVE_GUILE_GMP_MEMORY_FUNCTIONS
/* /*
* prevent guile to use its own gmp allocator, because it can conflict * prevent guile to use its own gmp allocator, because it can conflict
* with other plugins using GnuTLS like relay, which can crash WeeChat * with other plugins using GnuTLS like relay, which can crash WeeChat
* on unload (or exit) * on unload (or exit)
*/ */
scm_install_gmp_memory_functions = 0; scm_install_gmp_memory_functions = 0;
#endif
scm_init_guile (); scm_init_guile ();
+2 -2
View File
@@ -2184,7 +2184,7 @@ irc_command_join_server (struct t_irc_server *server, const char *arguments,
char *new_args, **channels, **keys, *pos_space, *pos_keys, *pos_channel; char *new_args, **channels, **keys, *pos_space, *pos_keys, *pos_channel;
char *channel_name; char *channel_name;
int i, num_channels, num_keys, length; int i, num_channels, num_keys, length;
int time_now; time_t time_now;
struct t_irc_channel *ptr_channel; struct t_irc_channel *ptr_channel;
if (server->sock < 0) if (server->sock < 0)
@@ -2247,7 +2247,7 @@ irc_command_join_server (struct t_irc_server *server, const char *arguments,
} }
} }
new_args[0] = '\0'; new_args[0] = '\0';
time_now = (int)time (NULL); time_now = time (NULL);
for (i = 0; i < num_channels; i++) for (i = 0; i < num_channels; i++)
{ {
if (i > 0) if (i > 0)
+2 -2
View File
@@ -1676,8 +1676,8 @@ irc_config_server_new_option (struct t_config_file *config_file,
/* TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po) */ /* TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po) */
N_("comma-separated list of client capabilities to enable for " N_("comma-separated list of client capabilities to enable for "
"server if they are available; capabilities supported by " "server if they are available; capabilities supported by "
"WeeChat are: multi-prefix, userhost-in-names, away-notify " "WeeChat are: away-notify, multi-prefix, server-time, "
"(example: \"multi-prefix,userhost-in-names,away-notify\")"), "userhost-in-names (example: \"away-notify,multi-prefix\")"),
NULL, 0, 0, NULL, 0, 0,
default_value, value, default_value, value,
null_value_allowed, null_value_allowed,
+2 -2
View File
@@ -1374,10 +1374,10 @@ relay_client_set_status (struct t_relay_client *client,
gnutls_deinit (client->gnutls_sess); gnutls_deinit (client->gnutls_sess);
#endif #endif
} }
relay_client_send_signal (client);
} }
relay_client_send_signal (client);
relay_buffer_refresh (WEECHAT_HOTLIST_MESSAGE); relay_buffer_refresh (WEECHAT_HOTLIST_MESSAGE);
} }
+4
View File
@@ -652,6 +652,10 @@ script_repo_remove (struct t_script_repo *script)
{ {
struct t_script_repo *new_scripts_repo; struct t_script_repo *new_scripts_repo;
/* unlink script from buffer (if it is used) */
if (script_buffer_detail_script == script)
script_buffer_detail_script = NULL;
/* remove script from list */ /* remove script from list */
if (last_script_repo == script) if (last_script_repo == script)
last_script_repo = script->prev_script; last_script_repo = script->prev_script;
+86 -10
View File
@@ -314,6 +314,20 @@ trigger_command_list_default (int verbose)
weechat_string_free_split (commands); weechat_string_free_split (commands);
} }
/*
* Displays an error if a trigger is running.
*/
void
trigger_command_error_running (struct t_trigger *trigger, const char *action)
{
weechat_printf_tags (NULL, "no_trigger",
_("%s%s: action \"%s\" can not be executed on "
"trigger \"%s\" because it is currently running"),
weechat_prefix ("error"), TRIGGER_PLUGIN_NAME,
action, trigger->name);
}
/* /*
* Set "enabled" value in a trigger. * Set "enabled" value in a trigger.
* *
@@ -325,9 +339,16 @@ trigger_command_list_default (int verbose)
*/ */
void void
trigger_command_set_enabled (struct t_trigger *trigger, int enable, trigger_command_set_enabled (struct t_trigger *trigger,
int enable, const char *enable_string,
int display_error) int display_error)
{ {
if (trigger->hook_running)
{
trigger_command_error_running (trigger, enable_string);
return;
}
if (enable == 2) if (enable == 2)
{ {
if (weechat_config_boolean (trigger->options[TRIGGER_OPTION_ENABLED])) if (weechat_config_boolean (trigger->options[TRIGGER_OPTION_ENABLED]))
@@ -539,7 +560,14 @@ trigger_command_trigger (void *data, struct t_gui_buffer *buffer, int argc,
if (weechat_strcasecmp (argv[1], "addreplace") == 0) if (weechat_strcasecmp (argv[1], "addreplace") == 0)
{ {
if (ptr_trigger) if (ptr_trigger)
{
if (ptr_trigger->hook_running)
{
trigger_command_error_running (ptr_trigger, argv[1]);
goto end;
}
trigger_free (ptr_trigger); trigger_free (ptr_trigger);
}
} }
else else
{ {
@@ -680,6 +708,11 @@ trigger_command_trigger (void *data, struct t_gui_buffer *buffer, int argc,
argv[2]); argv[2]);
goto end; goto end;
} }
if (ptr_trigger->hook_running)
{
trigger_command_error_running (ptr_trigger, argv[1]);
goto end;
}
if (weechat_strcasecmp (argv[3], "name") == 0) if (weechat_strcasecmp (argv[3], "name") == 0)
{ {
trigger_command_rename (ptr_trigger, argv[4]); trigger_command_rename (ptr_trigger, argv[4]);
@@ -724,6 +757,11 @@ trigger_command_trigger (void *data, struct t_gui_buffer *buffer, int argc,
argv[2]); argv[2]);
goto end; goto end;
} }
if (ptr_trigger->hook_running)
{
trigger_command_error_running (ptr_trigger, argv[1]);
goto end;
}
trigger_command_rename (ptr_trigger, argv[3]); trigger_command_rename (ptr_trigger, argv[3]);
goto end; goto end;
} }
@@ -814,7 +852,7 @@ trigger_command_trigger (void *data, struct t_gui_buffer *buffer, int argc,
for (ptr_trigger = triggers; ptr_trigger; for (ptr_trigger = triggers; ptr_trigger;
ptr_trigger = ptr_trigger->next_trigger) ptr_trigger = ptr_trigger->next_trigger)
{ {
trigger_command_set_enabled (ptr_trigger, enable, 0); trigger_command_set_enabled (ptr_trigger, enable, argv[1], 0);
} }
} }
else else
@@ -823,7 +861,8 @@ trigger_command_trigger (void *data, struct t_gui_buffer *buffer, int argc,
{ {
ptr_trigger = trigger_search (argv[i]); ptr_trigger = trigger_search (argv[i]);
if (ptr_trigger) if (ptr_trigger)
trigger_command_set_enabled (ptr_trigger, enable, 1); trigger_command_set_enabled (ptr_trigger, enable, argv[1],
1);
else else
{ {
weechat_printf_tags (NULL, "no_trigger", weechat_printf_tags (NULL, "no_trigger",
@@ -843,7 +882,21 @@ trigger_command_trigger (void *data, struct t_gui_buffer *buffer, int argc,
if (weechat_strcasecmp (argv[2], "-all") == 0) if (weechat_strcasecmp (argv[2], "-all") == 0)
{ {
count = triggers_count; count = triggers_count;
trigger_free_all (); ptr_trigger = triggers;
while (ptr_trigger)
{
ptr_trigger2 = ptr_trigger->next_trigger;
if (ptr_trigger->hook_running)
{
trigger_command_error_running (ptr_trigger, argv[1]);
}
else
{
trigger_free (ptr_trigger);
}
ptr_trigger = ptr_trigger2;
}
count = count - triggers_count;
if (count > 0) if (count > 0)
weechat_printf_tags (NULL, "no_trigger", weechat_printf_tags (NULL, "no_trigger",
_("%d triggers removed"), count); _("%d triggers removed"), count);
@@ -855,9 +908,16 @@ trigger_command_trigger (void *data, struct t_gui_buffer *buffer, int argc,
ptr_trigger = trigger_search (argv[i]); ptr_trigger = trigger_search (argv[i]);
if (ptr_trigger) if (ptr_trigger)
{ {
trigger_free (ptr_trigger); if (ptr_trigger->hook_running)
weechat_printf_tags (NULL, "no_trigger", {
_("Trigger \"%s\" removed"), argv[i]); trigger_command_error_running (ptr_trigger, argv[1]);
}
else
{
trigger_free (ptr_trigger);
weechat_printf_tags (NULL, "no_trigger",
_("Trigger \"%s\" removed"), argv[i]);
}
} }
else else
{ {
@@ -895,9 +955,25 @@ trigger_command_trigger (void *data, struct t_gui_buffer *buffer, int argc,
{ {
if ((argc >= 3) && (weechat_strcasecmp (argv[2], "-yes") == 0)) if ((argc >= 3) && (weechat_strcasecmp (argv[2], "-yes") == 0))
{ {
trigger_free_all (); ptr_trigger = triggers;
trigger_create_default (); while (ptr_trigger)
trigger_command_list (_("Default triggers restored:"), 0); {
ptr_trigger2 = ptr_trigger->next_trigger;
if (ptr_trigger->hook_running)
{
trigger_command_error_running (ptr_trigger, argv[1]);
}
else
{
trigger_free (ptr_trigger);
}
ptr_trigger = ptr_trigger2;
}
if (triggers_count == 0)
{
trigger_create_default ();
trigger_command_list (_("Default triggers restored:"), 0);
}
} }
else else
{ {
+6 -6
View File
@@ -64,11 +64,11 @@ char *trigger_config_default_list[][1 + TRIGGER_NUM_OPTIONS] =
"", "",
"==^(" "==^("
"(/(msg|quote) +nickserv " "(/(msg|quote) +nickserv "
"+(id|identify|register|ghost +\\S+|release +\\S+|regain +\\S+) +)|" "+(id|identify|register|ghost +[^ ]+|release +[^ ]+|regain +[^ ]+) +)|"
"/oper +\\S+ +|" "/oper +[^ ]+ +|"
"/quote +pass +|" "/quote +pass +|"
"/set +\\S*password\\S* +|" "/set +[^ ]*password[^ ]* +|"
"/secure +(passphrase|decrypt|set +\\S+) +)" "/secure +(passphrase|decrypt|set +[^ ]+) +)"
"(.*)" "(.*)"
"==$1$.*+", "==$1$.*+",
"", "",
@@ -78,7 +78,7 @@ char *trigger_config_default_list[][1 + TRIGGER_NUM_OPTIONS] =
"modifier", "modifier",
"5000|irc_message_auth", "5000|irc_message_auth",
"", "",
"==^(.*(id|identify|register|ghost +\\S+|release +\\S+) +)(.*)==$1$.*+", "==^(.*(id|identify|register|ghost +[^ ]+|release +[^ ]+) +)(.*)==$1$.*+",
"", "",
"" }, "" },
/* hide server password in commands /server and /connect */ /* hide server password in commands /server and /connect */
@@ -86,7 +86,7 @@ char *trigger_config_default_list[][1 + TRIGGER_NUM_OPTIONS] =
"modifier", "modifier",
"5000|input_text_display;5000|history_add", "5000|input_text_display;5000|history_add",
"", "",
"==^(/(server|connect) .*-(sasl_)?password=)(\\S+)(.*)==$1$.*4$5" "==^(/(server|connect) .*-(sasl_)?password=)([^ ]+)(.*)==$1$.*4$5"
"", "",
"" }, "" },
{ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }, { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL },
File diff suppressed because it is too large Load Diff
+1 -2
View File
@@ -26,8 +26,7 @@ set(LIB_WEECHAT_NCURSES_FAKE_SRC ncurses-fake.c)
add_library(weechat_ncurses_fake STATIC ${LIB_WEECHAT_NCURSES_FAKE_SRC}) add_library(weechat_ncurses_fake STATIC ${LIB_WEECHAT_NCURSES_FAKE_SRC})
remove_definitions(-DHAVE_CONFIG_H) remove_definitions(-DHAVE_CONFIG_H)
include_directories(${CPPUTEST_INCLUDE_DIRS}) include_directories(${CPPUTEST_INCLUDE_DIRS} ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR})
include_directories(${PROJECT_BINARY_DIR})
# unit tests # unit tests
set(LIB_WEECHAT_UNIT_TESTS_SRC set(LIB_WEECHAT_UNIT_TESTS_SRC
+1 -1
View File
@@ -17,7 +17,7 @@
# along with WeeChat. If not, see <http://www.gnu.org/licenses/>. # along with WeeChat. If not, see <http://www.gnu.org/licenses/>.
# #
AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" $(CPPUTEST_CFLAGS) AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" $(CPPUTEST_CFLAGS) -I$(abs_top_srcdir)
noinst_LIBRARIES = lib_ncurses_fake.a lib_weechat_unit_tests.a noinst_LIBRARIES = lib_ncurses_fake.a lib_weechat_unit_tests.a
+10 -9
View File
@@ -32,13 +32,13 @@ extern "C"
#ifndef HAVE_CONFIG_H #ifndef HAVE_CONFIG_H
#define HAVE_CONFIG_H #define HAVE_CONFIG_H
#endif #endif
#include "../src/core/weechat.h" #include "src/core/weechat.h"
#include "../src/core/wee-hook.h" #include "src/core/wee-hook.h"
#include "../src/core/wee-input.h" #include "src/core/wee-input.h"
#include "../src/core/wee-string.h" #include "src/core/wee-string.h"
#include "../src/plugins/plugin.h" #include "src/plugins/plugin.h"
#include "../src/gui/gui-main.h" #include "src/gui/gui-main.h"
#include "../src/gui/gui-buffer.h" #include "src/gui/gui-buffer.h"
extern void gui_main_init (); extern void gui_main_init ();
extern void gui_main_loop (); extern void gui_main_loop ();
@@ -149,6 +149,9 @@ main (int argc, char *argv[])
/* init WeeChat */ /* init WeeChat */
printf ("------------------------------------------------------------\n"); printf ("------------------------------------------------------------\n");
weechat_init (weechat_argc, weechat_argv, &test_gui_init); weechat_init (weechat_argc, weechat_argv, &test_gui_init);
if (weechat_argv)
string_free_split (weechat_argv);
free (args);
/* display WeeChat version */ /* display WeeChat version */
input_data (gui_buffer_search_main (), "/command core version"); input_data (gui_buffer_search_main (), "/command core version");
@@ -170,7 +173,5 @@ main (int argc, char *argv[])
(rc == 0) ? 32 : 31, /* 32 = green (OK), 31 = red (error) */ (rc == 0) ? 32 : 31, /* 32 = green (OK), 31 = red (error) */
(rc == 0) ? "OK" : "ERROR"); (rc == 0) ? "OK" : "ERROR");
string_free_split (weechat_argv);
return rc; return rc;
} }
+5 -5
View File
@@ -24,11 +24,11 @@
extern "C" extern "C"
{ {
#include <stdio.h> #include <stdio.h>
#include "../src/core/wee-eval.h" #include "src/core/wee-eval.h"
#include "../src/core/wee-config.h" #include "src/core/wee-config.h"
#include "../src/core/wee-hashtable.h" #include "src/core/wee-hashtable.h"
#include "../src/core/wee-version.h" #include "src/core/wee-version.h"
#include "../src/plugins/plugin.h" #include "src/plugins/plugin.h"
} }
#define WEE_CHECK_EVAL(__result, __expr) \ #define WEE_CHECK_EVAL(__result, __expr) \
+2 -2
View File
@@ -24,8 +24,8 @@
extern "C" extern "C"
{ {
#include <string.h> #include <string.h>
#include "../src/core/wee-hashtable.h" #include "src/core/wee-hashtable.h"
#include "../src/plugins/plugin.h" #include "src/plugins/plugin.h"
} }
TEST_GROUP(Hashtable) TEST_GROUP(Hashtable)
+1 -1
View File
@@ -23,7 +23,7 @@
extern "C" extern "C"
{ {
#include "../src/core/wee-hdata.h" #include "src/core/wee-hdata.h"
} }
TEST_GROUP(Hdata) TEST_GROUP(Hdata)
+1 -1
View File
@@ -23,7 +23,7 @@
extern "C" extern "C"
{ {
#include "../src/core/wee-infolist.h" #include "src/core/wee-infolist.h"
} }
TEST_GROUP(Infolist) TEST_GROUP(Infolist)
+1 -1
View File
@@ -23,7 +23,7 @@
extern "C" extern "C"
{ {
#include "../src/core/wee-list.h" #include "src/core/wee-list.h"
} }
TEST_GROUP(List) TEST_GROUP(List)
+2 -2
View File
@@ -26,8 +26,8 @@ extern "C"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <regex.h> #include <regex.h>
#include "../tests/tests.h" #include "tests/tests.h"
#include "../src/core/wee-string.h" #include "src/core/wee-string.h"
} }
#define ONE_KB 1000ULL #define ONE_KB 1000ULL
+1 -1
View File
@@ -23,7 +23,7 @@
extern "C" extern "C"
{ {
#include "../src/core/wee-url.h" #include "src/core/wee-url.h"
} }
TEST_GROUP(Url) TEST_GROUP(Url)
+2 -2
View File
@@ -26,8 +26,8 @@ extern "C"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <wctype.h> #include <wctype.h>
#include "../tests/tests.h" #include "tests/tests.h"
#include "../src/core/wee-utf8.h" #include "src/core/wee-utf8.h"
} }
const char *noel_valid = "no\xc3\xabl"; /* noël */ const char *noel_valid = "no\xc3\xabl"; /* noël */
+1 -1
View File
@@ -27,7 +27,7 @@ extern "C"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <sys/time.h> #include <sys/time.h>
#include "../src/core/wee-util.h" #include "src/core/wee-util.h"
} }
TEST_GROUP(Util) TEST_GROUP(Util)
+5 -4
View File
@@ -29,7 +29,8 @@
# $ cygport weechat-X.Y.Z-1.cygport fetch # $ cygport weechat-X.Y.Z-1.cygport fetch
# $ cygport weechat-X.Y.Z-1.cygport almostall # $ cygport weechat-X.Y.Z-1.cygport almostall
# #
# ==> packages are built in directory ./weechat-X.Y.Z-1/dist/weechat/ # ==> packages are built in directory:
# ./weechat-X.Y.Z-1.<arch>/dist/weechat/
# #
inherit cmake inherit cmake
@@ -45,9 +46,9 @@ HOMEPAGE="http://weechat.org/"
SRC_URI="http://weechat.org/files/src/weechat-${VERSION}.tar.bz2" SRC_URI="http://weechat.org/files/src/weechat-${VERSION}.tar.bz2"
# Build dependencies only # Build dependencies only
DEPEND="asciidoc cmake docbook-xml-simple11 docbook-xsl gettext gnutls-devel \ DEPEND="asciidoc cmake docbook-xml-simple11 docbook-xsl gettext gettext-devel \
libaspell-devel libcurl-devel libgcrypt-devel libncursesw-devel lua perl \ gnutls-devel libaspell-devel libcurl-devel libgcrypt-devel libncursesw-devel \
python ruby source-highlight tcl zlib-devel" lua perl python ruby source-highlight tcl zlib-devel"
# #
# CMake compilation of WeeChat: # CMake compilation of WeeChat:
+3 -1
View File
@@ -23,7 +23,7 @@
# #
%define name weechat %define name weechat
%define version 1.0 %define version 1.0.1
%define release 1 %define release 1
Name: %{name} Name: %{name}
@@ -77,6 +77,8 @@ rm -rf $RPM_BUILD_ROOT
%{_prefix}/share/icons/hicolor/32x32/apps/weechat.png %{_prefix}/share/icons/hicolor/32x32/apps/weechat.png
%changelog %changelog
* Sun Sep 28 2014 Sébastien Helleu <flashcode@flashtux.org> 1.0.1-1
- Released version 1.0.1
* Fri Aug 15 2014 Sébastien Helleu <flashcode@flashtux.org> 1.0-1 * Fri Aug 15 2014 Sébastien Helleu <flashcode@flashtux.org> 1.0-1
- Released version 1.0 - Released version 1.0
* Sun Feb 09 2014 Sébastien Helleu <flashcode@flashtux.org> 0.4.3-1 * Sun Feb 09 2014 Sébastien Helleu <flashcode@flashtux.org> 0.4.3-1