Update to KDE 3.5.5 / KOffice 1.6.1

Approved by:	portmgr

5 files changed, 844 insertions, 512 deletions

diff --git a/net-im/kopete/Makefile b/net-im/kopete/Makefile
index df0ae0ca1f1b..e3d223bf2775 100644
--- a/net-im/kopete/Makefile
+++ b/net-im/kopete/Makefile
@@ -1,25 +1,22 @@
-# -*-mode: makefile-*-
-# New ports collection makefile for:	kdenetwork2
-# Date created:				2 November 2001
-# Whom:					will@cvs.kde.org
+# New ports collection makefile for:	kopete
+# Date created:		Wed Apr 12 17:51:07 UTC 2006
+# Whom:			Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	kopete
-PORTVERSION=	0.11
-PORTREVISION=	2
+PORTVERSION=	0.12.3
 CATEGORIES?=	net-im kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/3.5.4/src
+MASTER_SITE_SUBDIR=	stable/3.5.5/src
 PKGNAMEPREFIX=	kdenetwork-
-DISTNAME=	kdenetwork-3.5.4
+DISTNAME=	kdenetwork-3.5.5
 DIST_SUBDIR=	KDE
 
-MAINTAINER?=	kde@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE multi-protocol instant messenger (IM)
 
-LIB_DEPENDS=	idn:${PORTSDIR}/dns/libidn
 RUN_DEPENDS=	${QT_PREFIX}/lib/plugins/crypto/libqca-tls.so:${PORTSDIR}/security/qca-tls
 
 CONFLICTS=	kdenetwork-[0-2]* kdenetwork-3.[0-4]* kdenetwork-3.5.[0-2]* kvirc-[0-9]*
@@ -28,26 +25,60 @@ USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
 
 USE_BZIP2=	yes
+USE_GNOME=	glib20
 USE_OPENSSL=	yes
 
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
-CONFIGURE_ARGS+=--with-ssl-dir=${OPENSSLBASE}
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--with-ilbc=${LOCALBASE} \
+		--with-speex=${LOCALBASE} \
+		--with-ssl-dir=${OPENSSLBASE} \
+		--without-external-libgadu
+USE_LDCONFIG=	yes
+_NO_KDE_FINAL=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 BUILD_WRKSRC=	${WRKSRC}/kopete
 INSTALL_WRKSRC=	${WRKSRC}/kopete
 
-INSTALLS_SHLIB=	yes
-LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
+PKG_CONFIG?=	${LOCALBASE}/bin/pkg-config
 
-.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} > 500028
+CONFIGURE_ARGS+=--enable-jingle
+LIB_DEPENDS+=	speex:${PORTSDIR}/audio/speex \
+		ilbc:${PORTSDIR}/net/ilbc \
+		ortp:${PORTSDIR}/net/ortp
+CONFIGURE_ENV+=	PKG_CONFIG="${PKG_CONFIG}" \
+		EXPAT_CFLAGS="-I${LOCALBASE}/include" \
+		EXPAT_LIBS="-L${LOCALBASE}/lib -lexpat" \
+		ILBC_CFLAGS="-I${LOCALBASE}/include/ilbc" \
+		ILBC_LIBS="-L${LOCALBASE}/lib -lilbc" \
+		SPEEX_CFLAGS="$$(${PKG_CONFIG} --cflags speex)" \
+		SPEEX_LIBS="$$(${PKG_CONFIG} --libs speex)"
+.endif
+
+post-patch:
+# force usage of gthread for libjingle's benefit
+	@${REINPLACE_CMD} -E \
+		-e 's|(glib-2.0)|gthread-2.0 \1|' \
+		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+
 post-configure:
 .if ${OSVERSION} < 500028
 	@${REINPLACE_CMD} -e 's|$$(depcomp)||g' \
 		${WRKSRC}/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile
 .endif
+# configure does not handle OSS support
+.for feature in \
+	FEATURE_ENABLE_CHAT_ARCHIVING \
+	FEATURE_ENABLE_SSL \
+	HAVE_SYS_SOUNDCARD_H
+	@${ECHO_CMD} \
+		'#define ${feature} 1' >> \
+		${CONFIGURE_WRKSRC}/config.h
+.endfor
 
 .include <bsd.port.post.mk>
