Index: gtkicq/Makefile.in diff -c gtkicq/Makefile.in:1.1.1.1 gtkicq/Makefile.in:1.1.1.1.2.1 *** gtkicq/Makefile.in:1.1.1.1 Sun Mar 7 07:47:10 1999 --- gtkicq/Makefile.in Sun Mar 7 07:52:57 1999 *************** *** 102,108 **** CONFIG_CLEAN_FILES = DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \ Makefile.am Makefile.in NEWS TODO acconfig.h acinclude.m4 aclocal.m4 \ ! config.h.in configure configure.in install-sh missing mkinstalldirs DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) --- 102,109 ---- CONFIG_CLEAN_FILES = DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \ Makefile.am Makefile.in NEWS TODO acconfig.h acinclude.m4 aclocal.m4 \ ! config.guess config.h.in config.sub configure configure.in install-sh \ ! ltconfig ltmain.sh missing mkinstalldirs DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) *************** *** 112,120 **** all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status --- 113,121 ---- all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status *************** *** 281,286 **** --- 282,292 ---- -rm -rf $(distdir) mkdir $(distdir) -chmod 777 $(distdir) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ Index: gtkicq/macros/Makefile.in diff -c gtkicq/macros/Makefile.in:1.1.1.1 gtkicq/macros/Makefile.in:1.1.1.1.2.1 *** gtkicq/macros/Makefile.in:1.1.1.1 Sun Mar 7 07:47:10 1999 --- gtkicq/macros/Makefile.in Sun Mar 7 07:52:58 1999 *************** *** 119,127 **** all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps macros/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status --- 119,127 ---- all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --gnu macros/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status *************** *** 153,158 **** --- 153,163 ---- subdir = macros distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu macros/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ Index: gtkicq/src/Makefile.am diff -c gtkicq/src/Makefile.am:1.1.1.1 gtkicq/src/Makefile.am:1.1.1.1.2.1 *** gtkicq/src/Makefile.am:1.1.1.1 Sun Mar 7 07:47:11 1999 --- gtkicq/src/Makefile.am Sun Mar 7 07:53:00 1999 *************** *** 31,36 **** --- 31,37 ---- response.c \ restart.c \ rus_conv.c \ + l10n_conv.c \ sendmsg.c \ showwait.c \ tcp.c \ *************** *** 50,56 **** sendmsg.h \ tcp.h ! gtkicq_LDADD = @APPLET_O@ @GTKICQ_LDADD@ gtkicq_DEPENDENCIES = @APPLET_O@ EXTRA_DIST= \ --- 51,57 ---- sendmsg.h \ tcp.h ! gtkicq_LDADD = @APPLET_O@ @GTKICQ_LDADD@ -ljcode gtkicq_DEPENDENCIES = @APPLET_O@ EXTRA_DIST= \ Index: gtkicq/src/Makefile.in diff -c gtkicq/src/Makefile.in:1.1.1.1 gtkicq/src/Makefile.in:1.1.1.1.2.1 *** gtkicq/src/Makefile.in:1.1.1.1 Sun Mar 7 07:47:11 1999 --- gtkicq/src/Makefile.in Sun Mar 7 07:53:00 1999 *************** *** 106,115 **** bin_PROGRAMS = gtkicq ! gtkicq_SOURCES = autoaway.c changeaway.c changename.c chatdlg.c dialog.c flash.c gtkconf.c gtkfunc.c gtkicq.c histadd.c loadpixmap.c log.c menu.c msg_queue.c newsignup.c playsound.c rcfile.c response.c restart.c rus_conv.c sendmsg.c showwait.c tcp.c ui.c util.c webpresence.c applet.h chatdlg.h datatype.h dialog.h gtkfunc.h gtkicq.h loadpixmap.h msg_queue.h pixmaps.h playsound.h sendmsg.h tcp.h ! gtkicq_LDADD = @APPLET_O@ @GTKICQ_LDADD@ gtkicq_DEPENDENCIES = @APPLET_O@ EXTRA_DIST = GtkICQ.desktop GtkICQ.gnorba gnome-gtkicq.xpm applet.c --- 106,115 ---- bin_PROGRAMS = gtkicq ! gtkicq_SOURCES = autoaway.c changeaway.c changename.c chatdlg.c dialog.c flash.c gtkconf.c gtkfunc.c gtkicq.c histadd.c loadpixmap.c log.c menu.c msg_queue.c newsignup.c playsound.c rcfile.c response.c restart.c rus_conv.c l10n_conv.c sendmsg.c showwait.c tcp.c ui.c util.c webpresence.c applet.h chatdlg.h datatype.h dialog.h gtkfunc.h gtkicq.h loadpixmap.h msg_queue.h pixmaps.h playsound.h sendmsg.h tcp.h ! gtkicq_LDADD = @APPLET_O@ @GTKICQ_LDADD@ -ljcode gtkicq_DEPENDENCIES = @APPLET_O@ EXTRA_DIST = GtkICQ.desktop GtkICQ.gnorba gnome-gtkicq.xpm applet.c *************** *** 136,142 **** gtkicq_OBJECTS = autoaway.o changeaway.o changename.o chatdlg.o \ dialog.o flash.o gtkconf.o gtkfunc.o gtkicq.o histadd.o loadpixmap.o \ log.o menu.o msg_queue.o newsignup.o playsound.o rcfile.o response.o \ ! restart.o rus_conv.o sendmsg.o showwait.o tcp.o ui.o util.o \ webpresence.o gtkicq_LDFLAGS = CFLAGS = @CFLAGS@ --- 136,142 ---- gtkicq_OBJECTS = autoaway.o changeaway.o changename.o chatdlg.o \ dialog.o flash.o gtkconf.o gtkfunc.o gtkicq.o histadd.o loadpixmap.o \ log.o menu.o msg_queue.o newsignup.o playsound.o rcfile.o response.o \ ! restart.o rus_conv.o l10n_conv.o sendmsg.o showwait.o tcp.o ui.o util.o \ webpresence.o gtkicq_LDFLAGS = CFLAGS = @CFLAGS@ *************** *** 152,157 **** --- 152,164 ---- TAR = tar GZIP_ENV = --best + DEP_FILES = .deps/autoaway.P .deps/changeaway.P .deps/changename.P \ + .deps/chatdlg.P .deps/dialog.P .deps/flash.P .deps/gtkconf.P \ + .deps/gtkfunc.P .deps/gtkicq.P .deps/histadd.P .deps/l10n_conv.P \ + .deps/loadpixmap.P .deps/log.P .deps/menu.P .deps/msg_queue.P \ + .deps/newsignup.P .deps/playsound.P .deps/rcfile.P .deps/response.P \ + .deps/restart.P .deps/rus_conv.P .deps/sendmsg.P .deps/showwait.P \ + .deps/tcp.P .deps/ui.P .deps/util.P .deps/webpresence.P SOURCES = $(gtkicq_SOURCES) OBJECTS = $(gtkicq_OBJECTS) *************** *** 159,167 **** .SUFFIXES: .SUFFIXES: .S .c .o .s $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status --- 166,174 ---- .SUFFIXES: .SUFFIXES: .S .c .o .s $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status *************** *** 191,199 **** rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done - .c.o: - $(COMPILE) -c $< - .s.o: $(COMPILE) -c $< --- 198,203 ---- *************** *** 365,370 **** --- 369,379 ---- subdir = src distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ *************** *** 386,391 **** --- 395,431 ---- fi; \ done + DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) + + -include $(DEP_FILES) + + mostlyclean-depend: + + clean-depend: + + distclean-depend: + -rm -rf .deps + + maintainer-clean-depend: + + %.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp + + %.lo: %.c + @echo '$(LTCOMPILE) -c $<'; \ + $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< + @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ + < .deps/$(*F).pp > .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm -f .deps/$(*F).pp info-am: info: info-recursive dvi-am: *************** *** 427,449 **** maintainer-clean-generic: mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ ! mostlyclean-tags mostlyclean-generic mostlyclean: mostlyclean-recursive ! clean-am: clean-binPROGRAMS clean-compile clean-tags clean-generic \ ! mostlyclean-am clean: clean-recursive distclean-am: distclean-binPROGRAMS distclean-compile distclean-tags \ ! distclean-generic clean-am distclean: distclean-recursive maintainer-clean-am: maintainer-clean-binPROGRAMS \ maintainer-clean-compile maintainer-clean-tags \ ! maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." --- 467,490 ---- maintainer-clean-generic: mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ ! mostlyclean-tags mostlyclean-depend mostlyclean-generic mostlyclean: mostlyclean-recursive ! clean-am: clean-binPROGRAMS clean-compile clean-tags clean-depend \ ! clean-generic mostlyclean-am clean: clean-recursive distclean-am: distclean-binPROGRAMS distclean-compile distclean-tags \ ! distclean-depend distclean-generic clean-am distclean: distclean-recursive maintainer-clean-am: maintainer-clean-binPROGRAMS \ maintainer-clean-compile maintainer-clean-tags \ ! maintainer-clean-depend maintainer-clean-generic \ ! distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." *************** *** 460,471 **** installcheck-recursive info-recursive dvi-recursive \ mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ ! distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ ! dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ ! install-exec install-data-am install-data install-am install \ ! uninstall-am uninstall all-redirect all-am all installdirs-am \ ! installdirs mostlyclean-generic distclean-generic clean-generic \ ! maintainer-clean-generic clean mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. --- 501,514 ---- installcheck-recursive info-recursive dvi-recursive \ mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ ! distclean-tags clean-tags maintainer-clean-tags distdir \ ! mostlyclean-depend distclean-depend clean-depend \ ! maintainer-clean-depend info-am info dvi-am dvi check check-am \ ! installcheck-am installcheck install-exec-am install-exec \ ! install-data-am install-data install-am install uninstall-am uninstall \ ! all-redirect all-am all installdirs-am installdirs mostlyclean-generic \ ! distclean-generic clean-generic maintainer-clean-generic clean \ ! mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. Index: gtkicq/src/gtkfunc.c diff -c gtkicq/src/gtkfunc.c:1.1.1.1 gtkicq/src/gtkfunc.c:1.1.1.1.2.1 *** gtkicq/src/gtkfunc.c:1.1.1.1 Sun Mar 7 07:47:11 1999 --- gtkicq/src/gtkfunc.c Sun Mar 7 07:53:00 1999 *************** *** 1217,1222 **** --- 1217,1226 ---- if( message_text[ 0 ] == 'm' ) { + #ifdef L10N + message_text = l10n_conv( "toLocal", message_text ); + #endif + table = gtk_table_new(3, 2, FALSE); gtk_box_pack_start( GTK_BOX( mainbox ), table, TRUE, TRUE, 0); Index: gtkicq/src/gtkicq.c diff -c gtkicq/src/gtkicq.c:1.1.1.1 gtkicq/src/gtkicq.c:1.1.1.1.2.1 *** gtkicq/src/gtkicq.c:1.1.1.1 Sun Mar 7 07:47:11 1999 --- gtkicq/src/gtkicq.c Sun Mar 7 07:53:01 1999 *************** *** 589,596 **** s_mesg = ( SIMPLE_MESSAGE_PTR ) pak.data; last_recv_uin = Chars_2_DW( s_mesg->uin ); Time_Stamp(); Do_Msg( Chars_2_Word( s_mesg->type ), ( s_mesg->len + 2 ), ! last_recv_uin, data, 'm' ); ack_srv( data->sok, Chars_2_Word( pak.head.seq ) ); if ( 0xfe != *( ((unsigned char *) s_mesg ) + sizeof( s_mesg ) ) ) --- 589,598 ---- s_mesg = ( SIMPLE_MESSAGE_PTR ) pak.data; last_recv_uin = Chars_2_DW( s_mesg->uin ); Time_Stamp(); + Do_Msg( Chars_2_Word( s_mesg->type ), ( s_mesg->len + 2 ), ! last_recv_uin, data, 'm' ); ! ack_srv( data->sok, Chars_2_Word( pak.head.seq ) ); if ( 0xfe != *( ((unsigned char *) s_mesg ) + sizeof( s_mesg ) ) ) *************** *** 1066,1075 **** --- 1068,1079 ---- signal( SIGUSR1, &handle_signal ); #ifndef GNOME + gtk_set_locale(); gtk_init( &argc, &argv ); gtk_rc_parse( ".gtkrc" ); #else + gtk_set_locale() make_applet( argc, argv, &sal ); if( applet_toggle == FALSE ) Index: gtkicq/src/gtkicq.h diff -c gtkicq/src/gtkicq.h:1.1.1.1 gtkicq/src/gtkicq.h:1.1.1.1.2.1 *** gtkicq/src/gtkicq.h:1.1.1.1 Sun Mar 7 07:47:11 1999 --- gtkicq/src/gtkicq.h Sun Mar 7 07:53:01 1999 *************** *** 458,466 **** --- 458,473 ---- extern int applet_toggle; #endif + #ifdef L10N + char *l10n_conv( char to[10], char *t_in ); #endif #ifdef HAVE_ESD #define SOUND #define GNOME_SOUND + #endif + + #define L10N + #define JAPANESE + #endif Index: gtkicq/src/histadd.c diff -c gtkicq/src/histadd.c:1.1.1.1 gtkicq/src/histadd.c:1.1.1.1.2.1 *** gtkicq/src/histadd.c:1.1.1.1 Sun Mar 7 07:47:11 1999 --- gtkicq/src/histadd.c Sun Mar 7 07:53:01 1999 *************** *** 27,33 **** --- 27,37 ---- strings[ 0 ] = pdate; strings[ 1 ] = who; + #ifdef L10N + strings[ 2 ] = l10n_conv( "toLocal", statement ); + #else strings[ 2 ] = statement; + #endif time( &timedate ); my_tm = localtime( &timedate ); *************** *** 51,63 **** 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 ); --- 55,67 ---- strcpy( buf, "" ); cy = cz = 0; ! for( cx = 0; cx < strlen( strings[ 2 ] ); cx ++ ) { cy ++; ! if( strings[ 2 ][cx] == '\n' || cy == 70 || ! ( cy >= 60 && strings[ 2 ][cx] == ' ' ) ) { ! write( file, ( strings[ 2 ] + cz ), cy ); if( cy >= 60 && cy != 70 ) { write( file, "\n", 1 ); *************** *** 71,79 **** } } ! if( cz != strlen( statement ) ) { ! write( file, ( statement + cz ), strlen( statement ) - cz ); } write( file, "\n", 1 ); --- 75,83 ---- } } ! if( cz != strlen( strings[ 2 ] ) ) { ! write( file, ( strings[ 2 ] + cz ), strlen( strings[ 2 ] ) - cz ); } write( file, "\n", 1 ); *************** *** 102,108 **** --- 106,116 ---- strings[ 0 ] = pdate; strings[ 1 ] = who; + #ifdef L10N + strings[ 2 ] = l10n_conv( "toLocal", statement ); + #else strings[ 2 ] = statement; + #endif time( &timedate ); my_tm = localtime( &timedate ); *************** *** 126,138 **** 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 ); --- 134,146 ---- strcpy( buf, "" ); cy = cz = 0; ! for( cx = 0; cx < strlen( strings[ 2 ] ); cx ++ ) { cy ++; ! if( strings[ 2 ][cx] == '\n' || cy == 70 || ! ( cy >= 60 && strings[ 2 ][cx] == ' ' ) ) { ! write( file, ( strings[ 2 ] + cz ), cy ); if( cy >= 60 && cy != 70 ) { write( file, "\n", 1 ); *************** *** 146,154 **** } } ! if( cz != strlen( statement ) ) { ! write( file, ( statement + cz ), strlen( statement ) - cz ); } write( file, "\n", 1 ); --- 154,162 ---- } } ! if( cz != strlen( strings[ 2 ] ) ) { ! write( file, ( strings[ 2 ] + cz ), strlen( strings[ 2 ] ) - cz ); } write( file, "\n", 1 ); Index: gtkicq/src/l10n_conv.c diff -c /dev/null gtkicq/src/l10n_conv.c:1.1.2.1 *** /dev/null Sun Mar 7 07:57:31 1999 --- gtkicq/src/l10n_conv.c Sun Mar 7 07:53:01 1999 *************** *** 0 **** --- 1,27 ---- + /* + * Localization + * + */ + + #include "gtkicq.h" + #include + + char *l10n_conv( char to[10], char *t_in ){ + #ifdef L10N + #ifdef JAPANESE + if(!strcmp(to, "toLocal")){ + return toStringEUC( t_in ); + }else if(!strcmp(to, "toNet")){ + return toStringSJIS( t_in ); + } + #else ifdef RUSSIAN + if(!strcmp(to, "toLocal")){ + rus_conv ("wk",new_text); + }else if(!strcmp(to, "toNet")){ + rus_conv ("kw",new_text); + } + #endif /* RUSSIAN */ + #endif /* L10N */ + + return t_in; + } Index: gtkicq/src/sendmsg.c diff -c gtkicq/src/sendmsg.c:1.1.1.1 gtkicq/src/sendmsg.c:1.1.1.1.2.1 *** gtkicq/src/sendmsg.c:1.1.1.1 Sun Mar 7 07:47:11 1999 --- gtkicq/src/sendmsg.c Sun Mar 7 07:53:01 1999 *************** *** 224,230 **** --- 224,234 ---- return; } + #ifdef L10N + new_text = cr_convert( l10n_conv( "toNet", text ) ); + #else new_text = cr_convert( text ); + #endif /* Add statement to personal history file */ add_outgoing_to_history( uin, new_text ); *************** *** 236,242 **** } log_window_add( "Sent Message (UDP)", 1, uin ); - rus_conv ("kw",new_text); len = strlen(new_text); --- 240,245 ---- *************** *** 287,293 **** --- 290,300 ---- sprintf( text, "%s\xFE%s", gtk_entry_get_text( GTK_ENTRY( data->desc ) ), gtk_entry_get_text( GTK_ENTRY( data->url ) ) ); + #ifdef L10N + new_text = cr_convert( l10n_conv( "toNet", text ) ); + #else new_text = cr_convert( text ); + #endif buf = (char *)malloc( sizeof( char ) * ( 16 + strlen( new_text ) ) ); /* Add statement to personal history file */ *************** *** 305,312 **** sprintf( buf, "Sent URL (UDP)" ); log_window_add( buf, 1, uin ); free( buf ); ! rus_conv ("kw",new_text); ! len = strlen(new_text); Word_2_Chars( pak.head.ver, ICQ_VER ); Word_2_Chars( pak.head.cmd, CMD_SENDM ); --- 312,318 ---- sprintf( buf, "Sent URL (UDP)" ); log_window_add( buf, 1, uin ); free( buf ); ! len = strlen(new_text); Word_2_Chars( pak.head.ver, ICQ_VER ); Word_2_Chars( pak.head.cmd, CMD_SENDM ); Index: gtkicq/src/xpms/Makefile.in diff -c gtkicq/src/xpms/Makefile.in:1.1.1.1 gtkicq/src/xpms/Makefile.in:1.1.1.1.2.1 *** gtkicq/src/xpms/Makefile.in:1.1.1.1 Sun Mar 7 07:47:11 1999 --- gtkicq/src/xpms/Makefile.in Sun Mar 7 07:53:02 1999 *************** *** 122,130 **** all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/xpms/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status --- 122,130 ---- all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) ! cd $(top_srcdir) && $(AUTOMAKE) --gnu src/xpms/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status *************** *** 156,161 **** --- 156,166 ---- subdir = src/xpms distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/xpms/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \