From musha@ms.tokyo.jcom.ne.jp Sat Nov 20 11:06:27 1999
Return-Path: <musha@ms.tokyo.jcom.ne.jp>
Received: from ms.tokyo.jcom.ne.jp (ms.tokyo.jcom.ne.jp [210.234.123.18])
	by hub.freebsd.org (Postfix) with ESMTP id C1AFC14CD1
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 20 Nov 1999 11:06:12 -0800 (PST)
	(envelope-from musha@ms.tokyo.jcom.ne.jp)
Received: from daemon.local.idaemons.org (pc343031.tokyo.jcom.ne.jp [203.140.143.31])
	by ms.tokyo.jcom.ne.jp (8.9.1/3.7W 06/01/99) with ESMTP id EAA08356
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 21 Nov 1999 04:06:10 +0900 (JST)
Received: by daemon.local.idaemons.org (8.9.3/3.7W) id EAA62626; Sun, 21 Nov 1999 04:05:39 +0900 (JST)
Message-Id: <86so216l1a.wl@localhost.local.idaemons.org>
Date: Sun, 21 Nov 1999 04:05:37 +0900
From: Akinori MUSHA aka knu <knu@idaemons.org>
Sender: musha@ms.tokyo.jcom.ne.jp
To: FreeBSD-gnats-submit@freebsd.org
Subject: Updated port: japanese/gnomeicu

>Number:         15005
>Category:       ports
>Synopsis:       Updated port: japanese/gnomeicu
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    flathill
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 20 11:10:00 PST 1999
>Closed-Date:    Wed Dec 1 02:01:14 PST 1999
>Last-Modified:  Wed Dec  1 02:01:30 PST 1999
>Originator:     Akinori MUSHA aka knu <knu@idaemons.org>
>Release:        FreeBSD 3.3-STABLE i386
>Organization:
A.I.D.
>Environment:

	FreeBSD 3.3-STABLE i386 + ports-current

>Description:

	Decided to use Kitame-san's patch instead of mine, because his
	seems well-maintenanced (important indeed!) and clearly better
	than mine.

	Delete patch-a[a-i] and apply the patch attached, please.

>How-To-Repeat:

	portlint
	make
	make install
	make package
	make deinstall
	pkg_add *.tgz
	make deinstall
	make reinstall
	make package

	Everything seems okay on my 3.3-STABLE box.

>Fix:
	

--Multipart_Sun_Nov_21_04:05:37_1999-1
Content-Type: application/octet-stream; type=gzip
Content-Disposition: attachment; filename="gnome-icu.diff.gz"
Content-Transfer-Encoding: base64

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
ppn /h8LmbWyUH80ZEpyRZCq1R8h5EcI+d4hJJUshjTqcEgqf+cg8vTckmao4+1Z5DhBhjpez1Ar
YoIMdfzkU+bKeoLK72eSnnaiCx2WzMJpp0IuoKpw4Gk8lqDK1T1BrsXibcrF/sK1mfKDHaZA
753C44ruqsE7H1nEDycFhofSLmoZRsyOvoPm2PUcchoOkjtqRrRbooggCaCz8CfOcgKYRQvL
FhAfNbajhJdZWTQ4V9R3pz31fe9kjZV60Q4EOh30AZGAFWGEyQQGB8KwfaaA0o7ZKWtlPIFe
fjJvo/lroCWewW7S0rdfPl9PEBm2GGE5ET7Bfibs+k/qbfN9Z7UhlOvRw62UR08CY4Yk8O2f
vIvbw+5PHiyBHF9Bh+6dOsE+Fc+Or92T4eCPLB2p8NrAnk7GE6g0fsJO1HfhTknXKMglgXkK
NldozbI9PzdRZ9p06ugQu6x77JDQTRpyaBfiMXnjjse2SNHBkN/JZXa+yPSBec8H/Y2mBYVz
A7PbDeIM3Igs8VDIKkACyoK0HEtD6OV2YPzolu1/yPh/o/eir/HenW+IuCCMwDqfRgRd498L
iqQ792T77jpJsHNPnrlzT551T8mflK1t3TCuJDcr9W132ebqTaXE78C2PJLZKwvVvb3YPQul
NKKbFjARdm105F+9twxwBrSrzeevYi3klMKun4MQzy+sGdpi4GQE3xHCkmrZsTuW+EUN1Aw8
tmxM0QXIIghDYmKDm9uNYiYwuPlMg5tPPi9ceXhRMmBwezGdrlwLVupNefUKMf5ULnxmIckk
RyvXmpW9x+wcv0kD1IVpSB6Vdunt8i6il1/WvUbeamck9lli1smjF8FbxCgTwS2z1PAre7/4
ddhjs/1956MkflqGQHDFDYFihxxAZ/MsAQm/ksvl+B04S5pAiEJv17rn7bHrzJS3PQW2gAhO
CD3gqYc3SCTRcbs8IogIBLmr8sJVRX2gmTY+JEbl5XbkXCZA5eV2dD2Kysv4O78ipP8NOAFE
7/wSPOYBFfSt/vyGR9L/SR26Fu1PrrXrTQmOD9FLxvm1J9jL3LLYhD2FcZPhahXymwr6ScZD
qULn9+5A6Z2e7F9kMi+zQSWXuchcsGb6Knu30xswBvb8y7BcwgIcMOeve+6azz/VvzClL6Y/
JeeJx7cvs72TYZ+Uc+l8kie4+eRn06vt5r9KAK2rZ0Lr6qugZdlfBC3LXodWeI6l0JLKDfp7
HfpFwdU+OwvfDCJIOmu137WOugxHQYWg6DEQJkLg14LwC4DzTcD6JUD9Bli9mpQ6XaU9iAMp
pG1EZ9i4YR+WNu7DvMOjeKwKFZQnH+QHDmn0/v37Jgp+FbT+wyXye57WlWVDFoaOz5XfWki7
0tCVvUC/Lv0e6XU6/whb/Nczrx9X0Vm/pwxXFkVp21REG5P+AiTW4TEVyZIASSl8MiXFfr5S
Cl6e5aoqOPYUUrTi7Xz2BCMclda5PGdhGxFTKXhcXbzRrtN5xsgcrXSplfpt9birKOCvSmSq
mZP+L5eOxCI/OAAA

--Multipart_Sun_Nov_21_04:05:37_1999-1--

>Release-Note:
>Audit-Trail:

From: Akinori MUSHA aka knu <knu@idaemons.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:  
Subject: Re: ports/15005: Updated port: japanese/gnomeicu
Date: Sun, 21 Nov 1999 04:44:21 +0900

 Ah, I know base64 isn't preferable...
 
 Here's the same file, uuencoded.
 
 begin 644 gnome-icu.diff.gz
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
 G*7A<7;S1KM-YQL@<K72IE?IM];BK*."O2F2JF9/^+Y>.Q"(_.```
 `
 end
 
Responsible-Changed-From-To: freebsd-ports->flathill 
Responsible-Changed-By: flathill 
Responsible-Changed-When: Tue Nov 23 17:20:19 PST 1999 
Responsible-Changed-Why:  
I'll take this. 

From: Akinori MUSHA aka knu <knu@idaemons.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:  
Subject: Re: ports/15005: Updated port: japanese/gnomeicu
Date: Fri, 26 Nov 1999 00:58:59 +0900

 	I'm sorry. Actually I met with some problems using GnomeICU
 	port updated by the PR.
 
 	Simultaneously 'n unexpectedly GnomeICU had updated itself to
 	version 0.67. So I decided to maintain my patch to keep it
 	stable.
 
 	Anyway Kitame-san's patch seems to be getting merged into the
 	original development tree, and I'll keep tracking it, yeah.
 
 	The correct patch follows. Just forget about the preceding
 	patch...
 
 diff -ruN gnome-icu.prev/Makefile gnome-icu/Makefile
 --- gnome-icu.prev/Makefile	Sun Oct 17 22:45:03 1999
 +++ gnome-icu/Makefile	Wed Nov 24 04:54:07 1999
 @@ -1,18 +1,18 @@
  # Ports collection Makefile for:	GnomeICU
 -# Version required:			0.65
 +# Version required:			0.67
  # Date created:				08/08/1999
 -# Whom:					knu@and.or.jp
 +# Whom:					knu@idaemons.org
  #
  # $FreeBSD: ports/japanese/gnome-icu/Makefile,v 1.15 1999/10/17 13:45:03 asami Exp $
  #
  
 -DISTNAME=		gnomeicu-0.65
 -PKGNAME=		ja-gnomeicu-0.65
 +DISTNAME=		gnomeicu-0.67
 +PKGNAME=		ja-gnomeicu-0.67
  CATEGORIES=		japanese net gnome
  MASTER_SITES=		ftp://gnomeicu.gdev.net/pub/gnomeicu/ \
  			http://www.nectar.cc/distfiles/
  
 -MAINTAINER=		knu@and.or.jp
 +MAINTAINER=		knu@idaemons.org
  
  LIB_DEPENDS=		panel_applet.2:${PORTSDIR}/x11/gnomecore
  BUILD_DEPENDS=		${LOCALBASE}/lib/libjcode.a:${PORTSDIR}/japanese/libjcode \
 diff -ruN gnome-icu.prev/files/md5 gnome-icu/files/md5
 --- gnome-icu.prev/files/md5	Sun Jul  4 00:32:23 1999
 +++ gnome-icu/files/md5	Wed Nov 24 04:56:12 1999
 @@ -1 +1 @@
 -MD5 (gnomeicu-0.65.tar.bz2) = b2ca09340242b12266924d7daa029e5a
 +MD5 (gnomeicu-0.67.tar.bz2) = 5a1051c381ed93e3f15bf9693772c671
 Binary files gnome-icu.prev/ja-gnomeicu-0.67.tgz and gnome-icu/ja-gnomeicu-0.67.tgz differ
 diff -ruN gnome-icu.prev/patches/patch-aa gnome-icu/patches/patch-aa
 --- gnome-icu.prev/patches/patch-aa	Wed Aug 25 23:08:38 1999
 +++ gnome-icu/patches/patch-aa	Thu Nov 25 00:12:13 1999
 @@ -1,53 +1,11 @@
 -*** src/Makefile.in.orig	Sat Jul  3 13:31:23 1999
 ---- src/Makefile.in	Mon Jul  5 01:08:34 1999
 -***************
 -*** 111,120 ****
 -  
 -  bin_PROGRAMS = gnomeicu
 -  
 -! gnomeicu_SOURCES =  	autoaway.c		changeaway.c		changeinfo.c		changename.c		chatdlg.c		dialog.c		dragdrop.c		events.c		filexfer.c		flash.c			gnomecfg.c		gnomeicu.c		gtkconf.c		gtkfunc.c		histadd.c		loadpixmap.c		log.c			msg_queue.c		newsignup.c		response.c		rus_conv.c		sendmsg.c		showwait.c		tcp.c			ui.c			util.c			webpresence.c		applet.h		brazil.h		chatdlg.h		datatype.h		dialog.h		dragdrop.h		english.h		events.h		filexfer.h		gtkfunc.h		gnomeicu.h		lang.h			loadpixmap.h		msg_queue.h		pixmaps.h		russian.h 		sendmsg.h		tcp.h			timezone.h
 -  
 -  
 -! gnomeicu_LDADD = -lpanel_applet @APPLET_O@ @GNOMEICU_LDADD@ 		@SOCKS_LIBDIR@ @SOCKS_LIBS@
 -  
 -  gnomeicu_DEPENDENCIES = @APPLET_O@
 -  
 ---- 111,120 ----
 -  
 -  bin_PROGRAMS = gnomeicu
 -  
 -! gnomeicu_SOURCES =  	autoaway.c		changeaway.c		changeinfo.c		changename.c		chatdlg.c		dialog.c		dragdrop.c		events.c		filexfer.c		flash.c			gnomecfg.c		gnomeicu.c		gtkconf.c		gtkfunc.c		histadd.c		loadpixmap.c		log.c			msg_queue.c		newsignup.c		response.c		l10n_conv.c		rus_conv.c		sendmsg.c		showwait.c		tcp.c			ui.c			util.c			webpresence.c		applet.h		brazil.h		chatdlg.h		datatype.h		dialog.h		dragdrop.h		english.h		events.h		filexfer.h		gtkfunc.h		gnomeicu.h		lang.h			loadpixmap.h		msg_queue.h		pixmaps .h		russian.h		sendmsg.h		tcp.h			timezone.h
 -  
 -  
 -! gnomeicu_LDADD = -lpanel_applet @APPLET_O@ @GNOMEICU_LDADD@ 		@SOCKS_LIBDIR@ @SOCKS_LIBS@ -ljcode
 -  
 -  gnomeicu_DEPENDENCIES = @APPLET_O@
 -  
 -***************
 -*** 145,151 ****
 -  gnomeicu_OBJECTS =  autoaway.o changeaway.o changeinfo.o changename.o \
 -  chatdlg.o dialog.o dragdrop.o events.o filexfer.o flash.o gnomecfg.o \
 -  gnomeicu.o gtkconf.o gtkfunc.o histadd.o loadpixmap.o log.o msg_queue.o \
 -! newsignup.o response.o rus_conv.o sendmsg.o showwait.o tcp.o ui.o \
 -  util.o webpresence.o
 -  gnomeicu_LDFLAGS = 
 -  CFLAGS = @CFLAGS@
 ---- 145,151 ----
 -  gnomeicu_OBJECTS =  autoaway.o changeaway.o changeinfo.o changename.o \
 -  chatdlg.o dialog.o dragdrop.o events.o filexfer.o flash.o gnomecfg.o \
 -  gnomeicu.o gtkconf.o gtkfunc.o histadd.o loadpixmap.o log.o msg_queue.o \
 -! newsignup.o response.o l10n_conv.o rus_conv.o sendmsg.o showwait.o tcp.o ui.o \
 -  util.o webpresence.o
 -  gnomeicu_LDFLAGS = 
 -  CFLAGS = @CFLAGS@
 -***************
 -*** 464,469 ****
 ---- 464,471 ----
 -  	filexfer.h
 -  response.o: response.c ../config.h datatype.h gnomeicu.h gtkfunc.h \
 -  	dialog.h filexfer.h events.h applet.h
 -+ l10n_conv.o: l10n_conv.c gnomeicu.h datatype.h gtkfunc.h dialog.h \
 -+ 	filexfer.h
 -  rus_conv.o: rus_conv.c gnomeicu.h datatype.h gtkfunc.h dialog.h \
 -  	filexfer.h
 -  sendmsg.o: sendmsg.c ../config.h datatype.h gnomeicu.h gtkfunc.h \
 +--- src/Makefile.in.orig	Fri Nov 19 00:21:55 1999
 ++++ src/Makefile.in	Thu Nov 25 00:11:26 1999
 +@@ -128,7 +128,7 @@
 + gnomeicu_SOURCES =  	applet.c		autoaway.c		autohide.c		changeaway.c		changeinfo.c		changenick.c		chatdlg.c		dialog.c		dragdrop.c		events.c		filexfer.c		flash.c			gnomecfg.c		gnomeicu.c		gtkconf.c		gtkfunc.c		histadd.c		icuchat.c		loadpixmap.c		log.c			msg_queue.c		newsignup.c		packetprint.c		response.c		rus_conv.c		sendmsg.c		server.c		showlist.c		showwait.c		tcp.c			util.c			webpresence.c		applet.h		autoaway.h		autohide.h		brazil.h		changeaway.h		changeinfo.h		changenick.h		chatdlg.h		common.h		datatype .h		dialog.h		dragdrop.h		events.h		filexfer.h		flash.h			gnomecfg.h		gnomeicu.h		gtkconf.h		gtkfunc.h		histadd.h		icuchat.h		loadpixmap.h		log.h			menus.h			msg_queue.h		newsignup.h		packetprint.h		pixmaps.h		response.h		rus_conv.h		sendmsg.h		server.h		showlist.h		showwait.h		tcp.h			timezone.h		util.h			webpresence.h
 + 
 + 
 +-gnomeicu_LDADD = -lpanel_applet @GNOMEICU_LDADD@ 		@SOCKS_LIBDIR@ @SOCKS_LIBS@
 ++gnomeicu_LDADD = -lpanel_applet -ljcode @GNOMEICU_LDADD@ 		@SOCKS_LIBDIR@ @SOCKS_LIBS@
 + 
 + 
 + EXTRA_DIST =  	GnomeICU.desktop		GnomeICU.gnorba			GnomeICU.soundlist		gnome-gnomeicu.xpm
 diff -ruN gnome-icu.prev/patches/patch-ab gnome-icu/patches/patch-ab
 --- gnome-icu.prev/patches/patch-ab	Wed Aug 25 23:08:39 1999
 +++ gnome-icu/patches/patch-ab	Thu Nov 25 00:12:13 1999
 @@ -1,29 +1,11 @@
 -*** src/Makefile.am.orig	Sat Jul  3 13:25:31 1999
 ---- src/Makefile.am	Mon Jul  5 01:04:07 1999
 -***************
 -*** 31,36 ****
 ---- 31,37 ----
 -  	msg_queue.c	\
 -  	newsignup.c	\
 -  	response.c	\
 -+ 	l10n_conv.c	\
 -  	rus_conv.c	\
 -  	sendmsg.c	\
 -  	showwait.c	\
 -***************
 -*** 59,65 ****
 -  	timezone.h
 -  
 -  gnomeicu_LDADD = -lpanel_applet @APPLET_O@ @GNOMEICU_LDADD@ \
 -! 		@SOCKS_LIBDIR@ @SOCKS_LIBS@
 -  gnomeicu_DEPENDENCIES = @APPLET_O@
 -  
 -  EXTRA_DIST=			\
 ---- 60,66 ----
 -  	timezone.h
 -  
 -  gnomeicu_LDADD = -lpanel_applet @APPLET_O@ @GNOMEICU_LDADD@ \
 -! 		@SOCKS_LIBDIR@ @SOCKS_LIBS@ -ljcode
 -  gnomeicu_DEPENDENCIES = @APPLET_O@
 -  
 -  EXTRA_DIST=			\
 +--- src/Makefile.am.orig	Thu Aug  5 04:27:44 1999
 ++++ src/Makefile.am	Thu Nov 25 00:11:26 1999
 +@@ -82,7 +82,7 @@
 + 	util.h		\
 + 	webpresence.h
 + 
 +-gnomeicu_LDADD = -lpanel_applet @GNOMEICU_LDADD@ \
 ++gnomeicu_LDADD = -lpanel_applet -ljcode @GNOMEICU_LDADD@ \
 + 		@SOCKS_LIBDIR@ @SOCKS_LIBS@
 + 
 + EXTRA_DIST=			\
 diff -ruN gnome-icu.prev/patches/patch-ac gnome-icu/patches/patch-ac
 --- gnome-icu.prev/patches/patch-ac	Wed Aug 25 23:08:39 1999
 +++ gnome-icu/patches/patch-ac	Thu Nov 25 00:12:13 1999
 @@ -1,12 +1,10 @@
 -*** src/gnomeicu.c.orig	Sat Jul  3 13:25:31 1999
 ---- src/gnomeicu.c	Mon Jul  5 00:13:34 1999
 -***************
 -*** 1021,1026 ****
 ---- 1021,1027 ----
 -  	signal( SIGCHLD, &handle_signal );
 -  	signal( SIGUSR1, &handle_signal );
 -  
 -+ 	gtk_set_locale();
 -  	make_applet( argc, argv, &sal );
 -  	gnome_config_push_prefix( configfilename );
 -  
 +--- src/gnomeicu.c.orig	Wed Nov 17 10:57:40 1999
 ++++ src/gnomeicu.c	Thu Nov 25 00:11:26 1999
 +@@ -325,6 +325,7 @@
 + 
 + 	Current_Status = STATUS_OFFLINE;
 + 
 ++	gtk_set_locale();
 + 	make_applet( argc, argv );
 + 	gnome_config_push_prefix( configfilename );
 + 
 diff -ruN gnome-icu.prev/patches/patch-ad gnome-icu/patches/patch-ad
 --- gnome-icu.prev/patches/patch-ad	Wed Aug 25 23:08:39 1999
 +++ gnome-icu/patches/patch-ad	Thu Nov 25 00:12:13 1999
 @@ -1,13 +1,117 @@
 -*** src/gtkfunc.c.orig	Sat Jul  3 13:25:31 1999
 ---- src/gtkfunc.c	Sun Jul 11 23:52:44 1999
 -***************
 -*** 1941,1946 ****
 ---- 1941,1948 ----
 -  
 -  	if( message_text[ 0 ] == 'm' )
 -  	{
 -+                 message_text = l10n_conv( "toLocal", message_text );
 -+ 
 -  		table = gtk_table_new(3, 2, FALSE);
 -  		gtk_box_pack_start( GTK_BOX( mainbox ), table, TRUE, TRUE, 0);
 -  	
 +--- src/gtkfunc.c.orig	Sat Nov 13 07:49:38 1999
 ++++ src/gtkfunc.c	Thu Nov 25 00:11:26 1999
 +@@ -164,6 +164,8 @@
 + 
 + 	GSList *contact;
 + 
 ++	gchar *new_message_text;
 ++
 + #ifdef TRACE_FUNCTION
 + 	g_print( "icq_msgbox\n" );
 + #endif
 +@@ -262,6 +264,8 @@
 + 
 + 	if( message_text[ 0 ] == 'm' )
 + 	{
 ++		new_message_text = toLocal( message_text );
 ++
 + 		table = gtk_table_new(3, 2, FALSE);
 + 		gtk_box_pack_start( GTK_BOX( mainbox ), table, TRUE, TRUE, 0);
 + 	
 +@@ -299,7 +303,7 @@
 + 		gtk_widget_grab_focus( respond_text );
 + 
 + 		gtk_text_insert( GTK_TEXT( text ), NULL, NULL, NULL,
 +-		                 ( 1 + message_text ), -1 );
 ++		                 ( 1 + new_message_text ), -1 );
 + 
 + 		box = gtk_hbutton_box_new();
 + 		gtk_button_box_set_layout(GTK_BUTTON_BOX(box), GTK_BUTTONBOX_SPREAD);
 +@@ -366,6 +370,8 @@
 + 		gtk_widget_show( readnext_button );
 + 
 + 		gtk_widget_show(box);
 ++
 ++		g_free( new_message_text );
 + 	}
 + 	if( message_text[ 0 ] == 'n' )
 + 	{
 +@@ -430,6 +436,8 @@
 + 
 + 	if( message_text[ 0 ] == 'f' )
 + 	{
 ++		new_message_text = toLocal( message_text );
 ++
 + 		table = gtk_table_new( 3, 2, FALSE );
 + 
 + 		label = gtk_label_new( _("File Name:") );
 +@@ -464,7 +472,7 @@
 + 		g_free( filesize );
 + 
 + 		entry = gtk_entry_new();
 +-		gtk_entry_set_text( GTK_ENTRY( entry ), &message_text[1] );
 ++		gtk_entry_set_text( GTK_ENTRY( entry ), &new_message_text[1] );
 + 		gtk_widget_set_usize( entry, 75, 0 );
 + 		gtk_table_attach_defaults( GTK_TABLE( table ), entry, 1, 2, 2, 3 );
 + 		gtk_widget_show( entry );
 +@@ -499,6 +507,8 @@
 + 	                             GTK_OBJECT(window));
 + 		gtk_widget_show( button );
 + 		gtk_widget_show( box );
 ++
 ++		g_free( new_message_text );
 + 	}
 + 
 + 	if( message_text[ 0 ] == 'a' )
 +@@ -534,8 +544,13 @@
 + 		GtkWidget *url = gtk_entry_new();
 + 		GtkWidget *desc = gtk_entry_new();
 + 
 +-		gchar *curl = (char *)g_malloc( strlen( message_text ) );
 +-		gchar *cdesc = (char *)g_malloc( strlen( message_text ) );
 ++		gchar *curl;
 ++		gchar *cdesc;
 ++
 ++		new_message_text = toLocal( message_text );
 ++
 ++		curl = (char *)g_malloc( strlen( new_message_text ) );
 ++		cdesc = (char *)g_malloc( strlen( new_message_text ) );
 + 
 + 		gtk_misc_set_alignment( GTK_MISC( message ), 0.0, 0.5 );
 + 
 +@@ -544,9 +559,9 @@
 + 
 + 		for( cx = 1; ; cx ++ )
 + 		{
 +-			if( message_text[ cx ] == '\xFE' || message_text[ cx ] == 0x00 )
 ++			if( new_message_text[ cx ] == '\xFE' || new_message_text[ cx ] == 0x00 )
 + 			{
 +-				if( message_text[ cx ] == 0x00 )
 ++				if( new_message_text[ cx ] == 0x00 )
 + 				{
 + 					url_len = cx - 2 - desc_len;
 + 					break;
 +@@ -556,11 +571,11 @@
 + 			}
 + 		}
 + 
 +-		memcpy( cdesc, message_text + 1, desc_len );
 ++		memcpy( cdesc, new_message_text + 1, desc_len );
 + 		cdesc[ desc_len ] = 0x00;
 +-		memcpy( curl, message_text + 2 + desc_len, url_len );
 ++		memcpy( curl, new_message_text + 2 + desc_len, url_len );
 + 		curl[ url_len ]  = 0x00;
 +-/*		sscanf( message_text + 1, "%[^\xFE]\xFE%[^\xFE]", cdesc, curl );*/
 ++/*		sscanf( new_message_text + 1, "%[^\xFE]\xFE%[^\xFE]", cdesc, curl );*/
 + 		
 + 		gtk_entry_set_text( GTK_ENTRY( url ), curl );
 + 		gtk_entry_set_text( GTK_ENTRY( desc ), cdesc );
 +@@ -603,6 +618,8 @@
 + 
 + 		gtk_widget_show( url );
 + 		gtk_widget_show( desc );
 ++
 ++		g_free( new_message_text );
 + 	}
 + 	gtk_widget_show( window );
 + }
 diff -ruN gnome-icu.prev/patches/patch-ae gnome-icu/patches/patch-ae
 --- gnome-icu.prev/patches/patch-ae	Wed Aug 25 23:08:39 1999
 +++ gnome-icu/patches/patch-ae	Thu Nov 25 00:12:13 1999
 @@ -1,123 +1,98 @@
 -*** src/histadd.c.orig	Wed Jun 30 06:56:19 1999
 ---- src/histadd.c	Sat Aug  7 00:33:41 1999
 -***************
 -*** 13,22 ****
 -  	time_t timedate;
 -  	struct tm *my_tm;
 -  	char pdate[46];
 -- 	int cx, cy, cz;
 -  	char *halves[] = { "AM", "PM" };
 -  	int half = 0;
 -- 	char buf[ 1024 ];
 -  
 -  	char *filename;
 -  	int file;
 ---- 13,20 ----
 -***************
 -*** 25,30 ****
 ---- 23,30 ----
 -  	g_print( "add_incoming_to_history\n" );
 -  #endif
 -  
 -+ 	statement = l10n_conv( "toLocal", statement );
 -+ 
 -  	strings[ 0 ] = pdate;
 -  	strings[ 1 ] = who;
 -  	strings[ 2 ] = statement;
 -***************
 -*** 49,80 ****
 -  
 -  	write( file, pdate, strlen( pdate ) );
 -  
 -! 	strcpy( buf, "" );
 -! 	cy = cz = 0;
 -! 	for( cx = 0; cx < strlen( statement ); cx ++ )
 -! 	{
 -! 		cy ++;
 -! 		if( statement[cx] == '\n' || cy == 70 ||
 -! 		    ( cy >= 60 && statement[cx] == ' ' ) )
 -! 		{
 -! 			write( file, ( statement + cz ), cy );
 -! 			if( cy >= 60 && cy != 70 )
 -! 			{
 -! 				write( file, "\n", 1 );
 -! 			}
 -! 			if( cy == 70 )
 -! 			{
 -! 				write( file, "-\n", 2 );
 -! 			}
 -! 			cz += cy;
 -! 			cy = 0;
 -! 		}
 -! 	}			
 -! 
 -! 	if( cz != strlen( statement ) )
 -! 	{
 -! 		write( file, ( statement + cz ), strlen( statement ) - cz );
 -! 	}
 -  
 -  	write( file, "\n", 1 );
 -  
 ---- 49,55 ----
 -  
 -  	write( file, pdate, strlen( pdate ) );
 -  
 -! 	write( file, statement, strlen( statement ) );
 -  
 -  	write( file, "\n", 1 );
 -  
 -***************
 -*** 88,97 ****
 -  	time_t timedate;
 -  	struct tm *my_tm;
 -  	char pdate[42];
 -- 	int cx, cy, cz;
 -  	char *halves[] = { "AM", "PM" };
 -  	int half = 0;
 -- 	char buf[ 1024 ];
 -  
 -  	char *filename;
 -  	int file;
 ---- 63,70 ----
 -***************
 -*** 124,155 ****
 -  
 -  	write( file, pdate, strlen( pdate ) );
 -  
 -! 	strcpy( buf, "" );
 -! 	cy = cz = 0;
 -! 	for( cx = 0; cx < strlen( statement ); cx ++ )
 -! 	{
 -! 		cy ++;
 -! 		if( statement[cx] == '\n' || cy == 70 ||
 -! 		    ( cy >= 60 && statement[cx] == ' ' ) )
 -! 		{
 -! 			write( file, ( statement + cz ), cy );
 -! 			if( cy >= 60 && cy != 70 )
 -! 			{
 -! 				write( file, "\n", 1 );
 -! 			}
 -! 			if( cy == 70 )
 -! 			{
 -! 				write( file, "-\n", 2 );
 -! 			}
 -! 			cz += cy;
 -! 			cy = 0;
 -! 		}
 -! 	}			
 -! 
 -! 	if( cz != strlen( statement ) )
 -! 	{
 -! 		write( file, ( statement + cz ), strlen( statement ) - cz );
 -! 	}
 -  	
 -  	write( file, "\n", 1 );
 -  
 ---- 97,103 ----
 -  
 -  	write( file, pdate, strlen( pdate ) );
 -  
 -! 	write( file, statement, strlen( statement ) );
 -  	
 -  	write( file, "\n", 1 );
 -  
 +--- src/histadd.c.orig	Mon Jul 26 19:58:48 1999
 ++++ src/histadd.c	Thu Nov 25 00:11:26 1999
 +@@ -22,13 +22,14 @@
 + 	time_t timedate;
 + 	struct tm *my_tm;
 + 	gchar *pdate = NULL;
 +-	int cx, cy, cz;
 + 	char *halves[] = { "AM", "PM" };
 + 	int half = 0;
 + 
 + 	gchar *filename;
 + 	int file;
 + 
 ++	gchar *new_statement = toLocal( statement );
 ++
 + #ifdef TRACE_FUNCTION
 + 	g_print( "add_incoming_to_history\n" );
 + #endif
 +@@ -64,35 +65,13 @@
 + 
 + 	g_free( pdate );
 + 
 +-	cy = cz = 0;
 +-	for( cx = 0; cx < strlen( statement ); cx ++ )
 +-	{
 +-		cy ++;
 +-		if( statement[cx] == '\n' || cy == 70 ||
 +-		    ( cy >= 60 && statement[cx] == ' ' ) )
 +-		{
 +-			write( file, ( statement + cz ), cy );
 +-			if( cy >= 60 && cy != 70 )
 +-			{
 +-				write( file, "\n", 1 );
 +-			}
 +-			if( cy == 70 )
 +-			{
 +-				write( file, "-\n", 2 );
 +-			}
 +-			cz += cy;
 +-			cy = 0;
 +-		}
 +-	}			
 +-
 +-	if( cz != strlen( statement ) )
 +-	{
 +-		write( file, ( statement + cz ), strlen( statement ) - cz );
 +-	}
 ++	write( file, new_statement, strlen( new_statement ) );
 + 
 + 	write( file, "\n", 1 );
 + 
 + 	close( file );
 ++
 ++	g_free( new_statement );
 + }
 + 
 + void add_outgoing_to_history( int uin, char *statement )
 +@@ -100,7 +79,6 @@
 + 	time_t timedate;
 + 	struct tm *my_tm;
 + 	gchar *pdate = NULL;
 +-	int cx, cy, cz;
 + 	char *halves[] = { "AM", "PM" };
 + 	int half = 0;
 + 
 +@@ -144,31 +122,7 @@
 + 
 + 	g_free( pdate );
 + 
 +-	cy = cz = 0;
 +-	for( cx = 0; cx < strlen( statement ); cx ++ )
 +-	{
 +-		cy ++;
 +-		if( statement[cx] == '\n' || cy == 70 ||
 +-		    ( cy >= 60 && statement[cx] == ' ' ) )
 +-		{
 +-			write( file, ( statement + cz ), cy );
 +-			if( cy >= 60 && cy != 70 )
 +-			{
 +-				write( file, "\n", 1 );
 +-			}
 +-			if( cy == 70 )
 +-			{
 +-				write( file, "-\n", 2 );
 +-			}
 +-			cz += cy;
 +-			cy = 0;
 +-		}
 +-	}			
 +-
 +-	if( cz != strlen( statement ) )
 +-	{
 +-		write( file, ( statement + cz ), strlen( statement ) - cz );
 +-	}
 ++	write( file, statement, strlen( statement ) );
 + 	
 + 	write( file, "\n", 1 );
 + 
 diff -ruN gnome-icu.prev/patches/patch-af gnome-icu/patches/patch-af
 --- gnome-icu.prev/patches/patch-af	Wed Aug 25 23:08:40 1999
 +++ gnome-icu/patches/patch-af	Thu Nov 25 00:12:13 1999
 @@ -1,54 +1,143 @@
 -*** src/sendmsg.c.orig	Sat Jul  3 13:25:31 1999
 ---- src/sendmsg.c	Wed Jul 14 01:53:59 1999
 -***************
 -*** 258,267 ****
 -  		return;
 -  	}
 -  
 -- 	new_text = cr_convert( text );
 -- 
 -  	/* Add statement to personal history file */
 -! 	add_outgoing_to_history( uin, new_text );
 -  
 -  	rus_conv( RUS_KOI_WIN, new_text );
 -  	if( !forced && !force_toggle && TCPSendMessage( uin, new_text, data ) )
 ---- 258,267 ----
 -  		return;
 -  	}
 -  
 -  	/* Add statement to personal history file */
 -! 	add_outgoing_to_history( uin, text );
 -! 
 -! 	new_text = cr_convert( l10n_conv( "toNet", text ) );
 -  
 -  	rus_conv( RUS_KOI_WIN, new_text );
 -  	if( !forced && !force_toggle && TCPSendMessage( uin, new_text, data ) )
 -***************
 -*** 359,371 ****
 -  	sprintf( text, "%s\xFE%s", gtk_entry_get_text( GTK_ENTRY( data->desc ) ),
 -  	         gtk_entry_get_text( GTK_ENTRY( data->url ) ) );
 -  
 -- 	new_text = cr_convert( text );
 -- 	buf = (char *)g_malloc( sizeof( char ) * ( 16 + strlen( new_text ) ) );
 -- 
 -  	/* Add statement to personal history file */
 -! 	add_outgoing_to_history( uin, new_text );
 -  
 -! 	rus_conv( RUS_KOI_WIN, new_text );
 -  	if( TCPSendURL( uin, new_text, data->data ) )
 -  	{
 -  		sprintf( buf, "Sent URL (TCP)" );
 ---- 359,371 ----
 -  	sprintf( text, "%s\xFE%s", gtk_entry_get_text( GTK_ENTRY( data->desc ) ),
 -  	         gtk_entry_get_text( GTK_ENTRY( data->url ) ) );
 -  
 -  	/* Add statement to personal history file */
 -! 	add_outgoing_to_history( uin, text );
 -  
 -! 	new_text = cr_convert( l10n_conv( "toNet", text ) );
 -! 	buf = (char *)g_malloc( sizeof( char ) * ( 16 + strlen( new_text ) ) );
 -! 
 -! 	/* rus_conv( RUS_KOI_WIN, new_text ); */
 -  	if( TCPSendURL( uin, new_text, data->data ) )
 -  	{
 -  		sprintf( buf, "Sent URL (TCP)" );
 +--- src/sendmsg.c.orig	Tue Nov  9 00:18:40 1999
 ++++ src/sendmsg.c	Thu Nov 25 00:11:26 1999
 +@@ -20,13 +20,15 @@
 + #define SOCKS 1
 + #include <socks.h>
 + #endif
 ++#include <jlib.h>
 + 
 + int search_wait;
 + 
 + DWORD our_session;
 + 
 + /*** Local function declarations ***/
 +-static char *cr_convert( const gchar *text );
 ++static gchar *cr_convert( const gchar *text );
 ++static gchar *cr_unconvert( const gchar *text );
 + static void Wrinkle( void *buf, size_t len );
 + static void Gen_Checksum( BYTE * buf, DWORD len );
 + static DWORD Scramble_cc( DWORD cc );
 +@@ -231,10 +233,10 @@
 + 		return;
 + 	}
 + 
 +-	new_text = cr_convert( text );
 +-
 + 	/* Add statement to personal history file */
 +-	add_outgoing_to_history( uin, new_text );
 ++	add_outgoing_to_history( uin, text );
 ++
 ++	new_text = toNet( text );
 + 
 + 	rus_conv( RUS_KOI_WIN, new_text );
 + 	if( !forced && !toggles->force && TCPSendMessage( uin, new_text) )
 +@@ -322,14 +324,20 @@
 + 
 + 	uin = ((CONTACT_PTR)data->contact->data)->uin;
 + 	
 +-	text = g_strdup_printf( "%s\xFE%s",
 ++	text = g_strdup_printf( "%s\n%s",
 + 				gtk_entry_get_text( GTK_ENTRY( data->desc ) ),
 + 				gtk_entry_get_text( GTK_ENTRY( data->url ) ) );
 +-	new_text = cr_convert( text );
 +-	g_free( text );
 + 
 + 	/* Add statement to personal history file */
 +-	add_outgoing_to_history( uin, new_text );
 ++	add_outgoing_to_history( uin, text );
 ++
 ++	g_free( text );
 ++
 ++	text = g_strdup_printf( "%s\xFE%s",
 ++				gtk_entry_get_text( GTK_ENTRY( data->desc ) ),
 ++				gtk_entry_get_text( GTK_ENTRY( data->url ) ) );
 ++	new_text = toNet( text );
 ++	g_free( text );
 + 
 + 	rus_conv( RUS_KOI_WIN, new_text );
 + 	if( TCPSendURL( uin, new_text ) )
 +@@ -655,6 +663,8 @@
 + 	net_icq_pak pak;
 + 	int size ;
 + 
 ++	gchar *new_about;
 ++
 + 	Word_2_Chars( pak.head.ver, ICQ_VER );
 + 	Word_2_Chars( pak.head.cmd, CMD_UPDATE_INFO );
 + 	Word_2_Chars( pak.head.seq, seq_num++ );
 +@@ -787,10 +797,15 @@
 +    
 +    Word_2_Chars( pak.data , META_INFO_ABOUT );
 +    size = 2;
 +-	Word_2_Chars( pak.data + size, strlen( cr_convert( our_info->about ) ) + 1 );
 ++
 ++	new_about = toNet( our_info->about );
 ++
 ++	Word_2_Chars( pak.data + size, strlen( new_about ) + 1 );
 + 	size += 2;
 +-	strcpy( pak.data + size, cr_convert( our_info->about ) );
 +-	size += strlen( cr_convert( our_info->about ) ) + 1;
 ++	strcpy( pak.data + size, new_about );
 ++	size += strlen( new_about ) + 1;
 ++
 ++	g_free( new_about );
 + 
 + 	SOCKWRITE( &(pak.head.ver), size + sizeof( pak.head ) - 2, "CMD_META_USER(META_INFO_ABOUT)");
 + }
 +@@ -862,6 +877,56 @@
 + 	t[ cy ] = 0x00;
 + 	
 + 	return t;
 ++}
 ++
 ++gchar *cr_unconvert( const gchar *text )
 ++{
 ++	char *t;
 ++	int cx, cy;
 ++	
 ++	cy = 0;
 ++	for( cx = 0; cx < strlen( text ); cx ++ )
 ++	{
 ++		if( text[ cx ] == '\r' )
 ++			cy ++;
 ++	}
 ++	
 ++	t = g_malloc( strlen( text ) - cy + 1 );
 ++
 ++	cy = 0;
 ++	for( cx = 0; cx < strlen( text ); cx ++ )
 ++	{
 ++		if( text[ cx ] != '\r' )
 ++			t[ cy ++ ] = text[ cx ];
 ++	}
 ++
 ++	t[ cy ] = 0x00;
 ++	
 ++	return t;
 ++}
 ++
 ++gchar *toNet( const gchar *text )
 ++{
 ++  gchar *tmp1, *tmp2;
 ++
 ++  tmp1 = cr_convert( text );
 ++  tmp2 = toStringSJISfromEUC( tmp1 );
 ++
 ++  g_free( tmp1 );
 ++
 ++  return tmp2;
 ++}
 ++
 ++gchar *toLocal( const gchar *text )
 ++{
 ++  gchar *tmp1, *tmp2;
 ++
 ++  tmp1 = cr_unconvert( text );
 ++  tmp2 = toStringEUCfromSJIS( tmp1 );
 ++
 ++  g_free( tmp1 );
 ++
 ++  return tmp2;
 + }
 + 
 + void Wrinkle( void *buf, size_t len )
 diff -ruN gnome-icu.prev/patches/patch-ag gnome-icu/patches/patch-ag
 --- gnome-icu.prev/patches/patch-ag	Wed Aug 25 23:08:40 1999
 +++ gnome-icu/patches/patch-ag	Thu Jan  1 09:00:00 1970
 @@ -1,13 +0,0 @@
 -*** src/gnomeicu.h.orig	Sat Jul  3 08:12:47 1999
 ---- src/gnomeicu.h	Sun Jul 11 23:51:39 1999
 -***************
 -*** 583,588 ****
 ---- 583,590 ----
 -  extern GtkWidget *app;
 -  extern int applet_toggle;
 -  
 -+ char *l10n_conv( char *to, char *t_in );
 -+ 
 -  #endif
 -  
 -  #define RUS_WIN_KOI 0
 diff -ruN gnome-icu.prev/patches/patch-ah gnome-icu/patches/patch-ah
 --- gnome-icu.prev/patches/patch-ah	Wed Aug 25 23:08:40 1999
 +++ gnome-icu/patches/patch-ah	Thu Jan  1 09:00:00 1970
 @@ -1,22 +0,0 @@
 -*** /dev/null	Sat Aug  7 00:47:29 1999
 ---- src/l10n_conv.c	Mon Jul 12 01:36:48 1999
 -***************
 -*** 0 ****
 ---- 1,17 ----
 -+ /*
 -+  * Localization
 -+  *
 -+  */
 -+ 
 -+ #include "gnomeicu.h"
 -+ #include <jlib.h>
 -+ 
 -+ char *l10n_conv( char to[10], char *t_in ){
 -+   if(!strcmp(to, "toLocal")){
 -+     return toStringEUCfromSJIS( t_in );
 -+   }else if(!strcmp(to, "toNet")){
 -+     return toStringSJISfromEUC( t_in );
 -+   }
 -+ 
 -+   return t_in;
 -+ }
 diff -ruN gnome-icu.prev/patches/patch-ai gnome-icu/patches/patch-ai
 --- gnome-icu.prev/patches/patch-ai	Thu Jan  1 09:00:00 1970
 +++ gnome-icu/patches/patch-ai	Thu Nov 25 00:12:13 1999
 @@ -0,0 +1,10 @@
 +--- src/sendmsg.h.orig	Tue Aug 10 05:44:52 1999
 ++++ src/sendmsg.h	Thu Nov 25 00:11:26 1999
 +@@ -26,5 +26,7 @@
 + size_t SOCKREAD( void * ptr, size_t len );
 + void Update_User_Info( void );
 + void info_req_99( UIN_T uin );
 ++gchar *toNet( const gchar *text );
 ++gchar *toLocal( const gchar *text );
 + 
 + #endif /* __SENDMSG_H__ */
 diff -ruN gnome-icu.prev/patches/patch-aj gnome-icu/patches/patch-aj
 --- gnome-icu.prev/patches/patch-aj	Thu Jan  1 09:00:00 1970
 +++ gnome-icu/patches/patch-aj	Thu Nov 25 00:12:13 1999
 @@ -0,0 +1,14 @@
 +--- src/rus_conv.c.orig	Mon Jul 26 19:58:48 1999
 ++++ src/rus_conv.c	Thu Nov 25 00:11:26 1999
 +@@ -37,6 +37,11 @@
 + void rus_conv( short to, char *t_in )
 + {
 + 	static uchar *table = NULL;
 ++	char *lang = getenv("LANG");
 ++
 ++	if (lang[0] == 'j' && lang[1] == 'a') {
 ++		return;
 ++	}
 + 
 + 	switch( to )
 + 	{
 diff -ruN gnome-icu.prev/patches/patch-ak gnome-icu/patches/patch-ak
 --- gnome-icu.prev/patches/patch-ak	Thu Jan  1 09:00:00 1970
 +++ gnome-icu/patches/patch-ak	Thu Nov 25 00:12:13 1999
 @@ -0,0 +1,25 @@
 +--- src/tcp.c.orig	Tue Nov  9 00:24:01 1999
 ++++ src/tcp.c	Thu Nov 25 00:11:28 1999
 +@@ -1547,7 +1547,8 @@
 + 	if( (Current_Status&0xffff) != STATUS_ONLINE && (Current_Status&0xffff) != STATUS_FREE_CHAT &&
 + 	    (Current_Status&0xffff) != STATUS_INVISIBLE )
 + 		sent_message = Away_Message;
 +-	
 ++	sent_message = toNet( sent_message );
 ++
 + 	DW_2_Chars( pack_head.uin1, our_info->uin );
 + 	Word_2_Chars( pack_head.version, 0x0003 );
 + 	Word_2_Chars( pack_head.command, ICQ_CMDxTCP_ACK );
 +@@ -1608,8 +1609,12 @@
 + 		g_free( buffer );
 + 	}
 + 	else
 ++	{
 ++		g_free( sent_message );
 + 		return -1;
 ++	}
 + 
 ++	g_free( sent_message );
 + 	return 1;
 + }
 + 
 diff -ruN gnome-icu.prev/pkg/PLIST gnome-icu/pkg/PLIST
 --- gnome-icu.prev/pkg/PLIST	Sun Jul  4 00:32:23 1999
 +++ gnome-icu/pkg/PLIST	Wed Nov 24 23:32:12 1999
 @@ -1,23 +1,40 @@
  bin/gnomeicu
  etc/CORBA/servers/GnomeICU.gnorba
  etc/sound/events/GnomeICU.soundlist
 -share/gnome/applets/Network/GnomeICU.desktop
 +share/gnome/pixmaps/gnomeicu/animeyes.png
 +share/gnome/pixmaps/gnomeicu/eye_na.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-auth.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-away.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-blank.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-chat.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-chat2.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-dnd.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-ffc.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-file.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-info.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-inv.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-message.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-na.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-nomess.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-occ.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-offline.xpm
 +share/gnome/pixmaps/gnomeicu/offline.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-online.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-url.xpm
 +share/gnome/pixmaps/gnomeicu/online.xpm
  share/gnome/pixmaps/gnome-gnomeicu.xpm
 -share/gnome/pixmaps/gnomeicu-auth.xpm
 -share/gnome/pixmaps/gnomeicu-away.xpm
 -share/gnome/pixmaps/gnomeicu-blank.xpm
 -share/gnome/pixmaps/gnomeicu-chat.xpm
 -share/gnome/pixmaps/gnomeicu-chat2.xpm
 -share/gnome/pixmaps/gnomeicu-dnd.xpm
 -share/gnome/pixmaps/gnomeicu-ffc.xpm
 -share/gnome/pixmaps/gnomeicu-file.xpm
 -share/gnome/pixmaps/gnomeicu-info.xpm
 -share/gnome/pixmaps/gnomeicu-inv.xpm
 -share/gnome/pixmaps/gnomeicu-message.xpm
 -share/gnome/pixmaps/gnomeicu-na.xpm
 -share/gnome/pixmaps/gnomeicu-nomess.xpm
 -share/gnome/pixmaps/gnomeicu-occ.xpm
 -share/gnome/pixmaps/gnomeicu-offline.xpm
 -share/gnome/pixmaps/gnomeicu-online.xpm
 -share/gnome/pixmaps/gnomeicu-url.xpm
  share/gnome/sounds/gnomeicu/message.wav
 +share/gnome/applets/Network/GnomeICU.desktop
 +share/gnome/gnome/help/gnomeicu/C/index.html
 +share/gnome/gnome/help/gnomeicu/C/topic.dat
 +share/gnome/gnome/help/gnomeicu/C/book1.html
 +share/gnome/gnome/help/gnomeicu/C/c11.html
 +share/gnome/gnome/help/gnomeicu/C/c65.html
 +share/gnome/gnome/help/gnomeicu/C/ln9.html
 +share/gnome/gnome/help/gnomeicu/C/x17.html
 +share/gnome/gnome/help/gnomeicu/C/x62.html
 +share/gnome/gnome/help/gnomeicu/C/docbook.css
 +@dirrm share/gnome/gnome/help/gnomeicu/C
 +@dirrm share/gnome/gnome/help/gnomeicu
 +@dirrm share/gnome/pixmaps/gnomeicu
 +@dirrm share/gnome/sounds/gnomeicu
 

From: Akinori MUSHA aka knu <knu@idaemons.org>
To: FreeBSD-gnats-submit@freebsd.org, flathill@flathill.gr.jp
Cc:  
Subject: Re: ports/15005: Updated port: japanese/gnomeicu
Date: Mon, 29 Nov 1999 19:02:31 +0900

 	Here is a total patch which supersedes the followup that I
 sent on Fri, 26 Nov 1999 00:58:59 +0900. (and all the earlier)
 
 	Fixed the problem on "resent through server", in short.
 
 -- 
                      /
                     /__  __
                    / )  )  ) )  /  http://www.idaemons.org/knu/
 Akinori MUSHA aka / (_ /  ( (__(   mailto:knu@idaemons.org
 
 "We are but hungry..  Associated Ita-meshi Daemons!"
                                    http://www.idaemons.org/
 
 diff -ruN gnome-icu.prev/Makefile gnome-icu/Makefile
 --- gnome-icu.prev/Makefile	Sun Oct 17 22:45:03 1999
 +++ gnome-icu/Makefile	Fri Nov 26 14:42:48 1999
 @@ -1,18 +1,18 @@
  # Ports collection Makefile for:	GnomeICU
 -# Version required:			0.65
 +# Version required:			0.67
  # Date created:				08/08/1999
 -# Whom:					knu@and.or.jp
 +# Whom:					knu@idaemons.org
  #
  # $FreeBSD: ports/japanese/gnome-icu/Makefile,v 1.15 1999/10/17 13:45:03 asami Exp $
  #
  
 -DISTNAME=		gnomeicu-0.65
 -PKGNAME=		ja-gnomeicu-0.65
 +DISTNAME=		gnomeicu-0.67
 +PKGNAME=		ja-gnomeicu-0.67
  CATEGORIES=		japanese net gnome
  MASTER_SITES=		ftp://gnomeicu.gdev.net/pub/gnomeicu/ \
  			http://www.nectar.cc/distfiles/
  
 -MAINTAINER=		knu@and.or.jp
 +MAINTAINER=		knu@idaemons.org
  
  LIB_DEPENDS=		panel_applet.2:${PORTSDIR}/x11/gnomecore
  BUILD_DEPENDS=		${LOCALBASE}/lib/libjcode.a:${PORTSDIR}/japanese/libjcode \
 diff -ruN gnome-icu.prev/files/md5 gnome-icu/files/md5
 --- gnome-icu.prev/files/md5	Sun Jul  4 00:32:23 1999
 +++ gnome-icu/files/md5	Fri Nov 26 14:42:48 1999
 @@ -1 +1 @@
 -MD5 (gnomeicu-0.65.tar.bz2) = b2ca09340242b12266924d7daa029e5a
 +MD5 (gnomeicu-0.67.tar.bz2) = 5a1051c381ed93e3f15bf9693772c671
 diff -ruN gnome-icu.prev/patches/patch-aa gnome-icu/patches/patch-aa
 --- gnome-icu.prev/patches/patch-aa	Wed Aug 25 23:08:38 1999
 +++ gnome-icu/patches/patch-aa	Fri Nov 26 14:42:48 1999
 @@ -1,53 +1,11 @@
 -*** src/Makefile.in.orig	Sat Jul  3 13:31:23 1999
 ---- src/Makefile.in	Mon Jul  5 01:08:34 1999
 -***************
 -*** 111,120 ****
 -  
 -  bin_PROGRAMS = gnomeicu
 -  
 -! gnomeicu_SOURCES =  	autoaway.c		changeaway.c		changeinfo.c		changename.c		chatdlg.c		dialog.c		dragdrop.c		events.c		filexfer.c		flash.c			gnomecfg.c		gnomeicu.c		gtkconf.c		gtkfunc.c		histadd.c		loadpixmap.c		log.c			msg_queue.c		newsignup.c		response.c		rus_conv.c		sendmsg.c		showwait.c		tcp.c			ui.c			util.c			webpresence.c		applet.h		brazil.h		chatdlg.h		datatype.h		dialog.h		dragdrop.h		english.h		events.h		filexfer.h		gtkfunc.h		gnomeicu.h		lang.h			loadpixmap.h		msg_queue.h		pixmaps.h		russian.h 		sendmsg.h		tcp.h			timezone.h
 -  
 -  
 -! gnomeicu_LDADD = -lpanel_applet @APPLET_O@ @GNOMEICU_LDADD@ 		@SOCKS_LIBDIR@ @SOCKS_LIBS@
 -  
 -  gnomeicu_DEPENDENCIES = @APPLET_O@
 -  
 ---- 111,120 ----
 -  
 -  bin_PROGRAMS = gnomeicu
 -  
 -! gnomeicu_SOURCES =  	autoaway.c		changeaway.c		changeinfo.c		changename.c		chatdlg.c		dialog.c		dragdrop.c		events.c		filexfer.c		flash.c			gnomecfg.c		gnomeicu.c		gtkconf.c		gtkfunc.c		histadd.c		loadpixmap.c		log.c			msg_queue.c		newsignup.c		response.c		l10n_conv.c		rus_conv.c		sendmsg.c		showwait.c		tcp.c			ui.c			util.c			webpresence.c		applet.h		brazil.h		chatdlg.h		datatype.h		dialog.h		dragdrop.h		english.h		events.h		filexfer.h		gtkfunc.h		gnomeicu.h		lang.h			loadpixmap.h		msg_queue.h		pixmaps .h		russian.h		sendmsg.h		tcp.h			timezone.h
 -  
 -  
 -! gnomeicu_LDADD = -lpanel_applet @APPLET_O@ @GNOMEICU_LDADD@ 		@SOCKS_LIBDIR@ @SOCKS_LIBS@ -ljcode
 -  
 -  gnomeicu_DEPENDENCIES = @APPLET_O@
 -  
 -***************
 -*** 145,151 ****
 -  gnomeicu_OBJECTS =  autoaway.o changeaway.o changeinfo.o changename.o \
 -  chatdlg.o dialog.o dragdrop.o events.o filexfer.o flash.o gnomecfg.o \
 -  gnomeicu.o gtkconf.o gtkfunc.o histadd.o loadpixmap.o log.o msg_queue.o \
 -! newsignup.o response.o rus_conv.o sendmsg.o showwait.o tcp.o ui.o \
 -  util.o webpresence.o
 -  gnomeicu_LDFLAGS = 
 -  CFLAGS = @CFLAGS@
 ---- 145,151 ----
 -  gnomeicu_OBJECTS =  autoaway.o changeaway.o changeinfo.o changename.o \
 -  chatdlg.o dialog.o dragdrop.o events.o filexfer.o flash.o gnomecfg.o \
 -  gnomeicu.o gtkconf.o gtkfunc.o histadd.o loadpixmap.o log.o msg_queue.o \
 -! newsignup.o response.o l10n_conv.o rus_conv.o sendmsg.o showwait.o tcp.o ui.o \
 -  util.o webpresence.o
 -  gnomeicu_LDFLAGS = 
 -  CFLAGS = @CFLAGS@
 -***************
 -*** 464,469 ****
 ---- 464,471 ----
 -  	filexfer.h
 -  response.o: response.c ../config.h datatype.h gnomeicu.h gtkfunc.h \
 -  	dialog.h filexfer.h events.h applet.h
 -+ l10n_conv.o: l10n_conv.c gnomeicu.h datatype.h gtkfunc.h dialog.h \
 -+ 	filexfer.h
 -  rus_conv.o: rus_conv.c gnomeicu.h datatype.h gtkfunc.h dialog.h \
 -  	filexfer.h
 -  sendmsg.o: sendmsg.c ../config.h datatype.h gnomeicu.h gtkfunc.h \
 +--- src/Makefile.in.orig	Fri Nov 19 00:21:55 1999
 ++++ src/Makefile.in	Thu Nov 25 00:11:26 1999
 +@@ -128,7 +128,7 @@
 + gnomeicu_SOURCES =  	applet.c		autoaway.c		autohide.c		changeaway.c		changeinfo.c		changenick.c		chatdlg.c		dialog.c		dragdrop.c		events.c		filexfer.c		flash.c			gnomecfg.c		gnomeicu.c		gtkconf.c		gtkfunc.c		histadd.c		icuchat.c		loadpixmap.c		log.c			msg_queue.c		newsignup.c		packetprint.c		response.c		rus_conv.c		sendmsg.c		server.c		showlist.c		showwait.c		tcp.c			util.c			webpresence.c		applet.h		autoaway.h		autohide.h		brazil.h		changeaway.h		changeinfo.h		changenick.h		chatdlg.h		common.h		datatype .h		dialog.h		dragdrop.h		events.h		filexfer.h		flash.h			gnomecfg.h		gnomeicu.h		gtkconf.h		gtkfunc.h		histadd.h		icuchat.h		loadpixmap.h		log.h			menus.h			msg_queue.h		newsignup.h		packetprint.h		pixmaps.h		response.h		rus_conv.h		sendmsg.h		server.h		showlist.h		showwait.h		tcp.h			timezone.h		util.h			webpresence.h
 + 
 + 
 +-gnomeicu_LDADD = -lpanel_applet @GNOMEICU_LDADD@ 		@SOCKS_LIBDIR@ @SOCKS_LIBS@
 ++gnomeicu_LDADD = -lpanel_applet -ljcode @GNOMEICU_LDADD@ 		@SOCKS_LIBDIR@ @SOCKS_LIBS@
 + 
 + 
 + EXTRA_DIST =  	GnomeICU.desktop		GnomeICU.gnorba			GnomeICU.soundlist		gnome-gnomeicu.xpm
 diff -ruN gnome-icu.prev/patches/patch-ab gnome-icu/patches/patch-ab
 --- gnome-icu.prev/patches/patch-ab	Wed Aug 25 23:08:39 1999
 +++ gnome-icu/patches/patch-ab	Fri Nov 26 14:42:48 1999
 @@ -1,29 +1,11 @@
 -*** src/Makefile.am.orig	Sat Jul  3 13:25:31 1999
 ---- src/Makefile.am	Mon Jul  5 01:04:07 1999
 -***************
 -*** 31,36 ****
 ---- 31,37 ----
 -  	msg_queue.c	\
 -  	newsignup.c	\
 -  	response.c	\
 -+ 	l10n_conv.c	\
 -  	rus_conv.c	\
 -  	sendmsg.c	\
 -  	showwait.c	\
 -***************
 -*** 59,65 ****
 -  	timezone.h
 -  
 -  gnomeicu_LDADD = -lpanel_applet @APPLET_O@ @GNOMEICU_LDADD@ \
 -! 		@SOCKS_LIBDIR@ @SOCKS_LIBS@
 -  gnomeicu_DEPENDENCIES = @APPLET_O@
 -  
 -  EXTRA_DIST=			\
 ---- 60,66 ----
 -  	timezone.h
 -  
 -  gnomeicu_LDADD = -lpanel_applet @APPLET_O@ @GNOMEICU_LDADD@ \
 -! 		@SOCKS_LIBDIR@ @SOCKS_LIBS@ -ljcode
 -  gnomeicu_DEPENDENCIES = @APPLET_O@
 -  
 -  EXTRA_DIST=			\
 +--- src/Makefile.am.orig	Thu Aug  5 04:27:44 1999
 ++++ src/Makefile.am	Thu Nov 25 00:11:26 1999
 +@@ -82,7 +82,7 @@
 + 	util.h		\
 + 	webpresence.h
 + 
 +-gnomeicu_LDADD = -lpanel_applet @GNOMEICU_LDADD@ \
 ++gnomeicu_LDADD = -lpanel_applet -ljcode @GNOMEICU_LDADD@ \
 + 		@SOCKS_LIBDIR@ @SOCKS_LIBS@
 + 
 + EXTRA_DIST=			\
 diff -ruN gnome-icu.prev/patches/patch-ac gnome-icu/patches/patch-ac
 --- gnome-icu.prev/patches/patch-ac	Wed Aug 25 23:08:39 1999
 +++ gnome-icu/patches/patch-ac	Fri Nov 26 14:42:48 1999
 @@ -1,12 +1,10 @@
 -*** src/gnomeicu.c.orig	Sat Jul  3 13:25:31 1999
 ---- src/gnomeicu.c	Mon Jul  5 00:13:34 1999
 -***************
 -*** 1021,1026 ****
 ---- 1021,1027 ----
 -  	signal( SIGCHLD, &handle_signal );
 -  	signal( SIGUSR1, &handle_signal );
 -  
 -+ 	gtk_set_locale();
 -  	make_applet( argc, argv, &sal );
 -  	gnome_config_push_prefix( configfilename );
 -  
 +--- src/gnomeicu.c.orig	Wed Nov 17 10:57:40 1999
 ++++ src/gnomeicu.c	Thu Nov 25 00:11:26 1999
 +@@ -325,6 +325,7 @@
 + 
 + 	Current_Status = STATUS_OFFLINE;
 + 
 ++	gtk_set_locale();
 + 	make_applet( argc, argv );
 + 	gnome_config_push_prefix( configfilename );
 + 
 diff -ruN gnome-icu.prev/patches/patch-ad gnome-icu/patches/patch-ad
 --- gnome-icu.prev/patches/patch-ad	Wed Aug 25 23:08:39 1999
 +++ gnome-icu/patches/patch-ad	Mon Nov 29 17:30:20 1999
 @@ -1,13 +1,126 @@
 -*** src/gtkfunc.c.orig	Sat Jul  3 13:25:31 1999
 ---- src/gtkfunc.c	Sun Jul 11 23:52:44 1999
 -***************
 -*** 1941,1946 ****
 ---- 1941,1948 ----
 -  
 -  	if( message_text[ 0 ] == 'm' )
 -  	{
 -+                 message_text = l10n_conv( "toLocal", message_text );
 -+ 
 -  		table = gtk_table_new(3, 2, FALSE);
 -  		gtk_box_pack_start( GTK_BOX( mainbox ), table, TRUE, TRUE, 0);
 -  	
 +--- src/gtkfunc.c.orig	Sat Nov 13 07:49:38 1999
 ++++ src/gtkfunc.c	Mon Nov 29 17:25:03 1999
 +@@ -164,6 +164,8 @@
 + 
 + 	GSList *contact;
 + 
 ++	gchar *new_message_text;
 ++
 + #ifdef TRACE_FUNCTION
 + 	g_print( "icq_msgbox\n" );
 + #endif
 +@@ -262,6 +264,8 @@
 + 
 + 	if( message_text[ 0 ] == 'm' )
 + 	{
 ++		new_message_text = toLocal( message_text );
 ++
 + 		table = gtk_table_new(3, 2, FALSE);
 + 		gtk_box_pack_start( GTK_BOX( mainbox ), table, TRUE, TRUE, 0);
 + 	
 +@@ -299,7 +303,7 @@
 + 		gtk_widget_grab_focus( respond_text );
 + 
 + 		gtk_text_insert( GTK_TEXT( text ), NULL, NULL, NULL,
 +-		                 ( 1 + message_text ), -1 );
 ++		                 ( 1 + new_message_text ), -1 );
 + 
 + 		box = gtk_hbutton_box_new();
 + 		gtk_button_box_set_layout(GTK_BUTTON_BOX(box), GTK_BUTTONBOX_SPREAD);
 +@@ -366,6 +370,8 @@
 + 		gtk_widget_show( readnext_button );
 + 
 + 		gtk_widget_show(box);
 ++
 ++		g_free( new_message_text );
 + 	}
 + 	if( message_text[ 0 ] == 'n' )
 + 	{
 +@@ -430,6 +436,8 @@
 + 
 + 	if( message_text[ 0 ] == 'f' )
 + 	{
 ++		new_message_text = toLocal( message_text );
 ++
 + 		table = gtk_table_new( 3, 2, FALSE );
 + 
 + 		label = gtk_label_new( _("File Name:") );
 +@@ -464,7 +472,7 @@
 + 		g_free( filesize );
 + 
 + 		entry = gtk_entry_new();
 +-		gtk_entry_set_text( GTK_ENTRY( entry ), &message_text[1] );
 ++		gtk_entry_set_text( GTK_ENTRY( entry ), &new_message_text[1] );
 + 		gtk_widget_set_usize( entry, 75, 0 );
 + 		gtk_table_attach_defaults( GTK_TABLE( table ), entry, 1, 2, 2, 3 );
 + 		gtk_widget_show( entry );
 +@@ -499,6 +507,8 @@
 + 	                             GTK_OBJECT(window));
 + 		gtk_widget_show( button );
 + 		gtk_widget_show( box );
 ++
 ++		g_free( new_message_text );
 + 	}
 + 
 + 	if( message_text[ 0 ] == 'a' )
 +@@ -534,8 +544,13 @@
 + 		GtkWidget *url = gtk_entry_new();
 + 		GtkWidget *desc = gtk_entry_new();
 + 
 +-		gchar *curl = (char *)g_malloc( strlen( message_text ) );
 +-		gchar *cdesc = (char *)g_malloc( strlen( message_text ) );
 ++		gchar *curl;
 ++		gchar *cdesc;
 ++
 ++		new_message_text = toLocal( message_text );
 ++
 ++		curl = (char *)g_malloc( strlen( new_message_text ) );
 ++		cdesc = (char *)g_malloc( strlen( new_message_text ) );
 + 
 + 		gtk_misc_set_alignment( GTK_MISC( message ), 0.0, 0.5 );
 + 
 +@@ -544,9 +559,9 @@
 + 
 + 		for( cx = 1; ; cx ++ )
 + 		{
 +-			if( message_text[ cx ] == '\xFE' || message_text[ cx ] == 0x00 )
 ++			if( new_message_text[ cx ] == '\xFE' || new_message_text[ cx ] == 0x00 )
 + 			{
 +-				if( message_text[ cx ] == 0x00 )
 ++				if( new_message_text[ cx ] == 0x00 )
 + 				{
 + 					url_len = cx - 2 - desc_len;
 + 					break;
 +@@ -556,11 +571,11 @@
 + 			}
 + 		}
 + 
 +-		memcpy( cdesc, message_text + 1, desc_len );
 ++		memcpy( cdesc, new_message_text + 1, desc_len );
 + 		cdesc[ desc_len ] = 0x00;
 +-		memcpy( curl, message_text + 2 + desc_len, url_len );
 ++		memcpy( curl, new_message_text + 2 + desc_len, url_len );
 + 		curl[ url_len ]  = 0x00;
 +-/*		sscanf( message_text + 1, "%[^\xFE]\xFE%[^\xFE]", cdesc, curl );*/
 ++/*		sscanf( new_message_text + 1, "%[^\xFE]\xFE%[^\xFE]", cdesc, curl );*/
 + 		
 + 		gtk_entry_set_text( GTK_ENTRY( url ), curl );
 + 		gtk_entry_set_text( GTK_ENTRY( desc ), cdesc );
 +@@ -603,6 +618,8 @@
 + 
 + 		gtk_widget_show( url );
 + 		gtk_widget_show( desc );
 ++
 ++		g_free( new_message_text );
 + 	}
 + 	gtk_widget_show( window );
 + }
 +@@ -728,7 +745,7 @@
 + 
 + 	buf = gtk_editable_get_chars( GTK_EDITABLE( entry ), 0, -1 );
 + 
 +-	icq_sendmsg( ((CONTACT_PTR)contact->data)->uin, buf, ( forced == NULL ? 0 : 1 ) );
 ++	icq_sendmsg( ((CONTACT_PTR)contact->data)->uin, buf, ( forced == NULL ? 0 : 1 ), FALSE );
 + 
 + 	g_free( buf );
 + }
 diff -ruN gnome-icu.prev/patches/patch-ae gnome-icu/patches/patch-ae
 --- gnome-icu.prev/patches/patch-ae	Wed Aug 25 23:08:39 1999
 +++ gnome-icu/patches/patch-ae	Fri Nov 26 14:42:48 1999
 @@ -1,123 +1,98 @@
 -*** src/histadd.c.orig	Wed Jun 30 06:56:19 1999
 ---- src/histadd.c	Sat Aug  7 00:33:41 1999
 -***************
 -*** 13,22 ****
 -  	time_t timedate;
 -  	struct tm *my_tm;
 -  	char pdate[46];
 -- 	int cx, cy, cz;
 -  	char *halves[] = { "AM", "PM" };
 -  	int half = 0;
 -- 	char buf[ 1024 ];
 -  
 -  	char *filename;
 -  	int file;
 ---- 13,20 ----
 -***************
 -*** 25,30 ****
 ---- 23,30 ----
 -  	g_print( "add_incoming_to_history\n" );
 -  #endif
 -  
 -+ 	statement = l10n_conv( "toLocal", statement );
 -+ 
 -  	strings[ 0 ] = pdate;
 -  	strings[ 1 ] = who;
 -  	strings[ 2 ] = statement;
 -***************
 -*** 49,80 ****
 -  
 -  	write( file, pdate, strlen( pdate ) );
 -  
 -! 	strcpy( buf, "" );
 -! 	cy = cz = 0;
 -! 	for( cx = 0; cx < strlen( statement ); cx ++ )
 -! 	{
 -! 		cy ++;
 -! 		if( statement[cx] == '\n' || cy == 70 ||
 -! 		    ( cy >= 60 && statement[cx] == ' ' ) )
 -! 		{
 -! 			write( file, ( statement + cz ), cy );
 -! 			if( cy >= 60 && cy != 70 )
 -! 			{
 -! 				write( file, "\n", 1 );
 -! 			}
 -! 			if( cy == 70 )
 -! 			{
 -! 				write( file, "-\n", 2 );
 -! 			}
 -! 			cz += cy;
 -! 			cy = 0;
 -! 		}
 -! 	}			
 -! 
 -! 	if( cz != strlen( statement ) )
 -! 	{
 -! 		write( file, ( statement + cz ), strlen( statement ) - cz );
 -! 	}
 -  
 -  	write( file, "\n", 1 );
 -  
 ---- 49,55 ----
 -  
 -  	write( file, pdate, strlen( pdate ) );
 -  
 -! 	write( file, statement, strlen( statement ) );
 -  
 -  	write( file, "\n", 1 );
 -  
 -***************
 -*** 88,97 ****
 -  	time_t timedate;
 -  	struct tm *my_tm;
 -  	char pdate[42];
 -- 	int cx, cy, cz;
 -  	char *halves[] = { "AM", "PM" };
 -  	int half = 0;
 -- 	char buf[ 1024 ];
 -  
 -  	char *filename;
 -  	int file;
 ---- 63,70 ----
 -***************
 -*** 124,155 ****
 -  
 -  	write( file, pdate, strlen( pdate ) );
 -  
 -! 	strcpy( buf, "" );
 -! 	cy = cz = 0;
 -! 	for( cx = 0; cx < strlen( statement ); cx ++ )
 -! 	{
 -! 		cy ++;
 -! 		if( statement[cx] == '\n' || cy == 70 ||
 -! 		    ( cy >= 60 && statement[cx] == ' ' ) )
 -! 		{
 -! 			write( file, ( statement + cz ), cy );
 -! 			if( cy >= 60 && cy != 70 )
 -! 			{
 -! 				write( file, "\n", 1 );
 -! 			}
 -! 			if( cy == 70 )
 -! 			{
 -! 				write( file, "-\n", 2 );
 -! 			}
 -! 			cz += cy;
 -! 			cy = 0;
 -! 		}
 -! 	}			
 -! 
 -! 	if( cz != strlen( statement ) )
 -! 	{
 -! 		write( file, ( statement + cz ), strlen( statement ) - cz );
 -! 	}
 -  	
 -  	write( file, "\n", 1 );
 -  
 ---- 97,103 ----
 -  
 -  	write( file, pdate, strlen( pdate ) );
 -  
 -! 	write( file, statement, strlen( statement ) );
 -  	
 -  	write( file, "\n", 1 );
 -  
 +--- src/histadd.c.orig	Mon Jul 26 19:58:48 1999
 ++++ src/histadd.c	Thu Nov 25 00:11:26 1999
 +@@ -22,13 +22,14 @@
 + 	time_t timedate;
 + 	struct tm *my_tm;
 + 	gchar *pdate = NULL;
 +-	int cx, cy, cz;
 + 	char *halves[] = { "AM", "PM" };
 + 	int half = 0;
 + 
 + 	gchar *filename;
 + 	int file;
 + 
 ++	gchar *new_statement = toLocal( statement );
 ++
 + #ifdef TRACE_FUNCTION
 + 	g_print( "add_incoming_to_history\n" );
 + #endif
 +@@ -64,35 +65,13 @@
 + 
 + 	g_free( pdate );
 + 
 +-	cy = cz = 0;
 +-	for( cx = 0; cx < strlen( statement ); cx ++ )
 +-	{
 +-		cy ++;
 +-		if( statement[cx] == '\n' || cy == 70 ||
 +-		    ( cy >= 60 && statement[cx] == ' ' ) )
 +-		{
 +-			write( file, ( statement + cz ), cy );
 +-			if( cy >= 60 && cy != 70 )
 +-			{
 +-				write( file, "\n", 1 );
 +-			}
 +-			if( cy == 70 )
 +-			{
 +-				write( file, "-\n", 2 );
 +-			}
 +-			cz += cy;
 +-			cy = 0;
 +-		}
 +-	}			
 +-
 +-	if( cz != strlen( statement ) )
 +-	{
 +-		write( file, ( statement + cz ), strlen( statement ) - cz );
 +-	}
 ++	write( file, new_statement, strlen( new_statement ) );
 + 
 + 	write( file, "\n", 1 );
 + 
 + 	close( file );
 ++
 ++	g_free( new_statement );
 + }
 + 
 + void add_outgoing_to_history( int uin, char *statement )
 +@@ -100,7 +79,6 @@
 + 	time_t timedate;
 + 	struct tm *my_tm;
 + 	gchar *pdate = NULL;
 +-	int cx, cy, cz;
 + 	char *halves[] = { "AM", "PM" };
 + 	int half = 0;
 + 
 +@@ -144,31 +122,7 @@
 + 
 + 	g_free( pdate );
 + 
 +-	cy = cz = 0;
 +-	for( cx = 0; cx < strlen( statement ); cx ++ )
 +-	{
 +-		cy ++;
 +-		if( statement[cx] == '\n' || cy == 70 ||
 +-		    ( cy >= 60 && statement[cx] == ' ' ) )
 +-		{
 +-			write( file, ( statement + cz ), cy );
 +-			if( cy >= 60 && cy != 70 )
 +-			{
 +-				write( file, "\n", 1 );
 +-			}
 +-			if( cy == 70 )
 +-			{
 +-				write( file, "-\n", 2 );
 +-			}
 +-			cz += cy;
 +-			cy = 0;
 +-		}
 +-	}			
 +-
 +-	if( cz != strlen( statement ) )
 +-	{
 +-		write( file, ( statement + cz ), strlen( statement ) - cz );
 +-	}
 ++	write( file, statement, strlen( statement ) );
 + 	
 + 	write( file, "\n", 1 );
 + 
 diff -ruN gnome-icu.prev/patches/patch-af gnome-icu/patches/patch-af
 --- gnome-icu.prev/patches/patch-af	Wed Aug 25 23:08:40 1999
 +++ gnome-icu/patches/patch-af	Mon Nov 29 17:29:50 1999
 @@ -1,54 +1,160 @@
 -*** src/sendmsg.c.orig	Sat Jul  3 13:25:31 1999
 ---- src/sendmsg.c	Wed Jul 14 01:53:59 1999
 -***************
 -*** 258,267 ****
 -  		return;
 -  	}
 -  
 -- 	new_text = cr_convert( text );
 -- 
 -  	/* Add statement to personal history file */
 -! 	add_outgoing_to_history( uin, new_text );
 -  
 -  	rus_conv( RUS_KOI_WIN, new_text );
 -  	if( !forced && !force_toggle && TCPSendMessage( uin, new_text, data ) )
 ---- 258,267 ----
 -  		return;
 -  	}
 -  
 -  	/* Add statement to personal history file */
 -! 	add_outgoing_to_history( uin, text );
 -! 
 -! 	new_text = cr_convert( l10n_conv( "toNet", text ) );
 -  
 -  	rus_conv( RUS_KOI_WIN, new_text );
 -  	if( !forced && !force_toggle && TCPSendMessage( uin, new_text, data ) )
 -***************
 -*** 359,371 ****
 -  	sprintf( text, "%s\xFE%s", gtk_entry_get_text( GTK_ENTRY( data->desc ) ),
 -  	         gtk_entry_get_text( GTK_ENTRY( data->url ) ) );
 -  
 -- 	new_text = cr_convert( text );
 -- 	buf = (char *)g_malloc( sizeof( char ) * ( 16 + strlen( new_text ) ) );
 -- 
 -  	/* Add statement to personal history file */
 -! 	add_outgoing_to_history( uin, new_text );
 -  
 -! 	rus_conv( RUS_KOI_WIN, new_text );
 -  	if( TCPSendURL( uin, new_text, data->data ) )
 -  	{
 -  		sprintf( buf, "Sent URL (TCP)" );
 ---- 359,371 ----
 -  	sprintf( text, "%s\xFE%s", gtk_entry_get_text( GTK_ENTRY( data->desc ) ),
 -  	         gtk_entry_get_text( GTK_ENTRY( data->url ) ) );
 -  
 -  	/* Add statement to personal history file */
 -! 	add_outgoing_to_history( uin, text );
 -  
 -! 	new_text = cr_convert( l10n_conv( "toNet", text ) );
 -! 	buf = (char *)g_malloc( sizeof( char ) * ( 16 + strlen( new_text ) ) );
 -! 
 -! 	/* rus_conv( RUS_KOI_WIN, new_text ); */
 -  	if( TCPSendURL( uin, new_text, data->data ) )
 -  	{
 -  		sprintf( buf, "Sent URL (TCP)" );
 +--- src/sendmsg.c.orig	Tue Nov  9 00:18:40 1999
 ++++ src/sendmsg.c	Mon Nov 29 17:24:48 1999
 +@@ -20,13 +20,15 @@
 + #define SOCKS 1
 + #include <socks.h>
 + #endif
 ++#include <jlib.h>
 + 
 + int search_wait;
 + 
 + DWORD our_session;
 + 
 + /*** Local function declarations ***/
 +-static char *cr_convert( const gchar *text );
 ++static gchar *cr_convert( const gchar *text );
 ++static gchar *cr_unconvert( const gchar *text );
 + static void Wrinkle( void *buf, size_t len );
 + static void Gen_Checksum( BYTE * buf, DWORD len );
 + static DWORD Scramble_cc( DWORD cc );
 +@@ -211,7 +213,7 @@
 +  * Send a message thru the Server to the UIN
 +  * 'text' is the message
 +  */
 +-void icq_sendmsg( UIN_T uin, const gchar *text, gboolean forced )
 ++void icq_sendmsg( UIN_T uin, const gchar *text, gboolean forced, gboolean resent )
 + {
 + 	SIMPLE_MESSAGE msg;
 + 	net_icq_pak pak;
 +@@ -231,12 +233,17 @@
 + 		return;
 + 	}
 + 
 +-	new_text = cr_convert( text );
 ++	if (resent) {
 ++		new_text = g_strdup( text );
 ++	} else {
 ++		/* Add statement to personal history file */
 ++		add_outgoing_to_history( uin, text );
 + 
 +-	/* Add statement to personal history file */
 +-	add_outgoing_to_history( uin, new_text );
 ++		new_text = toNet( text );
 ++
 ++		rus_conv( RUS_KOI_WIN, new_text );
 ++	}
 + 
 +-	rus_conv( RUS_KOI_WIN, new_text );
 + 	if( !forced && !toggles->force && TCPSendMessage( uin, new_text) )
 + 	{
 + 		log_window_add(_("Sent Message (TCP)"), uin );
 +@@ -322,14 +329,20 @@
 + 
 + 	uin = ((CONTACT_PTR)data->contact->data)->uin;
 + 	
 +-	text = g_strdup_printf( "%s\xFE%s",
 ++	text = g_strdup_printf( "%s\n%s",
 + 				gtk_entry_get_text( GTK_ENTRY( data->desc ) ),
 + 				gtk_entry_get_text( GTK_ENTRY( data->url ) ) );
 +-	new_text = cr_convert( text );
 +-	g_free( text );
 + 
 + 	/* Add statement to personal history file */
 +-	add_outgoing_to_history( uin, new_text );
 ++	add_outgoing_to_history( uin, text );
 ++
 ++	g_free( text );
 ++
 ++	text = g_strdup_printf( "%s\xFE%s",
 ++				gtk_entry_get_text( GTK_ENTRY( data->desc ) ),
 ++				gtk_entry_get_text( GTK_ENTRY( data->url ) ) );
 ++	new_text = toNet( text );
 ++	g_free( text );
 + 
 + 	rus_conv( RUS_KOI_WIN, new_text );
 + 	if( TCPSendURL( uin, new_text ) )
 +@@ -655,6 +668,8 @@
 + 	net_icq_pak pak;
 + 	int size ;
 + 
 ++	gchar *new_about;
 ++
 + 	Word_2_Chars( pak.head.ver, ICQ_VER );
 + 	Word_2_Chars( pak.head.cmd, CMD_UPDATE_INFO );
 + 	Word_2_Chars( pak.head.seq, seq_num++ );
 +@@ -787,10 +802,15 @@
 +    
 +    Word_2_Chars( pak.data , META_INFO_ABOUT );
 +    size = 2;
 +-	Word_2_Chars( pak.data + size, strlen( cr_convert( our_info->about ) ) + 1 );
 ++
 ++	new_about = toNet( our_info->about );
 ++
 ++	Word_2_Chars( pak.data + size, strlen( new_about ) + 1 );
 + 	size += 2;
 +-	strcpy( pak.data + size, cr_convert( our_info->about ) );
 +-	size += strlen( cr_convert( our_info->about ) ) + 1;
 ++	strcpy( pak.data + size, new_about );
 ++	size += strlen( new_about ) + 1;
 ++
 ++	g_free( new_about );
 + 
 + 	SOCKWRITE( &(pak.head.ver), size + sizeof( pak.head ) - 2, "CMD_META_USER(META_INFO_ABOUT)");
 + }
 +@@ -862,6 +882,56 @@
 + 	t[ cy ] = 0x00;
 + 	
 + 	return t;
 ++}
 ++
 ++gchar *cr_unconvert( const gchar *text )
 ++{
 ++	char *t;
 ++	int cx, cy;
 ++	
 ++	cy = 0;
 ++	for( cx = 0; cx < strlen( text ); cx ++ )
 ++	{
 ++		if( text[ cx ] == '\r' )
 ++			cy ++;
 ++	}
 ++	
 ++	t = g_malloc( strlen( text ) - cy + 1 );
 ++
 ++	cy = 0;
 ++	for( cx = 0; cx < strlen( text ); cx ++ )
 ++	{
 ++		if( text[ cx ] != '\r' )
 ++			t[ cy ++ ] = text[ cx ];
 ++	}
 ++
 ++	t[ cy ] = 0x00;
 ++	
 ++	return t;
 ++}
 ++
 ++gchar *toNet( const gchar *text )
 ++{
 ++  gchar *tmp1, *tmp2;
 ++
 ++  tmp1 = cr_convert( text );
 ++  tmp2 = toStringSJISfromEUC( tmp1 );
 ++
 ++  g_free( tmp1 );
 ++
 ++  return tmp2;
 ++}
 ++
 ++gchar *toLocal( const gchar *text )
 ++{
 ++  gchar *tmp1, *tmp2;
 ++
 ++  tmp1 = cr_unconvert( text );
 ++  tmp2 = toStringEUCfromSJIS( tmp1 );
 ++
 ++  g_free( tmp1 );
 ++
 ++  return tmp2;
 + }
 + 
 + void Wrinkle( void *buf, size_t len )
 diff -ruN gnome-icu.prev/patches/patch-ag gnome-icu/patches/patch-ag
 --- gnome-icu.prev/patches/patch-ag	Wed Aug 25 23:08:40 1999
 +++ gnome-icu/patches/patch-ag	Thu Jan  1 09:00:00 1970
 @@ -1,13 +0,0 @@
 -*** src/gnomeicu.h.orig	Sat Jul  3 08:12:47 1999
 ---- src/gnomeicu.h	Sun Jul 11 23:51:39 1999
 -***************
 -*** 583,588 ****
 ---- 583,590 ----
 -  extern GtkWidget *app;
 -  extern int applet_toggle;
 -  
 -+ char *l10n_conv( char *to, char *t_in );
 -+ 
 -  #endif
 -  
 -  #define RUS_WIN_KOI 0
 diff -ruN gnome-icu.prev/patches/patch-ah gnome-icu/patches/patch-ah
 --- gnome-icu.prev/patches/patch-ah	Wed Aug 25 23:08:40 1999
 +++ gnome-icu/patches/patch-ah	Thu Jan  1 09:00:00 1970
 @@ -1,22 +0,0 @@
 -*** /dev/null	Sat Aug  7 00:47:29 1999
 ---- src/l10n_conv.c	Mon Jul 12 01:36:48 1999
 -***************
 -*** 0 ****
 ---- 1,17 ----
 -+ /*
 -+  * Localization
 -+  *
 -+  */
 -+ 
 -+ #include "gnomeicu.h"
 -+ #include <jlib.h>
 -+ 
 -+ char *l10n_conv( char to[10], char *t_in ){
 -+   if(!strcmp(to, "toLocal")){
 -+     return toStringEUCfromSJIS( t_in );
 -+   }else if(!strcmp(to, "toNet")){
 -+     return toStringSJISfromEUC( t_in );
 -+   }
 -+ 
 -+   return t_in;
 -+ }
 diff -ruN gnome-icu.prev/patches/patch-ai gnome-icu/patches/patch-ai
 --- gnome-icu.prev/patches/patch-ai	Thu Jan  1 09:00:00 1970
 +++ gnome-icu/patches/patch-ai	Mon Nov 29 17:30:32 1999
 @@ -0,0 +1,19 @@
 +--- src/sendmsg.h.orig	Tue Aug 10 05:44:52 1999
 ++++ src/sendmsg.h	Mon Nov 29 17:24:55 1999
 +@@ -11,7 +11,7 @@
 + extern ProgressData *search_pdata;
 + 
 + void Do_Resend( void );
 +-void icq_sendmsg( UIN_T uin, const gchar *text, gboolean forced );
 ++void icq_sendmsg( UIN_T uin, const gchar *text, gboolean forced, gboolean resent );
 + void icq_reverse_tcp( UIN_T uin, int port );
 + void icq_sendurl( GtkWidget *widget, struct URLInfo *data );
 + void icq_sendauthmsg( UIN_T uin );
 +@@ -26,5 +26,7 @@
 + size_t SOCKREAD( void * ptr, size_t len );
 + void Update_User_Info( void );
 + void info_req_99( UIN_T uin );
 ++gchar *toNet( const gchar *text );
 ++gchar *toLocal( const gchar *text );
 + 
 + #endif /* __SENDMSG_H__ */
 diff -ruN gnome-icu.prev/patches/patch-aj gnome-icu/patches/patch-aj
 --- gnome-icu.prev/patches/patch-aj	Thu Jan  1 09:00:00 1970
 +++ gnome-icu/patches/patch-aj	Fri Nov 26 14:42:48 1999
 @@ -0,0 +1,14 @@
 +--- src/rus_conv.c.orig	Mon Jul 26 19:58:48 1999
 ++++ src/rus_conv.c	Thu Nov 25 00:11:26 1999
 +@@ -37,6 +37,11 @@
 + void rus_conv( short to, char *t_in )
 + {
 + 	static uchar *table = NULL;
 ++	char *lang = getenv("LANG");
 ++
 ++	if (lang[0] == 'j' && lang[1] == 'a') {
 ++		return;
 ++	}
 + 
 + 	switch( to )
 + 	{
 diff -ruN gnome-icu.prev/patches/patch-ak gnome-icu/patches/patch-ak
 --- gnome-icu.prev/patches/patch-ak	Thu Jan  1 09:00:00 1970
 +++ gnome-icu/patches/patch-ak	Mon Nov 29 17:30:38 1999
 @@ -0,0 +1,34 @@
 +--- src/tcp.c.orig	Tue Nov  9 00:24:01 1999
 ++++ src/tcp.c	Mon Nov 29 17:24:52 1999
 +@@ -1547,7 +1547,8 @@
 + 	if( (Current_Status&0xffff) != STATUS_ONLINE && (Current_Status&0xffff) != STATUS_FREE_CHAT &&
 + 	    (Current_Status&0xffff) != STATUS_INVISIBLE )
 + 		sent_message = Away_Message;
 +-	
 ++	sent_message = toNet( sent_message );
 ++
 + 	DW_2_Chars( pack_head.uin1, our_info->uin );
 + 	Word_2_Chars( pack_head.version, 0x0003 );
 + 	Word_2_Chars( pack_head.command, ICQ_CMDxTCP_ACK );
 +@@ -1608,8 +1609,12 @@
 + 		g_free( buffer );
 + 	}
 + 	else
 ++	{
 ++		g_free( sent_message );
 + 		return -1;
 ++	}
 + 
 ++	g_free( sent_message );
 + 	return 1;
 + }
 + 
 +@@ -3654,7 +3659,7 @@
 + 
 + void timeout_server( GtkWidget *widget, CONTACT_PTR contact )
 + {
 +-	icq_sendmsg( contact->uin, (char*)contact->tcp_text_queue->data, TRUE );
 ++	icq_sendmsg( contact->uin, (char*)contact->tcp_text_queue->data, TRUE, TRUE );
 + 	g_free( contact->tcp_text_queue->data );
 + 	contact->tcp_text_queue = g_slist_remove( contact->tcp_text_queue, contact->tcp_text_queue->data );
 + }
 diff -ruN gnome-icu.prev/pkg/PLIST gnome-icu/pkg/PLIST
 --- gnome-icu.prev/pkg/PLIST	Sun Jul  4 00:32:23 1999
 +++ gnome-icu/pkg/PLIST	Fri Nov 26 14:42:48 1999
 @@ -1,23 +1,40 @@
  bin/gnomeicu
  etc/CORBA/servers/GnomeICU.gnorba
  etc/sound/events/GnomeICU.soundlist
 -share/gnome/applets/Network/GnomeICU.desktop
 +share/gnome/pixmaps/gnomeicu/animeyes.png
 +share/gnome/pixmaps/gnomeicu/eye_na.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-auth.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-away.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-blank.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-chat.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-chat2.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-dnd.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-ffc.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-file.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-info.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-inv.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-message.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-na.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-nomess.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-occ.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-offline.xpm
 +share/gnome/pixmaps/gnomeicu/offline.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-online.xpm
 +share/gnome/pixmaps/gnomeicu/gnomeicu-url.xpm
 +share/gnome/pixmaps/gnomeicu/online.xpm
  share/gnome/pixmaps/gnome-gnomeicu.xpm
 -share/gnome/pixmaps/gnomeicu-auth.xpm
 -share/gnome/pixmaps/gnomeicu-away.xpm
 -share/gnome/pixmaps/gnomeicu-blank.xpm
 -share/gnome/pixmaps/gnomeicu-chat.xpm
 -share/gnome/pixmaps/gnomeicu-chat2.xpm
 -share/gnome/pixmaps/gnomeicu-dnd.xpm
 -share/gnome/pixmaps/gnomeicu-ffc.xpm
 -share/gnome/pixmaps/gnomeicu-file.xpm
 -share/gnome/pixmaps/gnomeicu-info.xpm
 -share/gnome/pixmaps/gnomeicu-inv.xpm
 -share/gnome/pixmaps/gnomeicu-message.xpm
 -share/gnome/pixmaps/gnomeicu-na.xpm
 -share/gnome/pixmaps/gnomeicu-nomess.xpm
 -share/gnome/pixmaps/gnomeicu-occ.xpm
 -share/gnome/pixmaps/gnomeicu-offline.xpm
 -share/gnome/pixmaps/gnomeicu-online.xpm
 -share/gnome/pixmaps/gnomeicu-url.xpm
  share/gnome/sounds/gnomeicu/message.wav
 +share/gnome/applets/Network/GnomeICU.desktop
 +share/gnome/gnome/help/gnomeicu/C/index.html
 +share/gnome/gnome/help/gnomeicu/C/topic.dat
 +share/gnome/gnome/help/gnomeicu/C/book1.html
 +share/gnome/gnome/help/gnomeicu/C/c11.html
 +share/gnome/gnome/help/gnomeicu/C/c65.html
 +share/gnome/gnome/help/gnomeicu/C/ln9.html
 +share/gnome/gnome/help/gnomeicu/C/x17.html
 +share/gnome/gnome/help/gnomeicu/C/x62.html
 +share/gnome/gnome/help/gnomeicu/C/docbook.css
 +@dirrm share/gnome/gnome/help/gnomeicu/C
 +@dirrm share/gnome/gnome/help/gnomeicu
 +@dirrm share/gnome/pixmaps/gnomeicu
 +@dirrm share/gnome/sounds/gnomeicu
 

From: Akinori MUSHA aka knu <knu@idaemons.org>
To: FreeBSD-gnats-submit@freebsd.org, flathill@flathill.gr.jp
Cc:  
Subject: Re: ports/15005: Updated port: japanese/gnomeicu
Date: Wed, 01 Dec 1999 02:45:17 +0900

 	Added conversion process on "Read Next". Update patch-ad with
 the patch attached.
 
 -- 
                      /
                     /__  __
                    / )  )  ) )  /  http://www.idaemons.org/knu/
 Akinori MUSHA aka / (_ /  ( (__(   mailto:knu@idaemons.org
 
 "We are but hungry..  Associated Ita-meshi Daemons!"
                                    http://www.idaemons.org/
 
 --- patch-ad.prev	Wed Dec  1 02:40:02 1999
 +++ patch-ad	Wed Dec  1 02:40:58 1999
 @@ -1,5 +1,5 @@
  --- src/gtkfunc.c.orig	Sat Nov 13 07:49:38 1999
 -+++ src/gtkfunc.c	Mon Nov 29 17:25:03 1999
 ++++ src/gtkfunc.c	Wed Dec  1 02:08:17 1999
  @@ -164,6 +164,8 @@
   
   	GSList *contact;
 @@ -124,3 +124,25 @@
   
   	g_free( buf );
   }
 +@@ -2314,13 +2331,20 @@
 + 
 + 	if( ((CONTACT_PTR)contact->data)->messages > 0 )
 + 	{
 ++		gchar *message_text;
 ++
 + 		sprintf( buf, _("Message from %s:"), ((CONTACT_PTR)contact->data)->nick );
 + 		gtk_text_set_point( GTK_TEXT( text ), 0 );
 + 		gtk_text_forward_delete( GTK_TEXT( text ),
 + 		                         gtk_text_get_length( GTK_TEXT( text ) ) );
 + 
 ++		message_text = 1 + ((CONTACT_PTR)contact->data)->message[ 0 ];
 ++		message_text = toLocal( message_text );
 ++
 + 		gtk_text_insert( GTK_TEXT( text ), NULL, NULL, NULL,
 +-		                 ( 1 + ((CONTACT_PTR)contact->data)->message[ 0 ] ), -1 );
 ++		                 message_text, -1 );
 ++
 ++		g_free( message_text );
 + 
 + 		if( ((CONTACT_PTR)contact->data)->messages <= 1 ||
 + 		    ( ((CONTACT_PTR)contact->data)->messages && ((CONTACT_PTR)contact->data)->message[ 1 ][ 0 ] != 'm' ) )
 
State-Changed-From-To: open->closed 
State-Changed-By: flathill 
State-Changed-When: Wed Dec 1 02:01:14 PST 1999 
State-Changed-Why:  
Committed. Thanks! 
>Unformatted:
 --Multipart_Sun_Nov_21_04:05:37_1999-1
 Content-Type: text/plain; charset=US-ASCII
 
 