diff --git a/net-im/kopete/distinfo b/net-im/kopete/distinfo
index ac4de7a39c3c..7615aba07796 100644
--- a/net-im/kopete/distinfo
+++ b/net-im/kopete/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdenetwork-3.5.4.tar.bz2) = 81660b1a73e81b6c01a55861c154dd3b
-SHA256 (KDE/kdenetwork-3.5.4.tar.bz2) = fc6841b1dbe6747dcce6b23406bb2d29793f9029a1084c2372fad44952e82569
-SIZE (KDE/kdenetwork-3.5.4.tar.bz2) = 7526158
+MD5 (KDE/kdenetwork-3.5.5.tar.bz2) = a6e642c070cbd50d4a817f6588bf8e46
+SHA256 (KDE/kdenetwork-3.5.5.tar.bz2) = c3f36e69bbd23902f2bdd9a1a8cda93b0436338ada422bb8ac6bc3d2bcd8e38f
+SIZE (KDE/kdenetwork-3.5.5.tar.bz2) = 9235564
diff --git a/net-im/kopete/files/patch-kopete-jingle b/net-im/kopete/files/patch-kopete-jingle
new file mode 100644
index 000000000000..519a7058332c
--- /dev/null
+++ b/net-im/kopete/files/patch-kopete-jingle
@@ -0,0 +1,449 @@
+--- ./kopete/protocols/jabber/jingle/libjingle/talk/base/criticalsection.h.orig	Mon Mar 20 23:18:37 2006
++++ ./kopete/protocols/jabber/jingle/libjingle/talk/base/criticalsection.h	Thu Apr 20 02:38:21 2006
+@@ -83,8 +83,10 @@
+ public:
+   CriticalSection() {
+     pthread_mutexattr_t mutex_attribute;
++    pthread_mutexattr_init(&mutex_attribute);
+     pthread_mutexattr_settype(&mutex_attribute, PTHREAD_MUTEX_RECURSIVE);
+     pthread_mutex_init(&mutex_, &mutex_attribute);
++    pthread_mutexattr_destroy(&mutex_attribute);
+   }
+   ~CriticalSection() {
+     pthread_mutex_destroy(&mutex_);
+--- kopete/protocols/jabber/jingle/libjingle/talk/base/thread.cc.orig	Tue May  2 11:43:09 2006
++++ kopete/protocols/jabber/jingle/libjingle/talk/base/thread.cc	Tue May  2 11:43:21 2006
+@@ -113,6 +113,7 @@
+   pthread_attr_t attr;
+   pthread_attr_init(&attr);
+   pthread_create(&thread_, &attr, PreLoop, this);
++  pthread_attr_destroy(&attr);
+   started_ = true;
+ }
+ 
+--- kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/Makefile.in.orig	Thu Apr 20 10:32:14 2006
++++ kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/Makefile.in	Thu Apr 20 10:33:01 2006
+@@ -699,7 +699,7 @@
+ 	for dir in "$(DESTDIR)$(bindir)"; do \
+ 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ 	done
+-install: install-am
++install:
+ install-exec: install-exec-am
+ install-data: install-data-am
+ uninstall: uninstall-am
+--- kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc.orig	Wed Feb 22 16:32:44 2006
++++ kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc	Wed Feb 22 16:41:45 2006
+@@ -65,6 +65,7 @@
+   
+   pthread_attr_init(&attr);
+   pthread_create(&thread_, &attr, &thread_function, this);
++  pthread_attr_destroy(&attr);
+ }
+ 
+ LinphoneMediaChannel::~LinphoneMediaChannel() {
+@@ -118,8 +119,8 @@
+   mute_ = !send;
+ }
+ 
+-float LinphoneMediaChannel::GetCurrentQuality() {}
+-int LinphoneMediaChannel::GetOutputLevel() {}
++float LinphoneMediaChannel::GetCurrentQuality() { return 0; }
++int LinphoneMediaChannel::GetOutputLevel() { return 0; }
+ 
+ LinphoneMediaEngine::LinphoneMediaEngine() {}
+ LinphoneMediaEngine::~LinphoneMediaEngine() {}
+@@ -139,7 +140,7 @@
+  
+ #ifdef HAVE_SPEEX
+   ms_speex_codec_init();
+-  rtp_profile_set_payload(&av_profile, 110, &speex_wb);
++  rtp_profile_set_payload(&av_profile, 110, &payload_type_speex_wb);
+   codecs_.push_back(Codec(110, "speex", 8));
+ #endif
+ 
+@@ -149,7 +150,7 @@
+   codecs_.push_back(Codec(102, "iLBC", 4));
+ #endif
+ 
+-  rtp_profile_set_payload(&av_profile, 0, &pcmu8000);
++  rtp_profile_set_payload(&av_profile, 0, &payload_type_pcmu8000);
+   codecs_.push_back(Codec(0, "PCMU", 2));
+   
+ return true;
+@@ -163,8 +164,8 @@
+   return new LinphoneMediaChannel();
+ }
+ 
+-int LinphoneMediaEngine::SetAudioOptions(int options) {}
+-int LinphoneMediaEngine::SetSoundDevices(int wave_in_device, int wave_out_device) {}
++int LinphoneMediaEngine::SetAudioOptions(int options) { return 0; }
++int LinphoneMediaEngine::SetSoundDevices(int wave_in_device, int wave_out_device) { return 0; }
+ 
+-float LinphoneMediaEngine::GetCurrentQuality() {}
+-int LinphoneMediaEngine::GetInputLevel() {}
++float LinphoneMediaEngine::GetCurrentQuality() { return 0; }
++int LinphoneMediaEngine::GetInputLevel() { return 0; }
+--- ./kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc.orig	Mon Mar 20 23:18:35 2006
++++ ./kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc	Thu Apr 20 02:38:21 2006
+@@ -30,6 +30,7 @@
+ // ORTP settings
+ #define MAX_RTP_SIZE 1500 // From mediastreamer
+ 
++#define rtp_session_max_buf_size_set(session, bufsize)	(rtp_session_set_recv_buf_size(session, bufsize))
+ 
+ // -----------------------------------------------------------------------------
+ 
+--- ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/audiostream.c.orig	Mon Mar 20 23:18:36 2006
++++ ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/audiostream.c	Thu Apr 20 02:38:21 2006
+@@ -29,6 +29,8 @@
+ 
+ #define MAX_RTP_SIZE	1500
+ 
++#define rtp_session_max_buf_size_set(session, bufsize)	(rtp_session_set_recv_buf_size(session, bufsize))
++
+ /* this code is not part of the library itself, it is part of the mediastream program */
+ void audio_stream_free(AudioStream *stream)
+ {
+@@ -118,7 +120,8 @@
+ 	if (remport>0) rtp_session_set_remote_addr(rtpr,remip,remport);
+ 	rtp_session_set_scheduling_mode(rtpr,0);
+ 	rtp_session_set_blocking_mode(rtpr,0);
+-	rtp_session_set_payload_type(rtpr,payload);
++	rtp_session_set_send_payload_type(rtpr,payload);
++	rtp_session_set_recv_payload_type(rtpr,payload);
+ 	rtp_session_set_jitter_compensation(rtpr,jitt_comp);
+ 	rtp_session_enable_adaptive_jitter_compensation(rtpr,TRUE);
+ 	/*rtp_session_signal_connect(rtpr,"timestamp_jump",(RtpCallback)on_timestamp_jump,NULL);*/
+@@ -143,7 +146,8 @@
+ 	rtp_session_set_remote_addr(rtps,remip,remport);
+ 	rtp_session_set_scheduling_mode(rtps,0);
+ 	rtp_session_set_blocking_mode(rtps,0);
+-	rtp_session_set_payload_type(rtps,payload);
++	rtp_session_set_send_payload_type(rtps,payload);
++	rtp_session_set_recv_payload_type(rtps,payload);
+ 	rtp_session_set_jitter_compensation(rtps,jitt_comp);
+ 	
+ 	rtpr=rtp_session_new(RTP_SESSION_RECVONLY);
+@@ -158,7 +162,6 @@
+ 	rtp_session_set_blocking_mode(rtpr,0);
+ 	rtp_session_set_payload_type(rtpr,payload);
+ 	rtp_session_set_jitter_compensation(rtpr,jitt_comp);
+-	rtp_session_signal_connect(rtpr,"telephone-event",(RtpCallback)on_dtmf_received,NULL);
+ 	rtp_session_signal_connect(rtpr,"timestamp_jump",(RtpCallback)on_timestamp_jump,NULL);
+ 	*recv=rtpr;
+ 	*send=rtps;
+@@ -179,8 +182,6 @@
+ 	rtp_session_signal_connect(rtpr,"telephone-event",(RtpCallback)on_dtmf_received,(gpointer)stream);
+ 	rtps=rtpr;
+ 	
+-	stream->recv_session = rtpr;
+-	stream->send_session = rtps;
+ 	stream->rtpsend=ms_rtp_send_new();
+ 	ms_rtp_send_set_session(MS_RTP_SEND(stream->rtpsend),rtps);
+ 	stream->rtprecv=ms_rtp_recv_new();
+@@ -192,7 +193,13 @@
+ 	else stream->soundread=ms_read_new(infile);
+ 	if (outfile==NULL) stream->soundwrite=snd_card_create_write_filter(playcard);
+ 	else stream->soundwrite=ms_write_new(outfile);
+-	
++
++	if ((stream->soundread==NULL) || (stream->soundwrite==NULL)){
++		/* big problem: we do not have valid sound input/output */
++		g_error("mediastream.c: No soundcard input/output available.");
++		return NULL;
++	}
++
+ 	/* creates the couple of encoder/decoder */
+ 	pt=rtp_profile_get_payload(profile,payload);
+ 	if (pt==NULL){
+@@ -217,8 +224,8 @@
+ 	ms_filter_set_property(stream->decoder,MS_FILTER_PROPERTY_FREQ,&pt->clock_rate);
+ 	ms_filter_set_property(stream->decoder,MS_FILTER_PROPERTY_BITRATE,&pt->normal_bitrate);
+ 	
+-	ms_filter_set_property(stream->encoder,MS_FILTER_PROPERTY_FMTP, (void*)pt->fmtp);
+-	ms_filter_set_property(stream->decoder,MS_FILTER_PROPERTY_FMTP,(void*)pt->fmtp);
++	ms_filter_set_property(stream->encoder,MS_FILTER_PROPERTY_FMTP,(void*)pt->send_fmtp);
++	ms_filter_set_property(stream->decoder,MS_FILTER_PROPERTY_FMTP,(void*)pt->recv_fmtp);
+ 	/* create the synchronisation source */
+ 	stream->timer=ms_timer_new();
+ 	
+--- ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMdecoder.h.orig	Mon Mar 20 23:18:36 2006
++++ ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMdecoder.h	Thu Apr 20 02:38:21 2006
+@@ -36,7 +36,7 @@
+     /* the MSGSMDecoder derivates from MSFilter, so the MSFilter object MUST be the first of the MSGSMDecoder object
+        in order to the object mechanism to work*/
+     MSFilter filter;
+-    MSFifo *f_inputs[MSGSMDECODER_MAX_INPUTS];
++    MSQueue *q_inputs[MSGSMDECODER_MAX_INPUTS];
+     MSFifo *f_outputs[MSGSMDECODER_MAX_INPUTS];
+     gsm gsm_handle;
+ } MSGSMDecoder;
+--- ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMencoder.h.orig	Mon Mar 20 23:18:36 2006
++++ ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMencoder.h	Thu Apr 20 02:38:21 2006
+@@ -36,7 +36,7 @@
+        in order to the object mechanism to work*/
+     MSFilter filter;
+     MSFifo *f_inputs[MSGSMENCODER_MAX_INPUTS];
+-    MSFifo *f_outputs[MSGSMENCODER_MAX_INPUTS];
++    MSQueue *q_outputs[MSGSMENCODER_MAX_INPUTS];
+     gsm gsm_handle;
+ } MSGSMEncoder;
+ 
+--- ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msbuffer.h.orig	Mon Mar 20 23:18:36 2006
++++ ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msbuffer.h	Thu Apr 20 02:38:21 2006
+@@ -48,11 +48,12 @@
+ struct _MSMessage
+ {
+    MSBuffer *buffer; /* points to a MSBuffer */
+-   void *data;          /*points to buffer->buffer  */
++   char *data;          /*points to buffer->buffer  */
+    guint32 size;   /* the size of the buffer to read in data. It may not be the
+    								physical size (I mean buffer->buffer->size */
+    struct _MSMessage *next;
+    struct _MSMessage *prev;  /* MSMessage are queued into MSQueues */
++   gboolean markbit;
+ };
+ 
+ typedef struct _MSMessage MSMessage;
+--- ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfifo.c.orig	Mon Mar 20 23:18:36 2006
++++ ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfifo.c	Thu Apr 20 02:38:21 2006
+@@ -123,7 +123,7 @@
+ 	/* fix readsize and writesize */
+ 	fifo->readsize-=unwritten;
+ 	fifo->writesize+=unwritten;
+-	fifo->wr_ptr+=written;
++	fifo->wr_ptr=fifo->prev_wr_ptr+written;
+ }
+ 
+ gint ms_fifo_get_write_ptr(MSFifo *fifo, gint bsize, void **ret_ptr)
+--- ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqueue.c.orig	Mon Mar 20 23:18:36 2006
++++ ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqueue.c	Thu Apr 20 02:38:21 2006
+@@ -53,4 +53,7 @@
+    q->size++;
+ }
+ 
++MSMessage *ms_queue_peek_last(MSQueue *q){
++   return q->last;
++}
+ 
+--- ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqueue.h.orig	Mon Mar 20 23:18:36 2006
++++ ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqueue.h	Thu Apr 20 02:38:21 2006
+@@ -41,6 +41,8 @@
+ 
+ void ms_queue_put(MSQueue *q, MSMessage *m);
+ 
++MSMessage *ms_queue_peek_last(MSQueue *q);
++
+ #define ms_queue_can_get(q) ( (q)->size!=0 )
+ 
+ #define ms_queue_destroy(q) g_free(q)
+
+--- ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.h.orig	Thu Mar 16 18:43:05 2006
++++ ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.h	Fri Apr 21 10:56:34 2006
+@@ -34,7 +34,7 @@
+ 
+ #define MSRTPRECV_MAX_OUTPUTS  1 /* max output per filter*/
+ 
+-#define MSRTPRECV_DEF_GRAN 4096 /* the default granularity*/
++#define MSRTPRECV_DEF_GRAN 320	/* the default granularity*/
+ 
+ struct _MSRtpRecv
+ {
+@@ -47,6 +47,8 @@
+ 	RtpSession *rtpsession;
+ 	guint32 prev_ts;
+ 	gint stream_started;
++	gint payload_expected;
++	gboolean ignore;
+ };
+ 
+ typedef struct _MSRtpRecv MSRtpRecv;
+--- ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.c.orig	Mon Mar 20 23:18:36 2006
++++ ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.c	Thu Apr 20 02:38:21 2006
+@@ -85,7 +85,7 @@
+ {
+ 	guint32 clockts;
+ 	/* use the sync system time to compute a timestamp */
+-	PayloadType *pt=rtp_profile_get_payload(r->rtpsession->profile,r->rtpsession->payload_type);
++	PayloadType *pt=rtp_profile_get_payload(r->rtpsession->profile,r->rtpsession->recv_pt);
+ 	g_return_val_if_fail(pt!=NULL,0);
+ 	clockts=(guint32)(((double)synctime * (double)pt->clock_rate)/1000.0);
+ 	ms_trace("ms_rtp_send_process: sync->time=%i clock=%i",synctime,clockts);
+@@ -139,8 +139,9 @@
+ 			ts=get_new_timestamp(r,synctime);
+ 			if (!skip) {
+ 				/*g_message("Sending packet with ts=%u",ts);*/
+-				rtp_session_send_with_ts(r->rtpsession,msg->data,msg->size,ts);
+-				
++				mblk_t *packet=rtp_session_create_packet_with_data(r->rtpsession,msg->data,msg->size,NULL);
++				rtp_set_markbit(packet,msg->markbit);
++				rtp_session_sendm_with_ts(r->rtpsession,packet,ts);
+ 			}
+ 			ms_message_destroy(msg);
+ 		}
+--- ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.h.orig	Fri May  5 23:32:24 2006
++++ ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.h	Fri May  5 23:32:42 2006
+@@ -34,7 +34,7 @@
+ 
+ #define MSRTPSEND_MAX_INPUTS  1 /* max input per filter*/
+ 
+-#define MSRTPSEND_DEF_GRAN  4096/* the default granularity*/
++#define MSRTPSEND_DEF_GRAN 160	/* the default granularity*/
+ 
+ struct _MSRtpSend
+ {
+--- ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.c.orig	Mon Mar 20 23:18:36 2006
++++ ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexdec.c	Thu Apr 20 02:38:22 2006
+@@ -171,6 +171,7 @@
+ void ms_speex_dec_uninit_core(MSSpeexDec *obj)
+ {
+ 	speex_decoder_destroy(obj->speex_state);
++	speex_bits_destroy(&obj->bits);
+ 	obj->initialized=0;
+ }
+ 
+--- ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.c.orig	Mon Mar 20 23:18:36 2006
++++ ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msspeexenc.c	Thu Apr 20 02:38:22 2006
+@@ -157,6 +157,7 @@
+ {
+ 	if (obj->initialized){
+ 		speex_encoder_destroy(obj->speex_state);
++		speex_bits_destroy(&obj->bits);
+ 		obj->initialized=0;
+ 	}
+ }
+--- ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssync.c.orig	Mon Mar 20 23:18:36 2006
++++ ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssync.c	Thu Apr 20 02:38:22 2006
+@@ -189,5 +189,6 @@
+ 	g_mutex_free(sync->lock);
+ 	g_cond_free(sync->thread_cond);
+ 	g_cond_free(sync->stop_cond);
++	return 0;
+ }
+ 
+--- ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstimer.c.orig	Mon Mar 20 23:18:36 2006
++++ ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstimer.c	Thu Apr 20 02:38:22 2006
+@@ -66,6 +66,8 @@
+ 	else {
+ 		gint32 diff,time;
+ 		struct timeval tv,cur;
++
++		timer->sync.time+=timer->milisec;
+ 	
+ 		gettimeofday(&cur,NULL);
+ 		time=((cur.tv_usec-timer->orig.tv_usec)/1000 ) + ((cur.tv_sec-timer->orig.tv_sec)*1000 );
+@@ -74,14 +76,13 @@
+ 		}
+ 		while((diff = timer->sync.time-time) > 0)
+ 		{
+-			tv.tv_sec = diff/1000;
+-			tv.tv_usec = (diff%1000)*1000;
++			tv.tv_sec = timer->milisec/1000;
++			tv.tv_usec = (timer->milisec%1000)*1000;
+ 			select(0,NULL,NULL,NULL,&tv);
+ 			gettimeofday(&cur,NULL);
+ 			time=((cur.tv_usec-timer->orig.tv_usec)/1000 ) + ((cur.tv_sec-timer->orig.tv_sec)*1000 );
+ 		}
+ 	}
+-	timer->sync.time+=timer->milisec;
+ 	return;
+ }
+ 
+--- ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/osscard.c.orig	Mon Mar 20 23:18:36 2006
++++ ./kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/osscard.c	Thu Apr 20 02:38:22 2006
+@@ -342,7 +342,7 @@
+ {
+ 	int p=0,mix_fd;
+ 	int osscmd;
+-	g_return_if_fail(obj->mixdev_name!=NULL);
++	g_return_val_if_fail(obj->mixdev_name!=NULL,-1);
+ #ifdef HAVE_SYS_SOUNDCARD_H
+ 	switch(way){
+ 		case SND_CARD_LEVEL_GENERAL:
+--- kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslplainmechanism.h.orig	Wed May 10 07:43:35 2006
++++ kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslplainmechanism.h	Wed May 10 07:44:01 2006
+@@ -48,7 +48,7 @@
+ 
+     FormatXmppPassword credential;
+     credential.Append("\0", 1);
+-    credential.Append(user_jid_.Str());
++    credential.Append(user_jid_.node());
+     credential.Append("\0", 1);
+     credential.Append(&password_);
+     el->AddText(Base64EncodeFromArray(credential.GetData(), credential.GetLength()));
+--- kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.c.orig	Sun Oct  1 19:26:45 2006
++++ kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.c	Mon Dec 18 16:26:36 2006
+@@ -26,7 +26,7 @@
+ MSMessage *msgb_2_ms_message(mblk_t* mp){
+ 	MSMessage *msg;
+ 	MSBuffer *msbuf;
+-	if (mp->b_datap->ref_count!=1) return NULL; /* cannot handle properly non-unique buffers*/
++	if (mp->b_datap->db_ref!=1) return NULL; /* cannot handle properly non-unique buffers*/
+ 	/* create a MSBuffer using the mblk_t buffer */
+ 	msg=ms_message_alloc();
+ 	msbuf=ms_buffer_alloc(0);
+@@ -70,6 +70,8 @@
+ 	memset(r->q_outputs,0,sizeof(MSFifo*)*MSRTPRECV_MAX_OUTPUTS);
+ 	r->rtpsession=NULL;
+ 	r->stream_started=0;
++	r->ignore=FALSE;
++	r->payload_expected=0;
+ }
+ 
+ void ms_rtp_recv_class_init(MSRtpRecvClass *klass)
+@@ -120,7 +122,7 @@
+ 		gint got=0;
+ 		/* we are connected with queues (surely for video)*/
+ 		/* use the sync system time to compute a timestamp */
+-		PayloadType *pt=rtp_profile_get_payload(r->rtpsession->profile,r->rtpsession->payload_type);
++		PayloadType *pt=rtp_profile_get_payload(r->rtpsession->profile,r->rtpsession->send_pt);
+ 		if (pt==NULL) {
+ 			ms_warning("ms_rtp_recv_process(): NULL RtpPayload- skipping.");
+ 			return;
+@@ -134,10 +136,16 @@
+ 			/*g_message("Got packet with timestamp %u",clock);*/
+ 			got++;
+ 			r->stream_started=1;
+-			mdata=mp->b_cont;
+-			freeb(mp);
+-			msg=msgb_2_ms_message(mdata);
+-			ms_queue_put(qo,msg);
++			if (!r->ignore){
++				gboolean markbit=((rtp_header_t*)mp->b_rptr)->markbit;
++				mdata=mp->b_cont;
++				freeb(mp);
++				msg=msgb_2_ms_message(mdata);
++				msg->markbit=markbit;   
++				ms_queue_put(qo,msg);
++			}else{
++				freemsg(mp);
++			}
+ 		}
+ 	}
+ }
+@@ -147,10 +155,24 @@
+ 	g_free(obj);
+ }
+ 
++static void __payload_type_changed(RtpSession *session,MSRtpRecv *obj){
++	int pt_num=rtp_session_get_recv_payload_type(session);
++	PayloadType *pt=rtp_profile_get_payload(rtp_session_get_profile(session),pt_num);
++	if (pt==NULL){
++		/* sip phone should ignore payload types they don't understand */
++		g_warning("Ignoring payload type %i",pt_num);
++		obj->ignore=TRUE;
++	}else{
++		if (obj->ignore) g_warning("payload type is coming back to something known");
++		obj->ignore=FALSE;
++	}
++}
++
+ RtpSession * ms_rtp_recv_set_session(MSRtpRecv *obj,RtpSession *session)
+ {
+ 	RtpSession *old=obj->rtpsession;
+ 	obj->rtpsession=session;
++	rtp_session_signal_connect(session,"payload_type_changed",(RtpCallback)__payload_type_changed,(unsigned long)obj);
+ 	obj->prev_ts=0;
+ 	return old;
+ }
diff --git a/net-im/kopete/files/patch-kopete_protocols_oscar_liboscar-oscartypes.h b/net-im/kopete/files/patch-kopete_protocols_oscar_liboscar-oscartypes.h
deleted file mode 100644
index 98cf48d8dd43..000000000000
--- a/net-im/kopete/files/patch-kopete_protocols_oscar_liboscar-oscartypes.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- kopete/protocols/oscar/liboscar/oscartypes.h.orig	Tue Aug 15 18:44:35 2006
-+++ kopete/protocols/oscar/liboscar/oscartypes.h	Tue Aug 15 18:45:06 2006
-@@ -237,7 +237,7 @@
- 	const WORD ICQ_MAJOR 			= 0x0014;
- 	const WORD ICQ_MINOR 			= 0x0034;
- 	const WORD ICQ_POINT 			= 0x0000;
--	const WORD ICQ_BUILD 			= 0x0A0F;
-+	const WORD ICQ_BUILD 			= 0x0BB8;
- 	const char ICQ_OTHER[] 			= { 0x00, 0x00, 0x04, 0x3d };
- 	const char ICQ_COUNTRY[] 		= "us";
- 	const char ICQ_LANG[] 			= "en";
diff --git a/net-im/kopete/pkg-plist b/net-im/kopete/pkg-plist
index bba9565d24b8..e6b076161a67 100644
--- a/net-im/kopete/pkg-plist
+++ b/net-im/kopete/pkg-plist
@@ -1,5 +1,7 @@
 bin/kopete
 bin/kopete_latexconvert.sh
