Hanno Böck commited on 2007-07-25 20:15:52
              Zeige 8 geänderte Dateien mit 0 Einfügungen und 322 Löschungen.
            
| ... | ... | 
                      @@ -1,28 +0,0 @@  | 
                  
| 1 | 
                        -AUX centericq-4.21.0-icq-short-read.diff 459 RMD160 a45875406445eb6cfa797ba484b1fae99118264d SHA1 b8c12de350300c1d11d4cbbdf1ad846ed72623a5 SHA256 e47d5cbffebb5575136d223ec30e3237449c9805ccfdf1a52bde7a7e54ad1f41  | 
                    |
| 2 | 
                        -MD5 30d1cc077b8d5330e45cb1051c0df8a3 files/centericq-4.21.0-icq-short-read.diff 459  | 
                    |
| 3 | 
                        -RMD160 a45875406445eb6cfa797ba484b1fae99118264d files/centericq-4.21.0-icq-short-read.diff 459  | 
                    |
| 4 | 
                        -SHA256 e47d5cbffebb5575136d223ec30e3237449c9805ccfdf1a52bde7a7e54ad1f41 files/centericq-4.21.0-icq-short-read.diff 459  | 
                    |
| 5 | 
                        -AUX centericq-4.21.0-ktools.diff 522 RMD160 c745d3f630195c4ca03c6878bf864deee9e2030a SHA1 8d3c7ea5402ecb3d71368c13b5f7ab948f81ce0c SHA256 75bd0133bf7c2ac00211a16b0707d64f3f208ddd4d4e6c631ad3f29b78fe251b  | 
                    |
| 6 | 
                        -MD5 acab6602a58439dd5688812e6fcf6cec files/centericq-4.21.0-ktools.diff 522  | 
                    |
| 7 | 
                        -RMD160 c745d3f630195c4ca03c6878bf864deee9e2030a files/centericq-4.21.0-ktools.diff 522  | 
                    |
| 8 | 
                        -SHA256 75bd0133bf7c2ac00211a16b0707d64f3f208ddd4d4e6c631ad3f29b78fe251b files/centericq-4.21.0-ktools.diff 522  | 
                    |
| 9 | 
                        -AUX centericq-4.21.0-memory-handling.diff 730 RMD160 8fd3702d398a3615de0a46b7ecfd366170e4880d SHA1 b9a41c62e70af9d4d342cb98bf02e451a1382d0b SHA256 6fcd30911fee7cc346ec8944e5e8846291a204ba7cf1a836d82805e7d7be0443  | 
                    |
| 10 | 
                        -MD5 d1bd933bc9df19a29bc4c12db36fedbc files/centericq-4.21.0-memory-handling.diff 730  | 
                    |
| 11 | 
                        -RMD160 8fd3702d398a3615de0a46b7ecfd366170e4880d files/centericq-4.21.0-memory-handling.diff 730  | 
                    |
| 12 | 
                        -SHA256 6fcd30911fee7cc346ec8944e5e8846291a204ba7cf1a836d82805e7d7be0443 files/centericq-4.21.0-memory-handling.diff 730  | 
                    |
| 13 | 
                        -AUX centericq-4.21.0-sha-amd64.diff 482 RMD160 1ab3f5409eb6b03c7ff4d9b0fced6363178dec5c SHA1 a6f963e46a2e2e604250a18405b6a98cf8edbc31 SHA256 bca387e153f6b8c7dbfccfebdb0437185b21f68ef653d6041a70131947a5332a  | 
                    |
| 14 | 
                        -MD5 d511972bac3c3088304c94feb7216c73 files/centericq-4.21.0-sha-amd64.diff 482  | 
                    |
| 15 | 
                        -RMD160 1ab3f5409eb6b03c7ff4d9b0fced6363178dec5c files/centericq-4.21.0-sha-amd64.diff 482  | 
                    |
| 16 | 
                        -SHA256 bca387e153f6b8c7dbfccfebdb0437185b21f68ef653d6041a70131947a5332a files/centericq-4.21.0-sha-amd64.diff 482  | 
                    |
| 17 | 
                        -AUX centericq-amd64.patch 6291 RMD160 fe948ba7c308945bf58c59209a3679fe7c402385 SHA1 4e9837ce2b7d628766dc5353231e295a74975390 SHA256 69443a8b6840e9ac44730ffb1feaff31659355e4116ea6574015138f528e99e4  | 
                    |
| 18 | 
                        -MD5 0f60514eff0a237cf8fbdd13fd88293e files/centericq-amd64.patch 6291  | 
                    |
| 19 | 
                        -RMD160 fe948ba7c308945bf58c59209a3679fe7c402385 files/centericq-amd64.patch 6291  | 
                    |
| 20 | 
                        -SHA256 69443a8b6840e9ac44730ffb1feaff31659355e4116ea6574015138f528e99e4 files/centericq-amd64.patch 6291  | 
                    |
| 21 | 
                        -DIST centericq-4.21.0.tar.bz2 1422126 RMD160 69207fcaf5c90b9ae4609221526b839659c5ccfc SHA1 26b07c4bdcbe8c6888ceab98140b33007bec8554 SHA256 fc8d7e95f54c153b7004448b33118477e52831d071e930e21b473ad6b724fd76  | 
                    |
| 22 | 
                        -EBUILD centericq-4.21.0-r2.ebuild 1939 RMD160 6d0e112ad514d8d49714fd9f86e4cd89de77e694 SHA1 c0499c92f193c5fd60930311f1b9a235d8c35682 SHA256 cfa54413a39a7061f3940d9eb02730a33907b0269bd267487810f4c84af20caa  | 
                    |
| 23 | 
                        -MD5 914141ef286547529785fe72a321114a centericq-4.21.0-r2.ebuild 1939  | 
                    |
| 24 | 
                        -RMD160 6d0e112ad514d8d49714fd9f86e4cd89de77e694 centericq-4.21.0-r2.ebuild 1939  | 
                    |
| 25 | 
                        -SHA256 cfa54413a39a7061f3940d9eb02730a33907b0269bd267487810f4c84af20caa centericq-4.21.0-r2.ebuild 1939  | 
                    |
| 26 | 
                        -MD5 ceb4acbc002e486ff733f41fa7b5b724 files/digest-centericq-4.21.0-r2 256  | 
                    |
| 27 | 
                        -RMD160 1d6ac8a46fbf20b1da4816dbbae2ce6780955062 files/digest-centericq-4.21.0-r2 256  | 
                    |
| 28 | 
                        -SHA256 6083a2f03d33142eaa8c10fff4d8f76e063848f69ac8c0a0996533c4878a52e7 files/digest-centericq-4.21.0-r2 256  | 
                    
| ... | ... | 
                      @@ -1,75 +0,0 @@  | 
                  
| 1 | 
                        -# Copyright 1999-2006 Gentoo Foundation  | 
                    |
| 2 | 
                        -# Distributed under the terms of the GNU General Public License v2  | 
                    |
| 3 | 
                        -# $Header: /var/cvsroot/gentoo-x86/net-im/centericq/centericq-4.21.0-r2.ebuild,v 1.7 2006/02/17 16:38:52 blubb Exp $  | 
                    |
| 4 | 
                        -  | 
                    |
| 5 | 
                        -inherit eutils autotools  | 
                    |
| 6 | 
                        -  | 
                    |
| 7 | 
                        -IUSE="bidi nls ssl crypt icq jabber aim msn yahoo irc rss lj"  | 
                    |
| 8 | 
                        -  | 
                    |
| 9 | 
                        -DESCRIPTION="A ncurses ICQ/Yahoo!/AIM/IRC/MSN/Jabber/GaduGadu/RSS/LiveJournal Client"  | 
                    |
| 10 | 
                        -SRC_URI="http://thekonst.net/download/${P}.tar.bz2"
                       | 
                    |
| 11 | 
                        -HOMEPAGE="http://thekonst.net/en/centericq"  | 
                    |
| 12 | 
                        -SLOT="0"  | 
                    |
| 13 | 
                        -LICENSE="GPL-2"  | 
                    |
| 14 | 
                        -KEYWORDS="amd64 hppa ppc ~ppc64 sparc x86"  | 
                    |
| 15 | 
                        -  | 
                    |
| 16 | 
                        -DEPEND="virtual/libc  | 
                    |
| 17 | 
                        - >=sys-libs/ncurses-5.2  | 
                    |
| 18 | 
                        - bidi? ( dev-libs/fribidi )  | 
                    |
| 19 | 
                        - jabber? ( crypt? ( >=app-crypt/gpgme-1.0.2 ) )  | 
                    |
| 20 | 
                        - ssl? ( >=dev-libs/openssl-0.9.6g )  | 
                    |
| 21 | 
                        - msn? ( net-misc/curl )"  | 
                    |
| 22 | 
                        -  | 
                    |
| 23 | 
                        -RDEPEND="${DEPEND}
                       | 
                    |
| 24 | 
                        - nls? ( sys-devel/gettext )"  | 
                    |
| 25 | 
                        -  | 
                    |
| 26 | 
                        -src_unpack() {
                       | 
                    |
| 27 | 
                        -	unpack ${A}
                       | 
                    |
| 28 | 
                        -	cd ${S}
                       | 
                    |
| 29 | 
                        -  | 
                    |
| 30 | 
                        -	use amd64 && epatch ${FILESDIR}/${PN}-amd64.patch
                       | 
                    |
| 31 | 
                        -  | 
                    |
| 32 | 
                        - # fix bug #100519  | 
                    |
| 33 | 
                        -	epatch ${FILESDIR}/${P}-icq-short-read.diff
                       | 
                    |
| 34 | 
                        -	epatch ${FILESDIR}/${P}-memory-handling.diff
                       | 
                    |
| 35 | 
                        -  | 
                    |
| 36 | 
                        - # fix bug #114038  | 
                    |
| 37 | 
                        -	epatch ${FILESDIR}/${P}-ktools.diff
                       | 
                    |
| 38 | 
                        -	epatch ${FILESDIR}/${P}-sha-amd64.diff
                       | 
                    |
| 39 | 
                        -}  | 
                    |
| 40 | 
                        -  | 
                    |
| 41 | 
                        -src_compile() {
                       | 
                    |
| 42 | 
                        - if use msn && ! use ssl; then  | 
                    |
| 43 | 
                        - eerror "USE-flag collision"  | 
                    |
| 44 | 
                        - eerror "------------------"  | 
                    |
| 45 | 
                        - eerror "The \"msn\" USE-flag is set but the \"ssl\" USE-flag is"  | 
                    |
| 46 | 
                        - eerror "missing. Please set the USE-flag \"ssl\" or deactivate "  | 
                    |
| 47 | 
                        - eerror "\"msn\"."  | 
                    |
| 48 | 
                        - fi  | 
                    |
| 49 | 
                        - local myopts="--disable-konst\  | 
                    |
| 50 | 
                        - $(use_with ssl) \  | 
                    |
| 51 | 
                        - $(use_with bidi fribidi) \  | 
                    |
| 52 | 
                        - $(use_enable icq) \  | 
                    |
| 53 | 
                        - $(use_with crypt gpgme) \  | 
                    |
| 54 | 
                        - $(use_enable aim) \  | 
                    |
| 55 | 
                        - $(use_enable msn) \  | 
                    |
| 56 | 
                        - $(use_enable jabber) \  | 
                    |
| 57 | 
                        - $(use_enable yahoo) \  | 
                    |
| 58 | 
                        - $(use_enable irc) \  | 
                    |
| 59 | 
                        - $(use_enable rss) \  | 
                    |
| 60 | 
                        - $(use_enable lj)"  | 
                    |
| 61 | 
                        -  | 
                    |
| 62 | 
                        - for afile in */configure.in  | 
                    |
| 63 | 
                        - do  | 
                    |
| 64 | 
                        -		pushd $(dirname ${afile})
                       | 
                    |
| 65 | 
                        - eautoconf || die  | 
                    |
| 66 | 
                        - popd  | 
                    |
| 67 | 
                        - done  | 
                    |
| 68 | 
                        -	econf ${myopts} || die "Configure failed"
                       | 
                    |
| 69 | 
                        - emake || die "Compilation failed"  | 
                    |
| 70 | 
                        -}  | 
                    |
| 71 | 
                        -  | 
                    |
| 72 | 
                        -src_install () {
                       | 
                    |
| 73 | 
                        - einstall || die "Installation failed"  | 
                    |
| 74 | 
                        - dodoc ABOUT-NLS AUTHORS ChangeLog COPYING FAQ README THANKS TODO  | 
                    |
| 75 | 
                        -}  | 
                    
| ... | ... | 
                      @@ -1,10 +0,0 @@  | 
                  
| 1 | 
                        ---- centericq-4.21.0.orig/libicq2000-0.1/src/DirectClient.cpp  | 
                    |
| 2 | 
                        -+++ centericq-4.21.0/libicq2000-0.1/src/DirectClient.cpp  | 
                    |
| 3 | 
                        -@@ -162,6 +162,7 @@  | 
                    |
| 4 | 
                        -  | 
                    |
| 5 | 
                        - m_recv.setLittleEndian();  | 
                    |
| 6 | 
                        - m_recv >> length;  | 
                    |
| 7 | 
                        -+ if (length == 0) return; // short read, toss it back (nothing to do)  | 
                    |
| 8 | 
                        -       if (length > Incoming_Packet_Limit) throw ParseException("Received too long incoming packet");
                       | 
                    |
| 9 | 
                        - if (m_recv.remains() < length) return; // waiting for more of the packet  | 
                    |
| 10 | 
                        -  | 
                    
| ... | ... | 
                      @@ -1,12 +0,0 @@  | 
                  
| 1 | 
                        -diff -ruN centericq-4.21.0.orig/kkstrtext-0.1/kkstrtext.h centericq-4.21.0/kkstrtext-0.1/kkstrtext.h  | 
                    |
| 2 | 
                        ---- centericq-4.21.0.orig/kkstrtext-0.1/kkstrtext.h 2004-11-17 23:00:38.000000000 +0000  | 
                    |
| 3 | 
                        -+++ centericq-4.21.0/kkstrtext-0.1/kkstrtext.h 2005-12-13 18:34:56.308723728 +0000  | 
                    |
| 4 | 
                        -@@ -87,7 +87,7 @@  | 
                    |
| 5 | 
                        -     { \
                       | 
                    |
| 6 | 
                        - va_list vgs__ap; char vgs__buf[1024]; \  | 
                    |
| 7 | 
                        - va_start(vgs__ap, fmt); \  | 
                    |
| 8 | 
                        -- vsprintf(vgs__buf, fmt, vgs__ap); c = vgs__buf; \  | 
                    |
| 9 | 
                        -+ vsnprintf(vgs__buf, sizeof(vgs__buf), fmt, vgs__ap); c = vgs__buf; \  | 
                    |
| 10 | 
                        - va_end(vgs__ap); \  | 
                    |
| 11 | 
                        - }  | 
                    |
| 12 | 
                        -  | 
                    
| ... | ... | 
                      @@ -1,26 +0,0 @@  | 
                  
| 1 | 
                        ---- centericq-4.21.0.orig/src/icqface.cc  | 
                    |
| 2 | 
                        -+++ centericq-4.21.0/src/icqface.cc  | 
                    |
| 3 | 
                        -@@ -2003,7 +2003,7 @@  | 
                    |
| 4 | 
                        - mvaddchnstr(i-1, sizeWArea.x1+1, logline, sizeWArea.x2-sizeWArea.x1);  | 
                    |
| 5 | 
                        - }  | 
                    |
| 6 | 
                        -  | 
                    |
| 7 | 
                        -- delete logline;  | 
                    |
| 8 | 
                        -+ delete[] logline;  | 
                    |
| 9 | 
                        -  | 
                    |
| 10 | 
                        - if(text.size() > sizeWArea.x2-sizeWArea.x1-2) text.resize(sizeWArea.x2-sizeWArea.x1-2);  | 
                    |
| 11 | 
                        - mvhline(LINES-3, sizeWArea.x1+2, ' ', sizeWArea.x2-sizeWArea.x1-2);  | 
                    |
| 12 | 
                        -only in patch2:  | 
                    |
| 13 | 
                        -unchanged:  | 
                    |
| 14 | 
                        ---- centericq-4.21.0.orig/kkstrtext-0.1/kkstrtext.cc  | 
                    |
| 15 | 
                        -+++ centericq-4.21.0/kkstrtext-0.1/kkstrtext.cc  | 
                    |
| 16 | 
                        -@@ -907,8 +907,8 @@  | 
                    |
| 17 | 
                        - r += soutbuf;  | 
                    |
| 18 | 
                        - text.erase(0, text.size()-inleft);  | 
                    |
| 19 | 
                        -  | 
                    |
