Bug#429518: centericq: Some IRC messages conversion error.

["Dmitry E. Oboukhov" <dimka@avanto.org>]

Package: centericq
Version: 4.21.0-19
Severity: normal
Tags: patch

In case when user's coding and irc's coding are not match each other
messages on user's logout and channels' subjets are converted
incorrectly. 

This patch will cure that defect.



-- System Information:
Debian Release: lenny/sid
  APT prefers testing
  APT policy: (500, 'testing'), (500, 'stable')
Architecture: i386 (i686)

Kernel: Linux 2.6.18-4-k7 (SMP w/1 CPU core)
Locale: LANG=ru_RU.UTF-8, LC_CTYPE=ru_RU.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages centericq depends on:
ii  centeric 4.21.0-19                       A text-mode multi-protocol instant
ii  libc6    2.5-9+b1                        GNU C Library: Shared libraries
ii  libcomer 1.39+1.40-WIP-2006.11.14+dfsg-2 common error description library
ii  libcurl3 7.15.5-1                        Multi-protocol file transfer libra
ii  libgcc1  1:4.1.1-21                      GCC support library
ii  libgnutl 1.4.4-3                         the GNU TLS library - runtime libr
ii  libgpg-e 1.4-2                           library for common error values an
ii  libgpgme 1.1.2-5                         GPGME - GnuPG Made Easy
ii  libidn11 0.6.5-1                         GNU libidn library, implementation
ii  libjpeg6 6b-13                           The Independent JPEG Group's JPEG 
ii  libkrb53 1.6.dfsg.1-4                    MIT Kerberos runtime libraries
ii  libncurs 5.6-3                           Shared libraries for terminal hand
ii  libssl0. 0.9.8e-5                        SSL shared libraries
ii  libstdc+ 4.1.1-21                        The GNU Standard C++ Library v3
ii  zlib1g   1:1.2.3-15                      compression library - runtime

Versions of packages centericq recommends:
ii  iceweasel [www-browse 2.0.0.3-1          lightweight web browser based on M
ii  links [www-browser]   0.99+1.00pre12-1.2 Character mode WWW browser
ii  opera [www-browser]   9.20-20070409.6    The Opera Web Browser
ii  sox                   13.0.0-1           Swiss army knife of sound processi
ii  w3m [www-browser]     0.5.1-5.1          WWW browsable pager with excellent

-- no debconf information

diff -rNu src/hooks/irchook.cc src/hooks/irchook.cc
--- src/hooks/irchook.cc	2004-12-20 03:54:02.000000000 +0300
+++ src/hooks/irchook.cc	2007-06-18 16:30:09.000000000 +0400
@@ -1395,6 +1395,7 @@
 
     if(conf.getourid(irc).nickname != who) {
 	string text;
+	string text2;
 	char buf[512];
 
 	sprintf(buf, _("%s has left"), who); text = buf;
@@ -1402,7 +1403,8 @@
 	if(reason)
 	if(strlen(reason)) {
 	    if(strlen(reason) > 450) reason[450] = 0;
-	    sprintf(buf, _("reason: %s"), reason);
+    	    text2 = irhook.rushtmlconv( "wk", reason );
+	    sprintf(buf, _("reason: %s"), text2.c_str() );
 	    text += (string) "; " + buf + ".";
 	}
 
@@ -1452,7 +1454,8 @@
 
     string text;
     char buf[1024];
-    sprintf(buf, _("Channel topic now is: %s"), topic);
+    text = irhook.rushtmlconv( "wk", topic );
+    sprintf(buf, _("Channel topic now is: %s"), text.c_str());
     text = buf;
 
     if(author)