+bin/winpopup-install.sh
+bin/winpopup-send.sh
 include/kopete/kabcpersistence.h
 include/kopete/kopete_export.h
 include/kopete/kopeteaccount.h
@@ -29,17 +31,19 @@ include/kopete/kopeteonlinestatus.h
 include/kopete/kopeteonlinestatusmanager.h
 include/kopete/kopetepassword.h
 include/kopete/kopetepasswordedaccount.h
+include/kopete/kopetepicture.h
 include/kopete/kopeteplugin.h
+include/kopete/kopeteprefs.h
 include/kopete/kopeteprotocol.h
 include/kopete/kopetesimplemessagehandler.h
 include/kopete/kopetetask.h
 include/kopete/kopetetransfermanager.h
 include/kopete/kopeteuiglobal.h
 include/kopete/kopeteversion.h
-include/kopete/kopetexsl.h
 include/kopete/managedconnectionaccount.h
 include/kopete/ui/accountselector.h
 include/kopete/ui/addcontactpage.h
+include/kopete/ui/addressbooklinkwidget.h
 include/kopete/ui/addressbookselectordialog.h
 include/kopete/ui/addressbookselectorwidget.h
 include/kopete/ui/editaccountwidget.h
@@ -57,6 +61,7 @@ include/kopete/ui/kopetestdaction.h
 include/kopete/ui/kopeteview.h
 include/kopete/ui/kopeteviewplugin.h
 include/kopete/ui/userinfodialog.h
+include/kopete/webcamwidget.h
 lib/kconf_update_bin/kopete-account-kconf_update
 lib/kconf_update_bin/kopete-nameTracking-kconf_update
 lib/kconf_update_bin/kopete-pluginloader2-kconf_update
@@ -177,9 +182,6 @@ lib/kde3/kopete_netmeeting.so
 lib/kde3/kopete_nowlistening.a
 lib/kde3/kopete_nowlistening.la
 lib/kde3/kopete_nowlistening.so
-lib/kde3/kopete_sms.a
-lib/kde3/kopete_sms.la
-lib/kde3/kopete_sms.so
 lib/kde3/kopete_statistics.a
 lib/kde3/kopete_statistics.la
 lib/kde3/kopete_statistics.so
@@ -195,6 +197,9 @@ lib/kde3/kopete_translator.so
 lib/kde3/kopete_webpresence.a
 lib/kde3/kopete_webpresence.la
 lib/kde3/kopete_webpresence.so
+lib/kde3/kopete_wp.a
+lib/kde3/kopete_wp.la
+lib/kde3/kopete_wp.so
 lib/kde3/kopete_yahoo.a
 lib/kde3/kopete_yahoo.la
 lib/kde3/kopete_yahoo.so
@@ -235,21 +240,13 @@ share/apps/kopete/icons/crystalsvg/128x128/apps/aim_protocol.png
 share/apps/kopete/icons/crystalsvg/128x128/apps/icq_protocol.png
 share/apps/kopete/icons/crystalsvg/128x128/apps/kopete_avdevice.png
 share/apps/kopete/icons/crystalsvg/128x128/apps/msn_protocol.png
-share/apps/kopete/icons/crystalsvg/128x128/apps/sms_protocol.png
 share/apps/kopete/icons/crystalsvg/128x128/apps/testbed_protocol.png
+share/apps/kopete/icons/crystalsvg/128x128/apps/wp_protocol.png
 share/apps/kopete/icons/crystalsvg/128x128/apps/yahoo_protocol.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/account_offline_overlay.png
 share/apps/kopete/icons/crystalsvg/16x16/actions/aim_away.png
 share/apps/kopete/icons/crystalsvg/16x16/actions/aim_connecting.mng
 share/apps/kopete/icons/crystalsvg/16x16/actions/aim_offline.png
 share/apps/kopete/icons/crystalsvg/16x16/actions/aim_online.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/contact_away_overlay.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/contact_busy_overlay.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/contact_food_overlay.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/contact_invisible_overlay.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/contact_phone_overlay.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/contact_xa_overlay.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/emoticon.png
 share/apps/kopete/icons/crystalsvg/16x16/actions/gg_away.png
 share/apps/kopete/icons/crystalsvg/16x16/actions/gg_busy.png
 share/apps/kopete/icons/crystalsvg/16x16/actions/gg_busy_d.png
@@ -285,29 +282,10 @@ share/apps/kopete/icons/crystalsvg/16x16/actions/irc_online.png
 share/apps/kopete/icons/crystalsvg/16x16/actions/irc_op.png
 share/apps/kopete/icons/crystalsvg/16x16/actions/irc_server.png
 share/apps/kopete/icons/crystalsvg/16x16/actions/irc_voice.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_away.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_chatty.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_connecting.mng
-share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_group.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_invisible.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_na.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_offline.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_online.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_original.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_raw.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_serv_off.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_serv_on.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_xa.png
 share/apps/kopete/icons/crystalsvg/16x16/actions/kgpg_key1.png
 share/apps/kopete/icons/crystalsvg/16x16/actions/kgpg_key2.png
 share/apps/kopete/icons/crystalsvg/16x16/actions/kgpg_key3.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/kopeteavailable.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/kopeteaway.png
 share/apps/kopete/icons/crystalsvg/16x16/actions/logging.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/metacontact_away.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/metacontact_offline.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/metacontact_online.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/metacontact_unknown.png
 share/apps/kopete/icons/crystalsvg/16x16/actions/msn_away.png
 share/apps/kopete/icons/crystalsvg/16x16/actions/msn_blocked.png
 share/apps/kopete/icons/crystalsvg/16x16/actions/msn_brb.png
@@ -320,41 +298,30 @@ share/apps/kopete/icons/crystalsvg/16x16/actions/msn_newmsg.png
 share/apps/kopete/icons/crystalsvg/16x16/actions/msn_offline.png
 share/apps/kopete/icons/crystalsvg/16x16/actions/msn_online.png
 share/apps/kopete/icons/crystalsvg/16x16/actions/msn_phone.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/newmsg.png
-share/apps/kopete/icons/crystalsvg/16x16/actions/status_unknown.png
+share/apps/kopete/icons/crystalsvg/16x16/actions/wp_away.png
 share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_away.png
 share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_busy.png
 share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_connecting.mng
 share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_idle.png
 share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_invisible.png
 share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_mobile.png
+share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_stealthed.png
 share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_tea.png
 share/apps/kopete/icons/crystalsvg/16x16/apps/aim_protocol.png
 share/apps/kopete/icons/crystalsvg/16x16/apps/gadu_protocol.png
 share/apps/kopete/icons/crystalsvg/16x16/apps/groupwise_protocol.png
 share/apps/kopete/icons/crystalsvg/16x16/apps/icq_protocol.png
 share/apps/kopete/icons/crystalsvg/16x16/apps/irc_protocol.png
-share/apps/kopete/icons/crystalsvg/16x16/apps/jabber_protocol.png
 share/apps/kopete/icons/crystalsvg/16x16/apps/msn_protocol.png
-share/apps/kopete/icons/crystalsvg/16x16/apps/sms_protocol.png
 share/apps/kopete/icons/crystalsvg/16x16/apps/testbed_protocol.png
+share/apps/kopete/icons/crystalsvg/16x16/apps/wp_protocol.png
 share/apps/kopete/icons/crystalsvg/16x16/apps/yahoo_protocol.png
-share/apps/kopete/icons/crystalsvg/22x22/actions/account_offline_overlay.png
-share/apps/kopete/icons/crystalsvg/22x22/actions/kopeteavailable.png
-share/apps/kopete/icons/crystalsvg/22x22/actions/kopeteaway.png
 share/apps/kopete/icons/crystalsvg/22x22/actions/logging.png
+share/apps/kopete/icons/crystalsvg/22x22/actions/yahoo_stealthed.png
 share/apps/kopete/icons/crystalsvg/22x22/apps/groupwise_protocol.png
 share/apps/kopete/icons/crystalsvg/22x22/apps/kopete_avdevice.png
-share/apps/kopete/icons/crystalsvg/32x32/actions/account_offline_overlay.png
-share/apps/kopete/icons/crystalsvg/32x32/actions/kopeteavailable.png
-share/apps/kopete/icons/crystalsvg/32x32/actions/kopeteaway.png
 share/apps/kopete/icons/crystalsvg/32x32/actions/logging.png
-share/apps/kopete/icons/crystalsvg/32x32/actions/metacontact_away.png
-share/apps/kopete/icons/crystalsvg/32x32/actions/metacontact_offline.png
-share/apps/kopete/icons/crystalsvg/32x32/actions/metacontact_online.png
-share/apps/kopete/icons/crystalsvg/32x32/actions/metacontact_unknown.png
-share/apps/kopete/icons/crystalsvg/32x32/actions/newmessage.mng
-share/apps/kopete/icons/crystalsvg/32x32/actions/newmsg.png
+share/apps/kopete/icons/crystalsvg/32x32/actions/yahoo_stealthed.png
 share/apps/kopete/icons/crystalsvg/32x32/apps/aim_protocol.png
 share/apps/kopete/icons/crystalsvg/32x32/apps/autoreplace.png
 share/apps/kopete/icons/crystalsvg/32x32/apps/gadu_protocol.png
@@ -362,27 +329,20 @@ share/apps/kopete/icons/crystalsvg/32x32/apps/groupwise_protocol.png
 share/apps/kopete/icons/crystalsvg/32x32/apps/highlight.png
 share/apps/kopete/icons/crystalsvg/32x32/apps/icq_protocol.png
 share/apps/kopete/icons/crystalsvg/32x32/apps/irc_protocol.png