| 20 | 
                        -- delete soutbuf;  | 
                    |
| 21 | 
                        -- delete sinbuf;  | 
                    |
| 22 | 
                        -+ delete[] soutbuf;  | 
                    |
| 23 | 
                        -+ free(sinbuf);  | 
                    |
| 24 | 
                        -  | 
                    |
| 25 | 
                        - if(res == -1 && errno != EILSEQ)  | 
                    |
| 26 | 
                        - break;  | 
                    
| ... | ... | 
                      @@ -1,17 +0,0 @@  | 
                  
| 1 | 
                        -diff -ru centericq-4.21.0/libjabber-0.1/libxode.h centericq-4.21.0-lars/libjabber-0.1/libxode.h  | 
                    |
| 2 | 
                        ---- centericq-4.21.0/libjabber-0.1/libxode.h 2005-02-10 01:36:26.000000000 +0100  | 
                    |
| 3 | 
                        -+++ centericq-4.21.0-lars/libjabber-0.1/libxode.h 2006-04-22 20:26:47.314265250 +0200  | 
                    |
| 4 | 
                        -@@ -424,10 +424,10 @@  | 
                    |
| 5 | 
                        - */  | 
                    |
| 6 | 
                        -  | 
                    |
| 7 | 
                        - typedef struct {
                       | 
                    |
| 8 | 
                        -- unsigned long H[5];  | 
                    |
| 9 | 
                        -- unsigned long W[80];  | 
                    |
| 10 | 
                        -+ uint32_t H[5];  | 
                    |
| 11 | 
                        -+ uint32_t W[80];  | 
                    |
| 12 | 
                        - int lenW;  | 
                    |
| 13 | 
                        -- unsigned long sizeHi,sizeLo;  | 
                    |
| 14 | 
                        -+ uint32_t sizeHi,sizeLo;  | 
                    |
| 15 | 
                        - } SHA_CTX;  | 
                    |
| 16 | 
                        -  | 
                    |
| 17 | 
                        -  | 
                    
| ... | ... | 
                      @@ -1,151 +0,0 @@  | 
                  
| 1 | 
                        -diff -urpN src.orig/icqdialogs.cc src/icqdialogs.cc  | 
                    |
| 2 | 
                        ---- src.orig/icqdialogs.cc 2005-01-21 20:37:33.797082840 +0100  | 
                    |
| 3 | 
                        -+++ src/icqdialogs.cc 2005-01-21 20:37:48.351870176 +0100  | 
                    |
| 4 | 
                        -@@ -100,7 +100,7 @@ bool icqface::sprofmanager(string &name,  | 
                    |
| 5 | 
                        - conf.getcolor(cp_dialog_selected)));  | 
                    |
| 6 | 
                        -  | 
                    |
| 7 | 
                        - db.setbar(new horizontalbar(conf.getcolor(cp_dialog_text),  | 
                    |
| 8 | 
                        --	conf.getcolor(cp_dialog_selected), _("Remove"), _("Load"), 0));
                       | 
                    |
| 9 | 
                        -+	conf.getcolor(cp_dialog_selected), _("Remove"), _("Load"), (char*)0));
                       | 
                    |
| 10 | 
                        -  | 
                    |
| 11 | 
                        - db.addkey(KEY_DC, 0);  | 
                    |
| 12 | 
                        -  | 
                    |
| 13 | 
                        -@@ -209,17 +209,17 @@ bool icqface::finddialog(imsearchparams  | 
                    |
| 14 | 
                        -     switch(subj) {
                       | 
                    |
| 15 | 
                        - case fsuser:  | 
                    |
| 16 | 
                        - db.setbar(new horizontalbar(conf.getcolor(cp_dialog_text), conf.getcolor(cp_dialog_selected),  | 
                    |
| 17 | 
                        --		_("lOad"), _("sAve"), _("cLear"), _("Change"), _("Search/Add"), 0));
                       | 
                    |
| 18 | 
                        -+		_("lOad"), _("sAve"), _("cLear"), _("Change"), _("Search/Add"), (char*)0));
                       | 
                    |
| 19 | 
                        - break;  | 
                    |
| 20 | 
                        -  | 
                    |
| 21 | 
                        - case fschannel:  | 
                    |