-share/apps/kopete/icons/crystalsvg/32x32/apps/jabber_protocol.png
 share/apps/kopete/icons/crystalsvg/32x32/apps/kopete_avdevice.png
 share/apps/kopete/icons/crystalsvg/32x32/apps/latex.png
 share/apps/kopete/icons/crystalsvg/32x32/apps/msn_protocol.png
-share/apps/kopete/icons/crystalsvg/32x32/apps/sms_protocol.png
 share/apps/kopete/icons/crystalsvg/32x32/apps/testbed_protocol.png
 share/apps/kopete/icons/crystalsvg/32x32/apps/texteffect.png
+share/apps/kopete/icons/crystalsvg/32x32/apps/wp_protocol.png
 share/apps/kopete/icons/crystalsvg/32x32/apps/yahoo_protocol.png
-share/apps/kopete/icons/crystalsvg/48x48/actions/kopeteavailable.png
-share/apps/kopete/icons/crystalsvg/48x48/actions/kopeteaway.png
 share/apps/kopete/icons/crystalsvg/48x48/actions/logging.png
-share/apps/kopete/icons/crystalsvg/48x48/actions/metacontact_away.png
-share/apps/kopete/icons/crystalsvg/48x48/actions/metacontact_offline.png
-share/apps/kopete/icons/crystalsvg/48x48/actions/metacontact_online.png
 share/apps/kopete/icons/crystalsvg/48x48/apps/aim_protocol.png
 share/apps/kopete/icons/crystalsvg/48x48/apps/groupwise_protocol.png
 share/apps/kopete/icons/crystalsvg/48x48/apps/icq_protocol.png
-share/apps/kopete/icons/crystalsvg/48x48/apps/jabber_protocol.png
 share/apps/kopete/icons/crystalsvg/48x48/apps/msn_protocol.png
-share/apps/kopete/icons/crystalsvg/48x48/apps/sms_protocol.png
 share/apps/kopete/icons/crystalsvg/48x48/apps/testbed_protocol.png
+share/apps/kopete/icons/crystalsvg/48x48/apps/wp_protocol.png
 share/apps/kopete/icons/crystalsvg/48x48/apps/yahoo_protocol.png
 share/apps/kopete/icons/crystalsvg/64x64/actions/logging.png
 share/apps/kopete/icons/crystalsvg/64x64/apps/aim_protocol.png
@@ -390,15 +350,13 @@ share/apps/kopete/icons/crystalsvg/64x64/apps/groupwise_protocol.png
 share/apps/kopete/icons/crystalsvg/64x64/apps/icq_protocol.png
 share/apps/kopete/icons/crystalsvg/64x64/apps/kopete_avdevice.png
 share/apps/kopete/icons/crystalsvg/64x64/apps/msn_protocol.png
-share/apps/kopete/icons/crystalsvg/64x64/apps/sms_protocol.png
 share/apps/kopete/icons/crystalsvg/64x64/apps/testbed_protocol.png
+share/apps/kopete/icons/crystalsvg/64x64/apps/wp_protocol.png
 share/apps/kopete/icons/crystalsvg/64x64/apps/yahoo_protocol.png
-share/apps/kopete/icons/crystalsvg/scalable/actions/account_offline_overlay.svgz
 share/apps/kopete/icons/hicolor/16x16/actions/aim_away.png
 share/apps/kopete/icons/hicolor/16x16/actions/aim_connecting.mng
 share/apps/kopete/icons/hicolor/16x16/actions/aim_offline.png
 share/apps/kopete/icons/hicolor/16x16/actions/aim_online.png
-share/apps/kopete/icons/hicolor/16x16/actions/emoticon.png
 share/apps/kopete/icons/hicolor/16x16/actions/icq_away.png
 share/apps/kopete/icons/hicolor/16x16/actions/icq_connecting.mng
 share/apps/kopete/icons/hicolor/16x16/actions/icq_dnd.png
@@ -408,37 +366,10 @@ share/apps/kopete/icons/hicolor/16x16/actions/icq_na.png
 share/apps/kopete/icons/hicolor/16x16/actions/icq_occupied.png
 share/apps/kopete/icons/hicolor/16x16/actions/icq_offline.png
 share/apps/kopete/icons/hicolor/16x16/actions/icq_online.png
-share/apps/kopete/icons/hicolor/16x16/actions/jabber_away.png
-share/apps/kopete/icons/hicolor/16x16/actions/jabber_chatty.png
-share/apps/kopete/icons/hicolor/16x16/actions/jabber_connecting.mng
-share/apps/kopete/icons/hicolor/16x16/actions/jabber_group.png
-share/apps/kopete/icons/hicolor/16x16/actions/jabber_invisible.png
-share/apps/kopete/icons/hicolor/16x16/actions/jabber_na.png
-share/apps/kopete/icons/hicolor/16x16/actions/jabber_offline.png
-share/apps/kopete/icons/hicolor/16x16/actions/jabber_online.png
-share/apps/kopete/icons/hicolor/16x16/actions/jabber_original.png
-share/apps/kopete/icons/hicolor/16x16/actions/jabber_raw.png
-share/apps/kopete/icons/hicolor/16x16/actions/jabber_serv_off.png
-share/apps/kopete/icons/hicolor/16x16/actions/jabber_serv_on.png
-share/apps/kopete/icons/hicolor/16x16/actions/jabber_xa.png
-share/apps/kopete/icons/hicolor/16x16/actions/kopeteavailable.png
-share/apps/kopete/icons/hicolor/16x16/actions/kopeteaway.png
-share/apps/kopete/icons/hicolor/16x16/actions/newmsg.png
-share/apps/kopete/icons/hicolor/16x16/actions/status_unknown.png
 share/apps/kopete/icons/hicolor/16x16/apps/aim_protocol.png
 share/apps/kopete/icons/hicolor/16x16/apps/icq_protocol.png
-share/apps/kopete/icons/hicolor/16x16/apps/jabber_protocol.png
-share/apps/kopete/icons/hicolor/22x22/actions/kopeteavailable.png
-share/apps/kopete/icons/hicolor/22x22/actions/kopeteaway.png
-share/apps/kopete/icons/hicolor/32x32/actions/kopeteavailable.png
-share/apps/kopete/icons/hicolor/32x32/actions/kopeteaway.png
-share/apps/kopete/icons/hicolor/32x32/actions/newmessage.mng
 share/apps/kopete/icons/hicolor/32x32/apps/aim_protocol.png
 share/apps/kopete/icons/hicolor/32x32/apps/icq_protocol.png
-share/apps/kopete/icons/hicolor/32x32/apps/jabber_protocol.png
-share/apps/kopete/icons/hicolor/48x48/actions/kopeteavailable.png
-share/apps/kopete/icons/hicolor/48x48/actions/kopeteaway.png
-share/apps/kopete/icons/hicolor/48x48/apps/jabber_protocol.png
 share/apps/kopete/ircchatui.rc
 share/apps/kopete/ircnetworks.xml
 share/apps/kopete/kopetechatwindow.rc
@@ -451,341 +382,158 @@ share/apps/kopete/pics/statistics/black.png
 share/apps/kopete/pics/statistics/blue.png
 share/apps/kopete/pics/statistics/gray.png
 share/apps/kopete/pics/statistics/navy.png
-share/apps/kopete/styles/Adium.xsl
-share/apps/kopete/styles/Enclosed.xsl
-share/apps/kopete/styles/Gaim.xsl
-share/apps/kopete/styles/Keramik.xsl
-share/apps/kopete/styles/Konsole.xsl
-share/apps/kopete/styles/Kopete-old.xsl
-share/apps/kopete/styles/Kopete.xsl
-share/apps/kopete/styles/MSN.xsl
-share/apps/kopete/styles/Minimal.xsl
-share/apps/kopete/styles/XChat.xsl
-share/apps/kopete/styles/data/Adium/adium.js
-share/apps/kopete/styles/data/Kopete/action.png
-share/apps/kopete/styles/data/Kopete/important.png
-share/apps/kopete/styles/data/Kopete/system.png
-share/apps/kopete/styles/data/iChat-Trans/blue/From/bl.png
-share/apps/kopete/styles/data/iChat-Trans/blue/From/bm.png
-share/apps/kopete/styles/data/iChat-Trans/blue/From/br.png
-share/apps/kopete/styles/data/iChat-Trans/blue/From/ml.png
-share/apps/kopete/styles/data/iChat-Trans/blue/From/mm.png
-share/apps/kopete/styles/data/iChat-Trans/blue/From/mr.png
-share/apps/kopete/styles/data/iChat-Trans/blue/From/tl.png
-share/apps/kopete/styles/data/iChat-Trans/blue/From/tm.png
-share/apps/kopete/styles/data/iChat-Trans/blue/From/tr.png
-share/apps/kopete/styles/data/iChat-Trans/blue/To/bl.png
-share/apps/kopete/styles/data/iChat-Trans/blue/To/bm.png
-share/apps/kopete/styles/data/iChat-Trans/blue/To/br.png
-share/apps/kopete/styles/data/iChat-Trans/blue/To/ml.png
-share/apps/kopete/styles/data/iChat-Trans/blue/To/mm.png
-share/apps/kopete/styles/data/iChat-Trans/blue/To/mr.png
-share/apps/kopete/styles/data/iChat-Trans/blue/To/tl.png
-share/apps/kopete/styles/data/iChat-Trans/blue/To/tm.png
-share/apps/kopete/styles/data/iChat-Trans/blue/To/tr.png
-share/apps/kopete/styles/data/iChat-Trans/blue/me.png
-share/apps/kopete/styles/data/iChat-Trans/blue/them.png
-share/apps/kopete/styles/data/iChat-Trans/clear/From/bl.png
-share/apps/kopete/styles/data/iChat-Trans/clear/From/bm.png
-share/apps/kopete/styles/data/iChat-Trans/clear/From/br.png
-share/apps/kopete/styles/data/iChat-Trans/clear/From/ml.png
-share/apps/kopete/styles/data/iChat-Trans/clear/From/mm.png
-share/apps/kopete/styles/data/iChat-Trans/clear/From/mr.png
-share/apps/kopete/styles/data/iChat-Trans/clear/From/tl.png
-share/apps/kopete/styles/data/iChat-Trans/clear/From/tm.png
-share/apps/kopete/styles/data/iChat-Trans/clear/From/tr.png
-share/apps/kopete/styles/data/iChat-Trans/clear/To/bl.png
-share/apps/kopete/styles/data/iChat-Trans/clear/To/bm.png
-share/apps/kopete/styles/data/iChat-Trans/clear/To/br.png
-share/apps/kopete/styles/data/iChat-Trans/clear/To/ml.png
-share/apps/kopete/styles/data/iChat-Trans/clear/To/mm.png
-share/apps/kopete/styles/data/iChat-Trans/clear/To/mr.png
-share/apps/kopete/styles/data/iChat-Trans/clear/To/tl.png
-share/apps/kopete/styles/data/iChat-Trans/clear/To/tm.png
-share/apps/kopete/styles/data/iChat-Trans/clear/To/tr.png
-share/apps/kopete/styles/data/iChat-Trans/clear/me.png
-share/apps/kopete/styles/data/iChat-Trans/clear/them.png
-share/apps/kopete/styles/data/iChat-Trans/graphite/From/bl.png
-share/apps/kopete/styles/data/iChat-Trans/graphite/From/bm.png
-share/apps/kopete/styles/data/iChat-Trans/graphite/From/br.png
-share/apps/kopete/styles/data/iChat-Trans/graphite/From/ml.png
-share/apps/kopete/styles/data/iChat-Trans/graphite/From/mm.png
-share/apps/kopete/styles/data/iChat-Trans/graphite/From/mr.png
-share/apps/kopete/styles/data/iChat-Trans/graphite/From/tl.png
-share/apps/kopete/styles/data/iChat-Trans/graphite/From/tm.png
-share/apps/kopete/styles/data/iChat-Trans/graphite/From/tr.png
-share/apps/kopete/styles/data/iChat-Trans/graphite/To/bl.png
-share/apps/kopete/styles/data/iChat-Trans/graphite/To/bm.png
-share/apps/kopete/styles/data/iChat-Trans/graphite/To/br.png
-share/apps/kopete/styles/data/iChat-Trans/graphite/To/ml.png
-share/apps/kopete/styles/data/iChat-Trans/graphite/To/mm.png
-share/apps/kopete/styles/data/iChat-Trans/graphite/To/mr.png
-share/apps/kopete/styles/data/iChat-Trans/graphite/To/tl.png
-share/apps/kopete/styles/data/iChat-Trans/graphite/To/tm.png
-share/apps/kopete/styles/data/iChat-Trans/graphite/To/tr.png
-share/apps/kopete/styles/data/iChat-Trans/graphite/me.png
-share/apps/kopete/styles/data/iChat-Trans/graphite/them.png
-share/apps/kopete/styles/data/iChat-Trans/green/From/bl.png
-share/apps/kopete/styles/data/iChat-Trans/green/From/bm.png
-share/apps/kopete/styles/data/iChat-Trans/green/From/br.png
-share/apps/kopete/styles/data/iChat-Trans/green/From/ml.png
-share/apps/kopete/styles/data/iChat-Trans/green/From/mm.png
-share/apps/kopete/styles/data/iChat-Trans/green/From/mr.png
-share/apps/kopete/styles/data/iChat-Trans/green/From/tl.png
-share/apps/kopete/styles/data/iChat-Trans/green/From/tm.png
-share/apps/kopete/styles/data/iChat-Trans/green/From/tr.png
-share/apps/kopete/styles/data/iChat-Trans/green/To/bl.png
-share/apps/kopete/styles/data/iChat-Trans/green/To/bm.png
-share/apps/kopete/styles/data/iChat-Trans/green/To/br.png
-share/apps/kopete/styles/data/iChat-Trans/green/To/ml.png
-share/apps/kopete/styles/data/iChat-Trans/green/To/mm.png
-share/apps/kopete/styles/data/iChat-Trans/green/To/mr.png
-share/apps/kopete/styles/data/iChat-Trans/green/To/tl.png
-share/apps/kopete/styles/data/iChat-Trans/green/To/tm.png
-share/apps/kopete/styles/data/iChat-Trans/green/To/tr.png
-share/apps/kopete/styles/data/iChat-Trans/green/me.png
-share/apps/kopete/styles/data/iChat-Trans/green/them.png
-share/apps/kopete/styles/data/iChat-Trans/orange/From/bl.png
-share/apps/kopete/styles/data/iChat-Trans/orange/From/bm.png
-share/apps/kopete/styles/data/iChat-Trans/orange/From/br.png
-share/apps/kopete/styles/data/iChat-Trans/orange/From/ml.png
-share/apps/kopete/styles/data/iChat-Trans/orange/From/mm.png
-share/apps/kopete/styles/data/iChat-Trans/orange/From/mr.png
-share/apps/kopete/styles/data/iChat-Trans/orange/From/tl.png
-share/apps/kopete/styles/data/iChat-Trans/orange/From/tm.png
-share/apps/kopete/styles/data/iChat-Trans/orange/From/tr.png
-share/apps/kopete/styles/data/iChat-Trans/orange/To/bl.png
-share/apps/kopete/styles/data/iChat-Trans/orange/To/bm.png
-share/apps/kopete/styles/data/iChat-Trans/orange/To/br.png
-share/apps/kopete/styles/data/iChat-Trans/orange/To/ml.png
-share/apps/kopete/styles/data/iChat-Trans/orange/To/mm.png
-share/apps/kopete/styles/data/iChat-Trans/orange/To/mr.png
-share/apps/kopete/styles/data/iChat-Trans/orange/To/tl.png
-share/apps/kopete/styles/data/iChat-Trans/orange/To/tm.png
-share/apps/kopete/styles/data/iChat-Trans/orange/To/tr.png
-share/apps/kopete/styles/data/iChat-Trans/orange/me.png
-share/apps/kopete/styles/data/iChat-Trans/orange/them.png
-share/apps/kopete/styles/data/iChat-Trans/pink/From/bl.png
-share/apps/kopete/styles/data/iChat-Trans/pink/From/bm.png
-share/apps/kopete/styles/data/iChat-Trans/pink/From/br.png
-share/apps/kopete/styles/data/iChat-Trans/pink/From/ml.png
-share/apps/kopete/styles/data/iChat-Trans/pink/From/mm.png
-share/apps/kopete/styles/data/iChat-Trans/pink/From/mr.png
-share/apps/kopete/styles/data/iChat-Trans/pink/From/tl.png
-share/apps/kopete/styles/data/iChat-Trans/pink/From/tm.png
-share/apps/kopete/styles/data/iChat-Trans/pink/From/tr.png
-share/apps/kopete/styles/data/iChat-Trans/pink/To/bl.png
-share/apps/kopete/styles/data/iChat-Trans/pink/To/bm.png
-share/apps/kopete/styles/data/iChat-Trans/pink/To/br.png
-share/apps/kopete/styles/data/iChat-Trans/pink/To/ml.png
-share/apps/kopete/styles/data/iChat-Trans/pink/To/mm.png
-share/apps/kopete/styles/data/iChat-Trans/pink/To/mr.png
-share/apps/kopete/styles/data/iChat-Trans/pink/To/tl.png
-share/apps/kopete/styles/data/iChat-Trans/pink/To/tm.png
-share/apps/kopete/styles/data/iChat-Trans/pink/To/tr.png
-share/apps/kopete/styles/data/iChat-Trans/pink/me.png
-share/apps/kopete/styles/data/iChat-Trans/pink/them.png
-share/apps/kopete/styles/data/iChat-Trans/purple/From/bl.png
-share/apps/kopete/styles/data/iChat-Trans/purple/From/bm.png
-share/apps/kopete/styles/data/iChat-Trans/purple/From/br.png
-share/apps/kopete/styles/data/iChat-Trans/purple/From/ml.png
-share/apps/kopete/styles/data/iChat-Trans/purple/From/mm.png
-share/apps/kopete/styles/data/iChat-Trans/purple/From/mr.png
-share/apps/kopete/styles/data/iChat-Trans/purple/From/tl.png
-share/apps/kopete/styles/data/iChat-Trans/purple/From/tm.png
-share/apps/kopete/styles/data/iChat-Trans/purple/From/tr.png
-share/apps/kopete/styles/data/iChat-Trans/purple/To/bl.png
-share/apps/kopete/styles/data/iChat-Trans/purple/To/bm.png
-share/apps/kopete/styles/data/iChat-Trans/purple/To/br.png
-share/apps/kopete/styles/data/iChat-Trans/purple/To/ml.png
-share/apps/kopete/styles/data/iChat-Trans/purple/To/mm.png
-share/apps/kopete/styles/data/iChat-Trans/purple/To/mr.png
-share/apps/kopete/styles/data/iChat-Trans/purple/To/tl.png
-share/apps/kopete/styles/data/iChat-Trans/purple/To/tm.png
-share/apps/kopete/styles/data/iChat-Trans/purple/To/tr.png
-share/apps/kopete/styles/data/iChat-Trans/purple/me.png
-share/apps/kopete/styles/data/iChat-Trans/purple/them.png
-share/apps/kopete/styles/data/iChat-Trans/yellow/From/bl.png
-share/apps/kopete/styles/data/iChat-Trans/yellow/From/bm.png
-share/apps/kopete/styles/data/iChat-Trans/yellow/From/br.png
-share/apps/kopete/styles/data/iChat-Trans/yellow/From/ml.png
-share/apps/kopete/styles/data/iChat-Trans/yellow/From/mm.png
-share/apps/kopete/styles/data/iChat-Trans/yellow/From/mr.png
-share/apps/kopete/styles/data/iChat-Trans/yellow/From/tl.png
-share/apps/kopete/styles/data/iChat-Trans/yellow/From/tm.png
-share/apps/kopete/styles/data/iChat-Trans/yellow/From/tr.png
-share/apps/kopete/styles/data/iChat-Trans/yellow/To/bl.png
-share/apps/kopete/styles/data/iChat-Trans/yellow/To/bm.png
-share/apps/kopete/styles/data/iChat-Trans/yellow/To/br.png
-share/apps/kopete/styles/data/iChat-Trans/yellow/To/ml.png
-share/apps/kopete/styles/data/iChat-Trans/yellow/To/mm.png
-share/apps/kopete/styles/data/iChat-Trans/yellow/To/mr.png
-share/apps/kopete/styles/data/iChat-Trans/yellow/To/tl.png
-share/apps/kopete/styles/data/iChat-Trans/yellow/To/tm.png
-share/apps/kopete/styles/data/iChat-Trans/yellow/To/tr.png
-share/apps/kopete/styles/data/iChat-Trans/yellow/me.png
-share/apps/kopete/styles/data/iChat-Trans/yellow/them.png
-share/apps/kopete/styles/data/iChat/blue/From/bl.png
-share/apps/kopete/styles/data/iChat/blue/From/bm.png
-share/apps/kopete/styles/data/iChat/blue/From/br.png
-share/apps/kopete/styles/data/iChat/blue/From/ml.png
-share/apps/kopete/styles/data/iChat/blue/From/mm.png
-share/apps/kopete/styles/data/iChat/blue/From/mr.png
-share/apps/kopete/styles/data/iChat/blue/From/tl.png
-share/apps/kopete/styles/data/iChat/blue/From/tm.png
-share/apps/kopete/styles/data/iChat/blue/From/tr.png
-share/apps/kopete/styles/data/iChat/blue/To/bl.png
-share/apps/kopete/styles/data/iChat/blue/To/bm.png
-share/apps/kopete/styles/data/iChat/blue/To/br.png
-share/apps/kopete/styles/data/iChat/blue/To/ml.png
-share/apps/kopete/styles/data/iChat/blue/To/mm.png
-share/apps/kopete/styles/data/iChat/blue/To/mr.png
-share/apps/kopete/styles/data/iChat/blue/To/tl.png
-share/apps/kopete/styles/data/iChat/blue/To/tm.png
-share/apps/kopete/styles/data/iChat/blue/To/tr.png
-share/apps/kopete/styles/data/iChat/blue/me.png
-share/apps/kopete/styles/data/iChat/blue/them.png
-share/apps/kopete/styles/data/iChat/clear/From/bl.png
-share/apps/kopete/styles/data/iChat/clear/From/bm.png
-share/apps/kopete/styles/data/iChat/clear/From/br.png
-share/apps/kopete/styles/data/iChat/clear/From/ml.png
-share/apps/kopete/styles/data/iChat/clear/From/mm.png
-share/apps/kopete/styles/data/iChat/clear/From/mr.png
-share/apps/kopete/styles/data/iChat/clear/From/tl.png
-share/apps/kopete/styles/data/iChat/clear/From/tm.png
-share/apps/kopete/styles/data/iChat/clear/From/tr.png
-share/apps/kopete/styles/data/iChat/clear/To/bl.png
-share/apps/kopete/styles/data/iChat/clear/To/bm.png
-share/apps/kopete/styles/data/iChat/clear/To/br.png
-share/apps/kopete/styles/data/iChat/clear/To/ml.png
-share/apps/kopete/styles/data/iChat/clear/To/mm.png
-share/apps/kopete/styles/data/iChat/clear/To/mr.png
-share/apps/kopete/styles/data/iChat/clear/To/tl.png
-share/apps/kopete/styles/data/iChat/clear/To/tm.png
-share/apps/kopete/styles/data/iChat/clear/To/tr.png
-share/apps/kopete/styles/data/iChat/clear/me.png
-share/apps/kopete/styles/data/iChat/clear/them.png
-share/apps/kopete/styles/data/iChat/graphite/From/bl.png
-share/apps/kopete/styles/data/iChat/graphite/From/bm.png
-share/apps/kopete/styles/data/iChat/graphite/From/br.png
-share/apps/kopete/styles/data/iChat/graphite/From/ml.png
-share/apps/kopete/styles/data/iChat/graphite/From/mm.png
-share/apps/kopete/styles/data/iChat/graphite/From/mr.png
-share/apps/kopete/styles/data/iChat/graphite/From/tl.png
-share/apps/kopete/styles/data/iChat/graphite/From/tm.png
-share/apps/kopete/styles/data/iChat/graphite/From/tr.png
-share/apps/kopete/styles/data/iChat/graphite/To/bl.png
-share/apps/kopete/styles/data/iChat/graphite/To/bm.png
-share/apps/kopete/styles/data/iChat/graphite/To/br.png
-share/apps/kopete/styles/data/iChat/graphite/To/ml.png
-share/apps/kopete/styles/data/iChat/graphite/To/mm.png
-share/apps/kopete/styles/data/iChat/graphite/To/mr.png
-share/apps/kopete/styles/data/iChat/graphite/To/tl.png
-share/apps/kopete/styles/data/iChat/graphite/To/tm.png
-share/apps/kopete/styles/data/iChat/graphite/To/tr.png
-share/apps/kopete/styles/data/iChat/graphite/me.png
-share/apps/kopete/styles/data/iChat/graphite/them.png
-share/apps/kopete/styles/data/iChat/green/From/bl.png
-share/apps/kopete/styles/data/iChat/green/From/bm.png
-share/apps/kopete/styles/data/iChat/green/From/br.png
-share/apps/kopete/styles/data/iChat/green/From/ml.png
-share/apps/kopete/styles/data/iChat/green/From/mm.png
-share/apps/kopete/styles/data/iChat/green/From/mr.png
-share/apps/kopete/styles/data/iChat/green/From/tl.png
-share/apps/kopete/styles/data/iChat/green/From/tm.png
-share/apps/kopete/styles/data/iChat/green/From/tr.png
-share/apps/kopete/styles/data/iChat/green/To/bl.png
-share/apps/kopete/styles/data/iChat/green/To/bm.png
-share/apps/kopete/styles/data/iChat/green/To/br.png
-share/apps/kopete/styles/data/iChat/green/To/ml.png
-share/apps/kopete/styles/data/iChat/green/To/mm.png
-share/apps/kopete/styles/data/iChat/green/To/mr.png
-share/apps/kopete/styles/data/iChat/green/To/tl.png
-share/apps/kopete/styles/data/iChat/green/To/tm.png
-share/apps/kopete/styles/data/iChat/green/To/tr.png
-share/apps/kopete/styles/data/iChat/green/me.png
-share/apps/kopete/styles/data/iChat/green/them.png
-share/apps/kopete/styles/data/iChat/orange/From/bl.png
-share/apps/kopete/styles/data/iChat/orange/From/bm.png
-share/apps/kopete/styles/data/iChat/orange/From/br.png
-share/apps/kopete/styles/data/iChat/orange/From/ml.png
-share/apps/kopete/styles/data/iChat/orange/From/mm.png
-share/apps/kopete/styles/data/iChat/orange/From/mr.png
-share/apps/kopete/styles/data/iChat/orange/From/tl.png
-share/apps/kopete/styles/data/iChat/orange/From/tm.png
-share/apps/kopete/styles/data/iChat/orange/From/tr.png
-share/apps/kopete/styles/data/iChat/orange/To/bl.png
-share/apps/kopete/styles/data/iChat/orange/To/bm.png
-share/apps/kopete/styles/data/iChat/orange/To/br.png
-share/apps/kopete/styles/data/iChat/orange/To/ml.png
-share/apps/kopete/styles/data/iChat/orange/To/mm.png
-share/apps/kopete/styles/data/iChat/orange/To/mr.png
-share/apps/kopete/styles/data/iChat/orange/To/tl.png
-share/apps/kopete/styles/data/iChat/orange/To/tm.png
-share/apps/kopete/styles/data/iChat/orange/To/tr.png
-share/apps/kopete/styles/data/iChat/orange/me.png
-share/apps/kopete/styles/data/iChat/orange/them.png
-share/apps/kopete/styles/data/iChat/pink/From/bl.png
-share/apps/kopete/styles/data/iChat/pink/From/bm.png
-share/apps/kopete/styles/data/iChat/pink/From/br.png
-share/apps/kopete/styles/data/iChat/pink/From/ml.png
-share/apps/kopete/styles/data/iChat/pink/From/mm.png
-share/apps/kopete/styles/data/iChat/pink/From/mr.png
-share/apps/kopete/styles/data/iChat/pink/From/tl.png
-share/apps/kopete/styles/data/iChat/pink/From/tm.png
-share/apps/kopete/styles/data/iChat/pink/From/tr.png
-share/apps/kopete/styles/data/iChat/pink/To/bl.png
-share/apps/kopete/styles/data/iChat/pink/To/bm.png
-share/apps/kopete/styles/data/iChat/pink/To/br.png
-share/apps/kopete/styles/data/iChat/pink/To/ml.png
-share/apps/kopete/styles/data/iChat/pink/To/mm.png
-share/apps/kopete/styles/data/iChat/pink/To/mr.png
-share/apps/kopete/styles/data/iChat/pink/To/tl.png
-share/apps/kopete/styles/data/iChat/pink/To/tm.png
-share/apps/kopete/styles/data/iChat/pink/To/tr.png
-share/apps/kopete/styles/data/iChat/pink/me.png
-share/apps/kopete/styles/data/iChat/pink/them.png
-share/apps/kopete/styles/data/iChat/purple/From/bl.png
-share/apps/kopete/styles/data/iChat/purple/From/bm.png
-share/apps/kopete/styles/data/iChat/purple/From/br.png
-share/apps/kopete/styles/data/iChat/purple/From/ml.png
-share/apps/kopete/styles/data/iChat/purple/From/mm.png
-share/apps/kopete/styles/data/iChat/purple/From/mr.png
-share/apps/kopete/styles/data/iChat/purple/From/tl.png
-share/apps/kopete/styles/data/iChat/purple/From/tm.png
-share/apps/kopete/styles/data/iChat/purple/From/tr.png
-share/apps/kopete/styles/data/iChat/purple/To/bl.png
-share/apps/kopete/styles/data/iChat/purple/To/bm.png
-share/apps/kopete/styles/data/iChat/purple/To/br.png
-share/apps/kopete/styles/data/iChat/purple/To/ml.png
-share/apps/kopete/styles/data/iChat/purple/To/mm.png
-share/apps/kopete/styles/data/iChat/purple/To/mr.png
-share/apps/kopete/styles/data/iChat/purple/To/tl.png
-share/apps/kopete/styles/data/iChat/purple/To/tm.png
-share/apps/kopete/styles/data/iChat/purple/To/tr.png
-share/apps/kopete/styles/data/iChat/purple/me.png
-share/apps/kopete/styles/data/iChat/purple/them.png
-share/apps/kopete/styles/data/iChat/yellow/From/bl.png
-share/apps/kopete/styles/data/iChat/yellow/From/bm.png
-share/apps/kopete/styles/data/iChat/yellow/From/br.png
-share/apps/kopete/styles/data/iChat/yellow/From/ml.png
-share/apps/kopete/styles/data/iChat/yellow/From/mm.png
-share/apps/kopete/styles/data/iChat/yellow/From/mr.png
-share/apps/kopete/styles/data/iChat/yellow/From/tl.png
-share/apps/kopete/styles/data/iChat/yellow/From/tm.png
-share/apps/kopete/styles/data/iChat/yellow/From/tr.png
-share/apps/kopete/styles/data/iChat/yellow/To/bl.png
-share/apps/kopete/styles/data/iChat/yellow/To/bm.png
-share/apps/kopete/styles/data/iChat/yellow/To/br.png
-share/apps/kopete/styles/data/iChat/yellow/To/ml.png
-share/apps/kopete/styles/data/iChat/yellow/To/mm.png
-share/apps/kopete/styles/data/iChat/yellow/To/mr.png
-share/apps/kopete/styles/data/iChat/yellow/To/tl.png
-share/apps/kopete/styles/data/iChat/yellow/To/tm.png
-share/apps/kopete/styles/data/iChat/yellow/To/tr.png
-share/apps/kopete/styles/data/iChat/yellow/me.png
-share/apps/kopete/styles/data/iChat/yellow/them.png
-share/apps/kopete/styles/iChat.xsl
+share/apps/kopete/styles/Clean/Contents/Resources/Footer.html
+share/apps/kopete/styles/Clean/Contents/Resources/Header.html
+share/apps/kopete/styles/Clean/Contents/Resources/Incoming/Content.html
+share/apps/kopete/styles/Clean/Contents/Resources/Incoming/NextContent.html
+share/apps/kopete/styles/Clean/Contents/Resources/Incoming/buddy_icon.png
+share/apps/kopete/styles/Clean/Contents/Resources/Outgoing/Content.html
+share/apps/kopete/styles/Clean/Contents/Resources/Outgoing/NextContent.html
+share/apps/kopete/styles/Clean/Contents/Resources/Outgoing/buddy_icon.png
+share/apps/kopete/styles/Clean/Contents/Resources/Status.html
+share/apps/kopete/styles/Clean/Contents/Resources/images/action.png
+share/apps/kopete/styles/Clean/Contents/Resources/images/important.png
+share/apps/kopete/styles/Clean/Contents/Resources/images/internal.png
+share/apps/kopete/styles/Clean/Contents/Resources/main.css
+share/apps/kopete/styles/Clear/Contents/Resources/Footer.html
+share/apps/kopete/styles/Clear/Contents/Resources/Header.html
+share/apps/kopete/styles/Clear/Contents/Resources/Incoming/Action.html
+share/apps/kopete/styles/Clear/Contents/Resources/Incoming/Content.html
+share/apps/kopete/styles/Clear/Contents/Resources/Incoming/NextContent.html
+share/apps/kopete/styles/Clear/Contents/Resources/Incoming/buddy_icon.png
+share/apps/kopete/styles/Clear/Contents/Resources/Outgoing/Action.html
+share/apps/kopete/styles/Clear/Contents/Resources/Outgoing/Content.html
+share/apps/kopete/styles/Clear/Contents/Resources/Outgoing/NextContent.html
+share/apps/kopete/styles/Clear/Contents/Resources/Outgoing/buddy_icon.png
+share/apps/kopete/styles/Clear/Contents/Resources/Status.html
+share/apps/kopete/styles/Clear/Contents/Resources/images/body-background.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/body-inbound-arrow.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/body-inbound-avatar.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/body-inbound-background.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/body-inbound-left.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/body-inbound-right.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/body-outbound-arrow.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/body-outbound-avatar.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/body-outbound-left.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/body-outbound-right.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/footer-inbound-background.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/footer-inbound-left.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/footer-inbound-right.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/footer-outbound-background.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/footer-outbound-left.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/footer-outbound-right.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/header-inbound-background.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/header-inbound-left.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/header-inbound-right.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/header-outbound-background.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/header-outbound-left.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/header-outbound-right.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/icon-action.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/icon-highlighted.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/icon-internal.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/icon-me.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/icon-time.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/icon-you.png
+share/apps/kopete/styles/Clear/Contents/Resources/main.css
+share/apps/kopete/styles/Gaim/Contents/Resources/Footer.html
+share/apps/kopete/styles/Gaim/Contents/Resources/Header.html
+share/apps/kopete/styles/Gaim/Contents/Resources/Incoming/Action.html
+share/apps/kopete/styles/Gaim/Contents/Resources/Incoming/Content.html
+share/apps/kopete/styles/Gaim/Contents/Resources/Incoming/NextContent.html
+share/apps/kopete/styles/Gaim/Contents/Resources/Outgoing/Action.html
+share/apps/kopete/styles/Gaim/Contents/Resources/Outgoing/Content.html
+share/apps/kopete/styles/Gaim/Contents/Resources/Outgoing/NextContent.html
+share/apps/kopete/styles/Gaim/Contents/Resources/Status.html
+share/apps/kopete/styles/Gaim/Contents/Resources/Variants/Contact-Colors.css
+share/apps/kopete/styles/Gaim/Contents/Resources/Variants/Name-Colors.css
+share/apps/kopete/styles/Gaim/Contents/Resources/Variants/No-Colors.css
+share/apps/kopete/styles/Gaim/Contents/Resources/Variants/Status-Colors.css
+share/apps/kopete/styles/Gaim/Contents/Resources/main.css
+share/apps/kopete/styles/Hacker/COPYRIGHT
+share/apps/kopete/styles/Hacker/Contents/Info.plist
+share/apps/kopete/styles/Hacker/Contents/Resources/Footer.html
+share/apps/kopete/styles/Hacker/Contents/Resources/Header.html
+share/apps/kopete/styles/Hacker/Contents/Resources/Incoming/Action.html
+share/apps/kopete/styles/Hacker/Contents/Resources/Incoming/Content.html
+share/apps/kopete/styles/Hacker/Contents/Resources/Incoming/Context.html
+share/apps/kopete/styles/Hacker/Contents/Resources/Incoming/NextContent.html
+share/apps/kopete/styles/Hacker/Contents/Resources/Incoming/NextContext.html
+share/apps/kopete/styles/Hacker/Contents/Resources/Incoming/buddy_icon.png
+share/apps/kopete/styles/Hacker/Contents/Resources/Outgoing/Action.html
+share/apps/kopete/styles/Hacker/Contents/Resources/Outgoing/Content.html
+share/apps/kopete/styles/Hacker/Contents/Resources/Outgoing/Context.html
+share/apps/kopete/styles/Hacker/Contents/Resources/Outgoing/NextContent.html
+share/apps/kopete/styles/Hacker/Contents/Resources/Outgoing/NextContext.html
+share/apps/kopete/styles/Hacker/Contents/Resources/Outgoing/buddy_icon.png
+share/apps/kopete/styles/Hacker/Contents/Resources/Status.html
+share/apps/kopete/styles/Hacker/Contents/Resources/Variants/Dark-Noback.css
+share/apps/kopete/styles/Hacker/Contents/Resources/Variants/Dark.css
+share/apps/kopete/styles/Hacker/Contents/Resources/Variants/Dark2-Noback.css
+share/apps/kopete/styles/Hacker/Contents/Resources/Variants/Dark2.css
+share/apps/kopete/styles/Hacker/Contents/Resources/Variants/Light-Noback.css
+share/apps/kopete/styles/Hacker/Contents/Resources/Variants/Light.css
+share/apps/kopete/styles/Hacker/Contents/Resources/Variants/Light2-Noback.css
+share/apps/kopete/styles/Hacker/Contents/Resources/Variants/Light2.css
+share/apps/kopete/styles/Hacker/Contents/Resources/images/background.png
+share/apps/kopete/styles/Hacker/Contents/Resources/images/background2.png
+share/apps/kopete/styles/Hacker/Contents/Resources/images/kopete.png
+share/apps/kopete/styles/Hacker/Contents/Resources/main.css
+share/apps/kopete/styles/Hacker/README
+share/apps/kopete/styles/Hacker/gpl.txt
+share/apps/kopete/styles/Konqi/Contents/Resources/Footer.html
+share/apps/kopete/styles/Konqi/Contents/Resources/Header.html
+share/apps/kopete/styles/Konqi/Contents/Resources/Incoming/Content.html
+share/apps/kopete/styles/Konqi/Contents/Resources/Incoming/NextContent.html
+share/apps/kopete/styles/Konqi/Contents/Resources/Incoming/buddy_icon.png
+share/apps/kopete/styles/Konqi/Contents/Resources/Outgoing/Content.html
+share/apps/kopete/styles/Konqi/Contents/Resources/Outgoing/NextContent.html
+share/apps/kopete/styles/Konqi/Contents/Resources/Outgoing/buddy_icon.png
+share/apps/kopete/styles/Konqi/Contents/Resources/Status.html
+share/apps/kopete/styles/Konqi/Contents/Resources/Variants/Side_blue.css
+share/apps/kopete/styles/Konqi/Contents/Resources/Variants/Side_blue_moon.css
+share/apps/kopete/styles/Konqi/Contents/Resources/Variants/Side_blue_moon_without_transparency.css
+share/apps/kopete/styles/Konqi/Contents/Resources/Variants/Side_blue_without_transparency.css
+share/apps/kopete/styles/Konqi/Contents/Resources/Variants/Side_green.css
+share/apps/kopete/styles/Konqi/Contents/Resources/Variants/Side_green_without_trans.css
+share/apps/kopete/styles/Konqi/Contents/Resources/Variants/Side_green_without_transparency.css
+share/apps/kopete/styles/Konqi/Contents/Resources/Variants/konqui/cadre1.png
+share/apps/kopete/styles/Konqi/Contents/Resources/Variants/konqui/cadre2.png
+share/apps/kopete/styles/Konqi/Contents/Resources/Variants/konqui/cadre3.png
+share/apps/kopete/styles/Konqi/Contents/Resources/Variants/konqui/cadre4.png
+share/apps/kopete/styles/Konqi/Contents/Resources/Variants/konqui/cadre5.png
+share/apps/kopete/styles/Konqi/Contents/Resources/Variants/konqui/cadre6.png
+share/apps/kopete/styles/Konqi/Contents/Resources/Variants/konqui/konqui-blue.png
+share/apps/kopete/styles/Konqi/Contents/Resources/Variants/konqui/konqui-green.png
+share/apps/kopete/styles/Konqi/Contents/Resources/Variants/konqui/konqui-moon.jpg
+share/apps/kopete/styles/Konqi/Contents/Resources/main.css
+share/apps/kopete/styles/Konqi/Contents/Resources/puce.png
+share/apps/kopete/styles/Kopete/Contents/Resources/Footer.html
+share/apps/kopete/styles/Kopete/Contents/Resources/Header.html
+share/apps/kopete/styles/Kopete/Contents/Resources/Incoming/Action.html
+share/apps/kopete/styles/Kopete/Contents/Resources/Incoming/Content.html
+share/apps/kopete/styles/Kopete/Contents/Resources/Incoming/NextContent.html
+share/apps/kopete/styles/Kopete/Contents/Resources/Incoming/buddy_icon.png
+share/apps/kopete/styles/Kopete/Contents/Resources/Outgoing/Action.html
+share/apps/kopete/styles/Kopete/Contents/Resources/Outgoing/Content.html
+share/apps/kopete/styles/Kopete/Contents/Resources/Outgoing/NextContent.html
+share/apps/kopete/styles/Kopete/Contents/Resources/Outgoing/buddy_icon.png
+share/apps/kopete/styles/Kopete/Contents/Resources/Status.html
+share/apps/kopete/styles/Kopete/Contents/Resources/Variants/Big_pictures.css
+share/apps/kopete/styles/Kopete/Contents/Resources/Variants/Contact_color.css
+share/apps/kopete/styles/Kopete/Contents/Resources/images/action.png
+share/apps/kopete/styles/Kopete/Contents/Resources/images/important.png
+share/apps/kopete/styles/Kopete/Contents/Resources/images/system.png
+share/apps/kopete/styles/Kopete/Contents/Resources/main.css
+share/apps/kopete/styles/Retropete/Contents/Resources/Footer.html
+share/apps/kopete/styles/Retropete/Contents/Resources/Header.html
+share/apps/kopete/styles/Retropete/Contents/Resources/Incoming/Action.html
+share/apps/kopete/styles/Retropete/Contents/Resources/Incoming/Content.html
+share/apps/kopete/styles/Retropete/Contents/Resources/Incoming/NextContent.html
+share/apps/kopete/styles/Retropete/Contents/Resources/Outgoing/Action.html
+share/apps/kopete/styles/Retropete/Contents/Resources/Outgoing/Content.html
+share/apps/kopete/styles/Retropete/Contents/Resources/Outgoing/NextContent.html
+share/apps/kopete/styles/Retropete/Contents/Resources/Status.html
+share/apps/kopete/styles/Retropete/Contents/Resources/main.css
 share/apps/kopete/webpresence/webpresence_html.xsl
 share/apps/kopete/webpresence/webpresence_html_images.xsl
 share/apps/kopete/webpresence/webpresence_xhtml.xsl