| 22 | 
                        - db.setbar(new horizontalbar(conf.getcolor(cp_dialog_text), conf.getcolor(cp_dialog_selected),  | 
                    |
| 23 | 
                        --		_("cLear"), _("Change"), _("Join/Create"), 0));
                       | 
                    |
| 24 | 
                        -+		_("cLear"), _("Change"), _("Join/Create"), (char*)0));
                       | 
                    |
| 25 | 
                        - break;  | 
                    |
| 26 | 
                        -  | 
                    |
| 27 | 
                        - case fsrss:  | 
                    |
| 28 | 
                        - db.setbar(new horizontalbar(conf.getcolor(cp_dialog_text), conf.getcolor(cp_dialog_selected),  | 
                    |
| 29 | 
                        --		_("cLear"), _("Change"), _("lInk"), 0));
                       | 
                    |
| 30 | 
                        -+		_("cLear"), _("Change"), _("lInk"), (char*)0));
                       | 
                    |
| 31 | 
                        - break;  | 
                    |
| 32 | 
                        - }  | 
                    |
| 33 | 
                        -  | 
                    |
| 34 | 
                        -@@ -726,7 +726,7 @@ bool icqface::updatedetails(icqcontact *  | 
                    |
| 35 | 
                        - conf.getcolor(cp_dialog_text)));  | 
                    |
| 36 | 
                        -  | 
                    |
| 37 | 
                        - db.setbar(new horizontalbar(conf.getcolor(cp_dialog_text),  | 
                    |
| 38 | 
                        --	conf.getcolor(cp_dialog_selected), _("Change"), _("Done"), 0));
                       | 
                    |
| 39 | 
                        -+	conf.getcolor(cp_dialog_selected), _("Change"), _("Done"), (char*)0));
                       | 
                    |
| 40 | 
                        -  | 
                    |
| 41 | 
                        - db.idle = &detailsidle;  | 
                    |
| 42 | 
                        - db.addautokeys();  | 
                    |
| 43 | 
                        -@@ -1025,7 +1025,7 @@ bool icqface::sendfiles(const imcontact  | 
                    |
| 44 | 
                        -  | 
                    |
| 45 | 
                        - db.setbar(new horizontalbar(conf.getcolor(cp_dialog_text),  | 
                    |
| 46 | 
                        - conf.getcolor(cp_dialog_selected),  | 
                    |
| 47 | 
                        --	_("Add"), _("Remove"), _("Comment"), _("Send"), 0));
                       | 
                    |
| 48 | 
                        -+	_("Add"), _("Remove"), _("Comment"), _("Send"), (char*)0));
                       | 
                    |
| 49 | 
                        -  | 
                    |
| 50 | 
                        - db.addkey(KEY_IC, 0);  | 
                    |
| 51 | 
                        - db.addkey(KEY_DC, 1);  | 
                    |
| 52 | 
                        -@@ -1162,7 +1162,7 @@ bool icqface::updateconf(icqconf::regsou  | 
                    |
| 53 | 
                        - conf.getcolor(cp_dialog_text)));  | 
                    |
| 54 | 
                        -  | 
                    |
| 55 | 
                        - db.setbar(new horizontalbar(conf.getcolor(cp_dialog_text),  | 
                    |
| 56 | 
                        --	conf.getcolor(cp_dialog_selected), _("Change"), _("Done"), 0));
                       | 
                    |
| 57 | 
                        -+	conf.getcolor(cp_dialog_selected), _("Change"), _("Done"), (char*)0));
                       | 
                    |
| 58 | 
                        -  | 
                    |
| 59 | 
                        - db.idle = &dialogidle;  | 
                    |
| 60 | 
                        - db.addautokeys();  | 
                    |
| 61 | 
                        -@@ -1553,7 +1553,7 @@ int icqface::groupmanager(const string &  | 
                    |
| 62 | 
                        - db.setbar(new horizontalbar(conf.getcolor(cp_dialog_text),  | 
                    |
| 63 | 
                        - conf.getcolor(cp_dialog_selected),  | 
                    |
| 64 | 
                        - 	_("Add"), _("Rename"), _("rEmove"), _("move Up"), _("move Down"),
                       | 
                    |
| 65 | 
                        --	sel ? _("Select") : _("Done"), 0));
                       | 
                    |
| 66 | 
                        -+	sel ? _("Select") : _("Done"), (char*)0));
                       | 
                    |
| 67 | 
                        -  | 
                    |
| 68 | 
                        - db.addautokeys();  | 
                    |
| 69 | 
                        - db.getbar()->item = 5;  | 
                    |
| 70 | 
                        -@@ -1674,7 +1674,7 @@ void icqface::transfermonitor() {
                       | 
                    |
| 71 | 
                        - conf.getcolor(cp_dialog_text)));  | 
                    |
| 72 | 
                        -  | 
                    |
| 73 | 
                        - db.setbar(new horizontalbar(conf.getcolor(cp_dialog_text),  | 
                    |
| 74 | 
                        --	conf.getcolor(cp_dialog_selected), _("Cancel"), _("Remove"), 0));
                       | 
                    |
| 75 | 
                        -+	conf.getcolor(cp_dialog_selected), _("Cancel"), _("Remove"), (char*)0));
                       | 
                    |
| 76 | 
                        -  | 
                    |
| 77 | 
                        - db.getbar()->item = 1;  | 
                    |
| 78 | 
                        - db.addautokeys();  | 
                    |
| 79 | 
                        -@@ -1886,7 +1886,7 @@ bool icqface::setljparams(imxmlevent *ev  | 
                    |
| 80 | 
                        - conf.getcolor(cp_dialog_text)));  | 
                    |
| 81 | 
                        -  | 
                    |
| 82 | 
                        - db.setbar(new horizontalbar(conf.getcolor(cp_dialog_text), conf.getcolor(cp_dialog_selected),  | 
                    |
| 83 | 
                        --	_("Change"), _("Detect music"), _("Post"), _("cAncel"), 0));
                       | 
                    |
| 84 | 
                        -+	_("Change"), _("Detect music"), _("Post"), _("cAncel"), (char*)0));
                       | 
                    |
| 85 | 
                        -  | 
                    |
| 86 | 
                        - db.addautokeys();  | 
                    |
| 87 | 
                        - db.idle = &dialogidle;  | 
                    |
| 88 | 
                        -diff -urpN src.orig/icqface.cc src/icqface.cc  | 
                    |
| 89 | 
                        ---- src.orig/icqface.cc 2005-01-21 20:37:33.799082536 +0100  | 
                    |
| 90 | 
                        -+++ src/icqface.cc 2005-01-21 20:37:51.575380128 +0100  | 
                    |
| 91 | 
                        -@@ -742,11 +742,11 @@ bool icqface::findresults(const imsearch  | 
                    |
| 92 | 
                        -     if(!h.getCapabs().count(hookcapab::nochat)) {
                       | 
                    |
| 93 | 
                        - db.setbar(new horizontalbar(conf.getcolor(cp_main_highlight),  | 
                    |
| 94 | 
                        - 	    conf.getcolor(cp_main_selected), _("Details"), _("Message"),
                       | 
                    |
| 95 | 
                        --	    _("Add"), fauto ? 0 : _("New search"), 0));
                       | 
                    |
| 96 | 
                        -+	    _("Add"), fauto ? 0 : _("New search"), (char*)0));
                       | 
                    |
| 97 | 
                        -     } else {
                       | 
                    |
| 98 | 
                        - db.setbar(new horizontalbar(conf.getcolor(cp_main_highlight),  | 
                    |
| 99 | 
                        - 	    conf.getcolor(cp_main_selected), _("Details"), _("Add"),
                       | 
                    |
| 100 | 
                        --	    fauto ? 0 : _("New search"), 0));
                       | 
                    |
| 101 | 
                        -+	    fauto ? 0 : _("New search"), (char*)0));
                       | 
                    |
| 102 | 
                        - }  | 
                    |
| 103 | 
                        -  | 
                    |
| 104 | 
                        - db.addautokeys();  | 
                    |
| 105 | 
                        -@@ -1215,24 +1215,24 @@ void icqface::userinfo(const imcontact &  | 
                    |
| 106 | 
                        - 	if(c->inlist() && realinfo != contactroot) {
                       | 
                    |
| 107 | 
                        - db.setbar(new horizontalbar(sizeWArea.x1+2, sizeWArea.y2-1,  | 
                    |
| 108 | 
                        - conf.getcolor(cp_main_highlight), conf.getcolor(cp_main_selected),  | 
                    |
| 109 | 
                        --		_("Info"), _("About"), _("Check"), _("Edit"), islivejournal(c) ? _("LJ") : 0, 0));
                       | 
                    |
| 110 | 
                        -+		_("Info"), _("About"), _("Check"), _("Edit"), islivejournal(c) ? _("LJ") : 0, (char*)0));
                       | 
                    |