@@ -796,6 +544,7 @@ share/apps/kopete_cryptography/cryptographyui.rc
 share/apps/kopete_groupwise/gwchatui.rc
 share/apps/kopete_history/historychatui.rc
 share/apps/kopete_history/historyui.rc
+share/apps/kopete_jabber/jabberchatui.rc
 share/apps/kopete_latex/latexchatui.rc
 share/apps/kopete_msn/msnchatui.rc
 share/apps/kopete_netmeeting/netmeetingchatui.rc
@@ -803,22 +552,151 @@ share/apps/kopete_statistics/statisticsui.rc
 share/apps/kopete_translator/translatorchatui.rc
 share/apps/kopete_translator/translatorui.rc
 share/apps/kopete_yahoo/yahoochatui.rc
+share/apps/kopete_yahoo/yahooconferenceui.rc
 share/apps/kopeterichtexteditpart/kopeterichtexteditpartfull.rc
 share/config.kcfg/historyconfig.kcfg
 share/config.kcfg/kopete.kcfg
 share/config.kcfg/kopeteidentityconfigpreferences.kcfg
 share/config.kcfg/latexconfig.kcfg
 share/config.kcfg/nowlisteningconfig.kcfg
+share/icons/crystalsvg/128x128/actions/voicecall.png
+share/icons/crystalsvg/128x128/actions/webcamreceive.png
+share/icons/crystalsvg/128x128/actions/webcamsend.png
+share/icons/crystalsvg/16x16/actions/account_offline_overlay.png
+share/icons/crystalsvg/16x16/actions/add_user.png
+share/icons/crystalsvg/16x16/actions/contact_away_overlay.png
+share/icons/crystalsvg/16x16/actions/contact_busy_overlay.png
+share/icons/crystalsvg/16x16/actions/contact_food_overlay.png
+share/icons/crystalsvg/16x16/actions/contact_invisible_overlay.png
+share/icons/crystalsvg/16x16/actions/contact_phone_overlay.png
+share/icons/crystalsvg/16x16/actions/contact_xa_overlay.png
+share/icons/crystalsvg/16x16/actions/delete_user.png
+share/icons/crystalsvg/16x16/actions/edit_user.png
+share/icons/crystalsvg/16x16/actions/emoticon.png
+share/icons/crystalsvg/16x16/actions/jabber_away.png
+share/icons/crystalsvg/16x16/actions/jabber_chatty.png
+share/icons/crystalsvg/16x16/actions/jabber_connecting.mng
+share/icons/crystalsvg/16x16/actions/jabber_group.png
+share/icons/crystalsvg/16x16/actions/jabber_invisible.png
+share/icons/crystalsvg/16x16/actions/jabber_na.png
+share/icons/crystalsvg/16x16/actions/jabber_offline.png
+share/icons/crystalsvg/16x16/actions/jabber_online.png
+share/icons/crystalsvg/16x16/actions/jabber_original.png
+share/icons/crystalsvg/16x16/actions/jabber_raw.png
+share/icons/crystalsvg/16x16/actions/jabber_serv_off.png
+share/icons/crystalsvg/16x16/actions/jabber_serv_on.png
+share/icons/crystalsvg/16x16/actions/jabber_xa.png
+share/icons/crystalsvg/16x16/actions/kopeteavailable.png
+share/icons/crystalsvg/16x16/actions/kopeteaway.png
+share/icons/crystalsvg/16x16/actions/kopeteeditstatusmessage.png
+share/icons/crystalsvg/16x16/actions/kopetestatusmessage.png
+share/icons/crystalsvg/16x16/actions/metacontact_away.png
+share/icons/crystalsvg/16x16/actions/metacontact_offline.png
+share/icons/crystalsvg/16x16/actions/metacontact_online.png
+share/icons/crystalsvg/16x16/actions/metacontact_unknown.png
+share/icons/crystalsvg/16x16/actions/newmsg.png
+share/icons/crystalsvg/16x16/actions/search_user.png
+share/icons/crystalsvg/16x16/actions/show_offliners.png
+share/icons/crystalsvg/16x16/actions/status_unknown.png
+share/icons/crystalsvg/16x16/actions/status_unknown_overlay.png
+share/icons/crystalsvg/16x16/actions/voicecall.png
+share/icons/crystalsvg/16x16/actions/webcamreceive.png
+share/icons/crystalsvg/16x16/actions/webcamsend.png
+share/icons/crystalsvg/16x16/apps/jabber_gateway_aim.png
+share/icons/crystalsvg/16x16/apps/jabber_gateway_gadu.png
+share/icons/crystalsvg/16x16/apps/jabber_gateway_http/ws.png
+share/icons/crystalsvg/16x16/apps/jabber_gateway_icq.png
+share/icons/crystalsvg/16x16/apps/jabber_gateway_irc.png
+share/icons/crystalsvg/16x16/apps/jabber_gateway_msn.png
+share/icons/crystalsvg/16x16/apps/jabber_gateway_qq.png
+share/icons/crystalsvg/16x16/apps/jabber_gateway_sms.png
+share/icons/crystalsvg/16x16/apps/jabber_gateway_smtp.png
+share/icons/crystalsvg/16x16/apps/jabber_gateway_tlen.png
+share/icons/crystalsvg/16x16/apps/jabber_gateway_yahoo.png
+share/icons/crystalsvg/16x16/apps/jabber_protocol.png
 share/icons/crystalsvg/16x16/mimetypes/kopete_emoticons.png