| 111 | 
                        - 	} else {
                       | 
                    |
| 112 | 
                        - db.setbar(new horizontalbar(sizeWArea.x1+2, sizeWArea.y2-1,  | 
                    |
| 113 | 
                        - conf.getcolor(cp_main_highlight), conf.getcolor(cp_main_selected),  | 
                    |
| 114 | 
                        --		_("Info"), _("About"), _("Retreive"), 0));
                       | 
                    |
| 115 | 
                        -+		_("Info"), _("About"), _("Retreive"), (char*)0));
                       | 
                    |
| 116 | 
                        - }  | 
                    |
| 117 | 
                        -  | 
                    |
| 118 | 
                        -     } else if(cinfo.pname == livejournal) {
                       | 
                    |
| 119 | 
                        - db.setbar(new horizontalbar(sizeWArea.x1+2, sizeWArea.y2-1,  | 
                    |
| 120 | 
                        - conf.getcolor(cp_main_highlight), conf.getcolor(cp_main_selected),  | 
                    |
| 121 | 
                        --	    _("Info"), _("Friend of"), 0));
                       | 
                    |
| 122 | 
                        -+	    _("Info"), _("Friend of"), (char*)0));
                       | 
                    |
| 123 | 
                        -  | 
                    |
| 124 | 
                        -  | 
                    |
| 125 | 
                        -     } else {
                       | 
                    |
| 126 | 
                        - db.setbar(new horizontalbar(sizeWArea.x1+2, sizeWArea.y2-1,  | 
                    |
| 127 | 
                        - conf.getcolor(cp_main_highlight), conf.getcolor(cp_main_selected),  | 
                    |
| 128 | 
                        - 	    _("Info"), _("Home"), _("Work"), _("More"), _("About"),
                       | 
                    |
| 129 | 
                        --	    cinfo.pname != infocard ? _("Retrieve") : _("Edit"), 0));
                       | 
                    |
| 130 | 
                        -+	    cinfo.pname != infocard ? _("Retrieve") : _("Edit"), (char*)0));
                       | 
                    |
| 131 | 
                        -  | 
                    |
| 132 | 
                        - }  | 
                    |
| 133 | 
                        -  | 
                    |
| 134 | 
                        -@@ -1664,7 +1664,7 @@ void icqface::modelist(contactstatus cs)  | 
                    |
| 135 | 
                        -  | 
                    |
| 136 | 
                        - db.setbar(new horizontalbar(conf.getcolor(cp_main_highlight),  | 
                    |
| 137 | 
                        - conf.getcolor(cp_main_selected),  | 
                    |
| 138 | 
                        --	_("Details"), _("Add"), _("Remove"), _("Move to contacts"), 0));
                       | 
                    |
| 139 | 
                        -+	_("Details"), _("Add"), _("Remove"), _("Move to contacts"), (char*)0));
                       | 
                    |
| 140 | 
                        -  | 
                    |
| 141 | 
                        - db.addautokeys();  | 
                    |
| 142 | 
                        - db.idle = &dialogidle;  | 
                    |
| 143 | 
                        -@@ -2350,7 +2350,7 @@ bool icqface::eventedit(imevent &ev) {
                       | 
                    |
| 144 | 
                        - conf.getcolor(cp_main_selected)));  | 
                    |
| 145 | 
                        - db.setbar(new horizontalbar(conf.getcolor(cp_main_highlight),  | 
                    |
| 146 | 
                        - conf.getcolor(cp_main_selected),  | 
                    |
| 147 | 
                        --	    _("Add"), _("Remove"), _("Send"), 0));
                       | 
                    |
| 148 | 
                        -+	    _("Add"), _("Remove"), _("Send"), (char*)0));
                       | 
                    |
| 149 | 
                        -  | 
                    |
| 150 | 
                        - db.addkey(KEY_IC, 0);  | 
                    |
| 151 | 
                        - db.addkey(KEY_DC, 1);  |