+share/icons/crystalsvg/22x22/actions/account_offline_overlay.png
+share/icons/crystalsvg/22x22/actions/add_user.png
+share/icons/crystalsvg/22x22/actions/delete_user.png
+share/icons/crystalsvg/22x22/actions/edit_user.png
+share/icons/crystalsvg/22x22/actions/kopeteavailable.png
+share/icons/crystalsvg/22x22/actions/kopeteaway.png
+share/icons/crystalsvg/22x22/actions/kopeteeditstatusmessage.png
+share/icons/crystalsvg/22x22/actions/search_user.png
+share/icons/crystalsvg/22x22/actions/show_offliners.png
+share/icons/crystalsvg/22x22/actions/voicecall.png
+share/icons/crystalsvg/22x22/actions/webcamreceive.png
+share/icons/crystalsvg/22x22/actions/webcamsend.png
 share/icons/crystalsvg/22x22/apps/kopete_all_away.png
 share/icons/crystalsvg/22x22/apps/kopete_offline.png
 share/icons/crystalsvg/22x22/apps/kopete_some_away.png
 share/icons/crystalsvg/22x22/apps/kopete_some_online.png
 share/icons/crystalsvg/22x22/mimetypes/kopete_emoticons.png
+share/icons/crystalsvg/32x32/actions/account_offline_overlay.png
+share/icons/crystalsvg/32x32/actions/add_user.png
+share/icons/crystalsvg/32x32/actions/delete_user.png
+share/icons/crystalsvg/32x32/actions/edit_user.png
+share/icons/crystalsvg/32x32/actions/kopeteavailable.png
+share/icons/crystalsvg/32x32/actions/kopeteaway.png
+share/icons/crystalsvg/32x32/actions/kopeteeditstatusmessage.png
+share/icons/crystalsvg/32x32/actions/metacontact_away.png
+share/icons/crystalsvg/32x32/actions/metacontact_offline.png
+share/icons/crystalsvg/32x32/actions/metacontact_online.png
+share/icons/crystalsvg/32x32/actions/metacontact_unknown.png
+share/icons/crystalsvg/32x32/actions/newmessage.mng
+share/icons/crystalsvg/32x32/actions/newmsg.png
+share/icons/crystalsvg/32x32/actions/search_user.png
+share/icons/crystalsvg/32x32/actions/show_offliners.png
+share/icons/crystalsvg/32x32/actions/voicecall.png
+share/icons/crystalsvg/32x32/actions/webcamreceive.png
+share/icons/crystalsvg/32x32/actions/webcamsend.png
+share/icons/crystalsvg/32x32/apps/jabber_protocol.png
+share/icons/crystalsvg/48x48/actions/kopeteavailable.png
+share/icons/crystalsvg/48x48/actions/kopeteaway.png
+share/icons/crystalsvg/48x48/actions/metacontact_away.png
+share/icons/crystalsvg/48x48/actions/metacontact_offline.png
+share/icons/crystalsvg/48x48/actions/metacontact_online.png
+share/icons/crystalsvg/48x48/actions/voicecall.png
+share/icons/crystalsvg/48x48/actions/webcamreceive.png
+share/icons/crystalsvg/48x48/actions/webcamsend.png
+share/icons/crystalsvg/48x48/apps/jabber_protocol.png
+share/icons/crystalsvg/64x64/actions/voicecall.png
+share/icons/crystalsvg/64x64/actions/webcamreceive.png
+share/icons/crystalsvg/64x64/actions/webcamsend.png
+share/icons/crystalsvg/scalable/actions/account_offline_overlay.svgz
 share/icons/hicolor/128x128/apps/kopete.png
+share/icons/hicolor/16x16/actions/emoticon.png
+share/icons/hicolor/16x16/actions/jabber_away.png
+share/icons/hicolor/16x16/actions/jabber_chatty.png
+share/icons/hicolor/16x16/actions/jabber_connecting.mng
+share/icons/hicolor/16x16/actions/jabber_group.png
+share/icons/hicolor/16x16/actions/jabber_invisible.png
+share/icons/hicolor/16x16/actions/jabber_na.png
+share/icons/hicolor/16x16/actions/jabber_offline.png
+share/icons/hicolor/16x16/actions/jabber_online.png
+share/icons/hicolor/16x16/actions/jabber_original.png
+share/icons/hicolor/16x16/actions/jabber_raw.png
+share/icons/hicolor/16x16/actions/jabber_serv_off.png
+share/icons/hicolor/16x16/actions/jabber_serv_on.png
+share/icons/hicolor/16x16/actions/jabber_xa.png
+share/icons/hicolor/16x16/actions/kopeteavailable.png
+share/icons/hicolor/16x16/actions/kopeteaway.png
+share/icons/hicolor/16x16/actions/newmsg.png
+share/icons/hicolor/16x16/actions/status_unknown.png
+share/icons/hicolor/16x16/actions/status_unknown_overlay.png
+share/icons/hicolor/16x16/apps/jabber_protocol.png
 share/icons/hicolor/16x16/apps/kopete.png
+share/icons/hicolor/22x22/actions/kopeteavailable.png
+share/icons/hicolor/22x22/actions/kopeteaway.png
 share/icons/hicolor/22x22/apps/kopete.png
+share/icons/hicolor/32x32/actions/kopeteavailable.png
+share/icons/hicolor/32x32/actions/kopeteaway.png
+share/icons/hicolor/32x32/actions/newmessage.mng
+share/icons/hicolor/32x32/apps/jabber_protocol.png
 share/icons/hicolor/32x32/apps/kopete.png
+share/icons/hicolor/48x48/actions/kopeteavailable.png
+share/icons/hicolor/48x48/actions/kopeteaway.png
+share/icons/hicolor/48x48/apps/jabber_protocol.png
 share/icons/hicolor/48x48/apps/kopete.png
 share/icons/hicolor/64x64/apps/kopete.png
 share/icons/hicolor/scalable/apps/kopete2.svgz
@@ -865,12 +743,12 @@ share/services/kopete_latex.desktop
 share/services/kopete_msn.desktop
 share/services/kopete_netmeeting.desktop
 share/services/kopete_nowlistening.desktop
-share/services/kopete_sms.desktop
 share/services/kopete_statistics.desktop
 share/services/kopete_testbed.desktop
 share/services/kopete_texteffect.desktop
 share/services/kopete_translator.desktop
 share/services/kopete_webpresence.desktop
+share/services/kopete_wp.desktop
 share/services/kopete_yahoo.desktop
 share/servicetypes/kopeteplugin.desktop
 share/servicetypes/kopeteprotocol.desktop
@@ -887,6 +765,7 @@ share/sounds/Kopete_User_is_Online.ogg
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdenetwork-apidocs/kopete/libkopete/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdenetwork-apidocs/kopete/html
 @dirrm share/services/kconfiguredialog
+@dirrm share/icons/crystalsvg/16x16/apps/jabber_gateway_http
 @dirrm share/doc/HTML/en/kdenetwork-apidocs/kopete/libkopete/html
 @dirrm share/doc/HTML/en/kdenetwork-apidocs/kopete/libkopete
 @dirrm share/doc/HTML/en/kdenetwork-apidocs/kopete/html
@@ -899,81 +778,65 @@ share/sounds/Kopete_User_is_Online.ogg
 @dirrm share/apps/kopete_netmeeting
 @dirrm share/apps/kopete_msn
 @dirrm share/apps/kopete_latex
+@dirrm share/apps/kopete_jabber
 @dirrm share/apps/kopete_history
 @dirrm share/apps/kopete_groupwise
 @dirrm share/apps/kopete_cryptography
 @dirrm share/apps/kopete_contactnotes
 @dirrm share/apps/kopete/webpresence
-@dirrm share/apps/kopete/styles/data/iChat/yellow/To
-@dirrm share/apps/kopete/styles/data/iChat/yellow/From
-@dirrm share/apps/kopete/styles/data/iChat/yellow
-@dirrm share/apps/kopete/styles/data/iChat/purple/To
-@dirrm share/apps/kopete/styles/data/iChat/purple/From
-@dirrm share/apps/kopete/styles/data/iChat/purple
-@dirrm share/apps/kopete/styles/data/iChat/pink/To
-@dirrm share/apps/kopete/styles/data/iChat/pink/From
-@dirrm share/apps/kopete/styles/data/iChat/pink
-@dirrm share/apps/kopete/styles/data/iChat/orange/To
-@dirrm share/apps/kopete/styles/data/iChat/orange/From
-@dirrm share/apps/kopete/styles/data/iChat/orange
-@dirrm share/apps/kopete/styles/data/iChat/green/To
-@dirrm share/apps/kopete/styles/data/iChat/green/From
-@dirrm share/apps/kopete/styles/data/iChat/green
-@dirrm share/apps/kopete/styles/data/iChat/graphite/To
-@dirrm share/apps/kopete/styles/data/iChat/graphite/From
-@dirrm share/apps/kopete/styles/data/iChat/graphite
-@dirrm share/apps/kopete/styles/data/iChat/clear/To
-@dirrm share/apps/kopete/styles/data/iChat/clear/From
-@dirrm share/apps/kopete/styles/data/iChat/clear
-@dirrm share/apps/kopete/styles/data/iChat/blue/To
-@dirrm share/apps/kopete/styles/data/iChat/blue/From
-@dirrm share/apps/kopete/styles/data/iChat/blue
-@dirrm share/apps/kopete/styles/data/iChat-Trans/yellow/To
-@dirrm share/apps/kopete/styles/data/iChat-Trans/yellow/From
-@dirrm share/apps/kopete/styles/data/iChat-Trans/yellow
-@dirrm share/apps/kopete/styles/data/iChat-Trans/purple/To
-@dirrm share/apps/kopete/styles/data/iChat-Trans/purple/From
-@dirrm share/apps/kopete/styles/data/iChat-Trans/purple
-@dirrm share/apps/kopete/styles/data/iChat-Trans/pink/To
-@dirrm share/apps/kopete/styles/data/iChat-Trans/pink/From
-@dirrm share/apps/kopete/styles/data/iChat-Trans/pink
-@dirrm share/apps/kopete/styles/data/iChat-Trans/orange/To
-@dirrm share/apps/kopete/styles/data/iChat-Trans/orange/From
-@dirrm share/apps/kopete/styles/data/iChat-Trans/orange
-@dirrm share/apps/kopete/styles/data/iChat-Trans/green/To
-@dirrm share/apps/kopete/styles/data/iChat-Trans/green/From
-@dirrm share/apps/kopete/styles/data/iChat-Trans/green
-@dirrm share/apps/kopete/styles/data/iChat-Trans/graphite/To
-@dirrm share/apps/kopete/styles/data/iChat-Trans/graphite/From
-@dirrm share/apps/kopete/styles/data/iChat-Trans/graphite
-@dirrm share/apps/kopete/styles/data/iChat-Trans/clear/To
-@dirrm share/apps/kopete/styles/data/iChat-Trans/clear/From
-@dirrm share/apps/kopete/styles/data/iChat-Trans/clear
-@dirrm share/apps/kopete/styles/data/iChat-Trans/blue/To
-@dirrm share/apps/kopete/styles/data/iChat-Trans/blue/From
-@dirrm share/apps/kopete/styles/data/iChat-Trans/blue
-@dirrm share/apps/kopete/styles/data/iChat-Trans
-@dirrm share/apps/kopete/styles/data/iChat
-@dirrm share/apps/kopete/styles/data/Kopete
-@dirrm share/apps/kopete/styles/data/Adium
-@dirrm share/apps/kopete/styles/data
+@dirrm share/apps/kopete/styles/Retropete/Contents/Resources/Outgoing
+@dirrm share/apps/kopete/styles/Retropete/Contents/Resources/Incoming
+@dirrm share/apps/kopete/styles/Retropete/Contents/Resources
+@dirrm share/apps/kopete/styles/Retropete/Contents
+@dirrm share/apps/kopete/styles/Retropete
+@dirrm share/apps/kopete/styles/Kopete/Contents/Resources/images
+@dirrm share/apps/kopete/styles/Kopete/Contents/Resources/Variants
+@dirrm share/apps/kopete/styles/Kopete/Contents/Resources/Outgoing
+@dirrm share/apps/kopete/styles/Kopete/Contents/Resources/Incoming
+@dirrm share/apps/kopete/styles/Kopete/Contents/Resources
+@dirrm share/apps/kopete/styles/Kopete/Contents
+@dirrm share/apps/kopete/styles/Kopete
+@dirrm share/apps/kopete/styles/Konqi/Contents/Resources/Variants/konqui
+@dirrm share/apps/kopete/styles/Konqi/Contents/Resources/Variants
+@dirrm share/apps/kopete/styles/Konqi/Contents/Resources/Outgoing
+@dirrm share/apps/kopete/styles/Konqi/Contents/Resources/Incoming
+@dirrm share/apps/kopete/styles/Konqi/Contents/Resources
+@dirrm share/apps/kopete/styles/Konqi/Contents
+@dirrm share/apps/kopete/styles/Konqi
+@dirrm share/apps/kopete/styles/Hacker/Contents/Resources/images
+@dirrm share/apps/kopete/styles/Hacker/Contents/Resources/Variants
+@dirrm share/apps/kopete/styles/Hacker/Contents/Resources/Outgoing
+@dirrm share/apps/kopete/styles/Hacker/Contents/Resources/Incoming
+@dirrm share/apps/kopete/styles/Hacker/Contents/Resources
+@dirrm share/apps/kopete/styles/Hacker/Contents
+@dirrm share/apps/kopete/styles/Hacker
+@dirrm share/apps/kopete/styles/Gaim/Contents/Resources/Variants
+@dirrm share/apps/kopete/styles/Gaim/Contents/Resources/Outgoing
+@dirrm share/apps/kopete/styles/Gaim/Contents/Resources/Incoming
+@dirrm share/apps/kopete/styles/Gaim/Contents/Resources
+@dirrm share/apps/kopete/styles/Gaim/Contents
+@dirrm share/apps/kopete/styles/Gaim
+@dirrm share/apps/kopete/styles/Clear/Contents/Resources/images
+@dirrm share/apps/kopete/styles/Clear/Contents/Resources/Outgoing
+@dirrm share/apps/kopete/styles/Clear/Contents/Resources/Incoming
+@dirrm share/apps/kopete/styles/Clear/Contents/Resources
+@dirrm share/apps/kopete/styles/Clear/Contents
+@dirrm share/apps/kopete/styles/Clear
+@dirrm share/apps/kopete/styles/Clean/Contents/Resources/images
+@dirrm share/apps/kopete/styles/Clean/Contents/Resources/Outgoing
+@dirrm share/apps/kopete/styles/Clean/Contents/Resources/Incoming
+@dirrm share/apps/kopete/styles/Clean/Contents/Resources
+@dirrm share/apps/kopete/styles/Clean/Contents
+@dirrm share/apps/kopete/styles/Clean
 @dirrm share/apps/kopete/styles
 @dirrm share/apps/kopete/pics/statistics
 @dirrm share/apps/kopete/pics
-@dirrm share/apps/kopete/icons/hicolor/48x48/apps
-@dirrm share/apps/kopete/icons/hicolor/48x48/actions
-@dirrm share/apps/kopete/icons/hicolor/48x48
 @dirrm share/apps/kopete/icons/hicolor/32x32/apps
-@dirrm share/apps/kopete/icons/hicolor/32x32/actions
 @dirrm share/apps/kopete/icons/hicolor/32x32
-@dirrm share/apps/kopete/icons/hicolor/22x22/actions
-@dirrm share/apps/kopete/icons/hicolor/22x22
 @dirrm share/apps/kopete/icons/hicolor/16x16/apps
 @dirrm share/apps/kopete/icons/hicolor/16x16/actions
 @dirrm share/apps/kopete/icons/hicolor/16x16
 @dirrm share/apps/kopete/icons/hicolor
-@dirrm share/apps/kopete/icons/crystalsvg/scalable/actions
-@dirrm share/apps/kopete/icons/crystalsvg/scalable
 @dirrm share/apps/kopete/icons/crystalsvg/64x64/apps
 @dirrm share/apps/kopete/icons/crystalsvg/64x64/actions
 @dirrm share/apps/kopete/icons/crystalsvg/64x64