[Pkg-kde-commits] rev 1115 - branches/kde-3.4.0/packages/kdenetwork/debian/patches

Christopher Martin chrsmrtn-guest@costa.debian.org
Tue, 24 May 2005 21:10:54 +0000


Author: chrsmrtn-guest
Date: 2005-05-24 21:10:52 +0000 (Tue, 24 May 2005)
New Revision: 1115

Modified:
   branches/kde-3.4.0/packages/kdenetwork/debian/patches/98_buildprep.diff
Log:
Update kdenetwork buildprep diff.


Modified: branches/kde-3.4.0/packages/kdenetwork/debian/patches/98_buildprep.diff
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/patches/98_buildprep.diff	2005-05-24 17:27:33 UTC (rev 1114)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/patches/98_buildprep.diff	2005-05-24 21:10:52 UTC (rev 1115)
@@ -1,6 +1,6 @@
-diff -Nrua kdenetwork-3.4.1.orig/acinclude.m4 kdenetwork-3.4.1/acinclude.m4
---- kdenetwork-3.4.1.orig/acinclude.m4	2005-05-23 18:06:46.000000000 +0200
-+++ kdenetwork-3.4.1/acinclude.m4	2005-05-24 17:05:18.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/acinclude.m4 kdenetwork-3.4.1/acinclude.m4
+--- kdenetwork-3.4.1.orig/acinclude.m4	2005-05-23 12:06:46.000000000 -0400
++++ kdenetwork-3.4.1/acinclude.m4	2005-05-24 13:38:27.000000000 -0400
 @@ -1690,15 +1690,6 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
@@ -1443,9 +1443,9 @@
  AC_MSG_RESULT([$SED])
  ])
  
-diff -Nrua kdenetwork-3.4.1.orig/aclocal.m4 kdenetwork-3.4.1/aclocal.m4
---- kdenetwork-3.4.1.orig/aclocal.m4	2005-05-23 18:07:03.000000000 +0200
-+++ kdenetwork-3.4.1/aclocal.m4	2005-05-24 17:05:30.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/aclocal.m4 kdenetwork-3.4.1/aclocal.m4
+--- kdenetwork-3.4.1.orig/aclocal.m4	2005-05-23 12:07:03.000000000 -0400
++++ kdenetwork-3.4.1/aclocal.m4	2005-05-24 13:39:29.000000000 -0400
 @@ -501,6 +501,35 @@
  rmdir .tst 2>/dev/null
  AC_SUBST([am__leading_dot])])
@@ -1482,9 +1482,9 @@
  # Check to see how 'make' treats includes.	            -*- Autoconf -*-
  
  # Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-diff -Nrua kdenetwork-3.4.1.orig/configure kdenetwork-3.4.1/configure
---- kdenetwork-3.4.1.orig/configure	2005-05-23 18:09:11.000000000 +0200
-+++ kdenetwork-3.4.1/configure	2005-05-24 17:07:12.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/configure kdenetwork-3.4.1/configure
+--- kdenetwork-3.4.1.orig/configure	2005-05-23 12:09:11.000000000 -0400
++++ kdenetwork-3.4.1/configure	2005-05-24 13:47:30.000000000 -0400
 @@ -464,7 +464,7 @@
  # include <unistd.h>
  #endif"
@@ -7353,7 +7353,30 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39543,8 +39360,7 @@
+@@ -39402,8 +39219,20 @@
+ 	int main()
+ 	{
+ #if defined __GG_LIBGADU_HAVE_PTHREAD && defined GG_LOGIN60
+-		int maj, min, date;
+-		sscanf( gg_libgadu_version(), "%u.%u.%u", &maj,&min,&date );
++		int maj, min, date, items;
++		const char *libgadu_version = gg_libgadu_version();
++
++		items = sscanf( libgadu_version, "%u.%u.%u", &maj,&min,&date );
++
++		if ( items != 3 ) { /* version in YYYYDDMM format only */
++			sscanf( libgadu_version, "%u", &date );
++
++			if ( date < 20040520 )
++				return 1;
++			else
++				return 0;
++		}
++
+ 		if ( maj != 1 ) {
+ 			return 1;
+ 		}
+@@ -39543,8 +39372,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7363,16 +7386,16 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -39633,7 +39449,7 @@
+@@ -39633,7 +39461,7 @@
  do
    for j in openssl/ssl.h;
    do
 -    echo "configure: 39636: $i/$j" >&5
-+    echo "configure: 39452: $i/$j" >&5
++    echo "configure: 39464: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        ssl_incdir=$i
-@@ -39688,8 +39504,7 @@
+@@ -39688,8 +39516,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7382,7 +7405,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40005,8 +39820,7 @@
+@@ -40005,8 +39832,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7392,7 +7415,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40111,8 +39925,7 @@
+@@ -40111,8 +39937,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7402,7 +7425,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40211,8 +40024,7 @@
+@@ -40211,8 +40036,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7412,7 +7435,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40382,8 +40194,7 @@
+@@ -40382,8 +40206,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7422,7 +7445,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40597,8 +40408,7 @@
+@@ -40597,8 +40420,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7432,7 +7455,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40640,8 +40450,7 @@
+@@ -40640,8 +40462,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7442,7 +7465,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40698,8 +40507,7 @@
+@@ -40698,8 +40519,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7452,7 +7475,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40867,8 +40675,7 @@
+@@ -40867,8 +40687,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7462,7 +7485,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -40928,8 +40735,7 @@
+@@ -40928,8 +40747,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7472,7 +7495,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41002,8 +40808,7 @@
+@@ -41002,8 +40820,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7482,7 +7505,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41067,8 +40872,7 @@
+@@ -41067,8 +40884,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7492,7 +7515,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41132,8 +40936,7 @@
+@@ -41132,8 +40948,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7502,7 +7525,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41198,8 +41001,7 @@
+@@ -41198,8 +41013,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7512,7 +7535,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41264,8 +41066,7 @@
+@@ -41264,8 +41078,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7522,7 +7545,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41368,8 +41169,7 @@
+@@ -41368,8 +41181,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7532,7 +7555,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41508,8 +41308,7 @@
+@@ -41508,8 +41320,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7542,7 +7565,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41575,8 +41374,7 @@
+@@ -41575,8 +41386,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7552,7 +7575,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41732,8 +41530,7 @@
+@@ -41732,8 +41542,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7562,7 +7585,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -41763,7 +41560,7 @@
+@@ -41763,7 +41572,7 @@
  #define HAVE_VIDMODE_EXTENSION 1
  _ACEOF
  
@@ -7571,16 +7594,16 @@
  
  fi
  
-@@ -41820,7 +41617,7 @@
+@@ -41820,7 +41629,7 @@
  do
    for j in openssl/ssl.h;
    do
 -    echo "configure: 41823: $i/$j" >&5
-+    echo "configure: 41620: $i/$j" >&5
++    echo "configure: 41632: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        ssl_incdir=$i
-@@ -41875,8 +41672,7 @@
+@@ -41875,8 +41684,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7590,7 +7613,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42109,8 +41905,7 @@
+@@ -42109,8 +41917,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7600,7 +7623,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42267,8 +42062,7 @@
+@@ -42267,8 +42074,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7610,7 +7633,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42447,8 +42241,7 @@
+@@ -42447,8 +42253,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7620,7 +7643,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42514,8 +42307,7 @@
+@@ -42514,8 +42319,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7630,7 +7653,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42664,8 +42456,7 @@
+@@ -42664,8 +42468,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7640,7 +7663,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42747,8 +42538,7 @@
+@@ -42747,8 +42550,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7650,7 +7673,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42854,8 +42644,7 @@
+@@ -42854,8 +42656,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7660,7 +7683,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42921,8 +42710,7 @@
+@@ -42921,8 +42722,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7670,7 +7693,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -42968,8 +42756,7 @@
+@@ -42968,8 +42768,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7680,7 +7703,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43046,8 +42833,7 @@
+@@ -43046,8 +42845,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7690,7 +7713,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43113,8 +42899,7 @@
+@@ -43113,8 +42911,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7700,7 +7723,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -43174,8 +42959,7 @@
+@@ -43174,8 +42971,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -7710,7 +7733,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -44159,6 +43943,13 @@
+@@ -44159,6 +43955,13 @@
  LTLIBOBJS=$ac_ltlibobjs
  
  
@@ -7724,7 +7747,7 @@
  if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
    { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
-@@ -45261,6 +45052,9 @@
+@@ -45261,6 +45064,9 @@
  s,@AMTAR@,$AMTAR,;t t
  s,@am__tar@,$am__tar,;t t
  s,@am__untar@,$am__untar,;t t
@@ -7734,7 +7757,7 @@
  s,@KDECONFIG@,$KDECONFIG,;t t
  s,@kde_libs_prefix@,$kde_libs_prefix,;t t
  s,@kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -45686,11 +45480,6 @@
+@@ -45686,11 +45492,6 @@
    *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
    esac
  
@@ -7746,7 +7769,7 @@
    # Let's still pretend it is `configure' which instantiates (i.e., don't
    # use $as_me), people would be surprised to read:
    #    /* config.h.  Generated by config.status.  */
-@@ -45729,6 +45518,12 @@
+@@ -45729,6 +45530,12 @@
  	 fi;;
        esac
      done` || { (exit 1); exit 1; }
@@ -7759,9 +7782,9 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
-diff -Nrua kdenetwork-3.4.1.orig/configure.in kdenetwork-3.4.1/configure.in
---- kdenetwork-3.4.1.orig/configure.in	2005-05-23 18:06:48.000000000 +0200
-+++ kdenetwork-3.4.1/configure.in	2005-05-24 17:05:18.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/configure.in kdenetwork-3.4.1/configure.in
+--- kdenetwork-3.4.1.orig/configure.in	2005-05-23 12:06:48.000000000 -0400
++++ kdenetwork-3.4.1/configure.in	2005-05-24 13:38:38.000000000 -0400
 @@ -42,6 +42,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
  AM_INIT_AUTOMAKE(kdenetwork, "3.4.1") dnl searches for some needed programs
@@ -7771,7 +7794,30 @@
  KDE_SET_PREFIX
  
  dnl generate the config header
-@@ -767,7 +769,7 @@
+@@ -503,8 +505,20 @@
+ 	int main()
+ 	{
+ #if defined __GG_LIBGADU_HAVE_PTHREAD && defined GG_LOGIN60
+-		int maj, min, date;
+-		sscanf( gg_libgadu_version(), "%u.%u.%u", &maj,&min,&date );
++		int maj, min, date, items;
++		const char *libgadu_version = gg_libgadu_version();
++
++		items = sscanf( libgadu_version, "%u.%u.%u", &maj,&min,&date );
++
++		if ( items != 3 ) { /* version in YYYYDDMM format only */
++			sscanf( libgadu_version, "%u", &date );
++
++			if ( date < 20040520 )
++				return 1;
++			else
++				return 0;
++		}
++
+ 		if ( maj != 1 ) {
+ 			return 1;
+ 		}
+@@ -767,7 +781,7 @@
  
  KDE_CHECK_HEADER(X11/extensions/xf86vmode.h, [
  	AC_DEFINE(HAVE_VIDMODE_EXTENSION, 1, [defined if XFree86's VidMode extension is supported])
@@ -7780,9 +7826,9 @@
  ], ,
  [
  #include <X11/Xlib.h>
-diff -Nrua kdenetwork-3.4.1.orig/dcoprss/Makefile.in kdenetwork-3.4.1/dcoprss/Makefile.in
---- kdenetwork-3.4.1.orig/dcoprss/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/dcoprss/Makefile.in	2005-05-24 17:07:05.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/dcoprss/Makefile.in kdenetwork-3.4.1/dcoprss/Makefile.in
+--- kdenetwork-3.4.1.orig/dcoprss/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/dcoprss/Makefile.in	2005-05-24 13:47:07.000000000 -0400
 @@ -259,6 +259,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -7814,9 +7860,52 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/doc/kcontrol/kcmktalkd/Makefile.in kdenetwork-3.4.1/doc/kcontrol/kcmktalkd/Makefile.in
---- kdenetwork-3.4.1.orig/doc/kcontrol/kcmktalkd/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/doc/kcontrol/kcmktalkd/Makefile.in	2005-05-24 17:07:05.000000000 +0200
+@@ -810,18 +813,18 @@
+ mocs: feedbrowser.moc
+ 
+ #>+ 3
+-query.moc: $(srcdir)/query.h
+-	$(MOC) $(srcdir)/query.h -o query.moc
++xmlrpciface.moc: $(srcdir)/xmlrpciface.h
++	$(MOC) $(srcdir)/xmlrpciface.h -o xmlrpciface.moc
+ 
+ #>+ 2
+-mocs: query.moc
++mocs: xmlrpciface.moc
+ 
+ #>+ 3
+-xmlrpciface.moc: $(srcdir)/xmlrpciface.h
+-	$(MOC) $(srcdir)/xmlrpciface.h -o xmlrpciface.moc
++query.moc: $(srcdir)/query.h
++	$(MOC) $(srcdir)/query.h -o query.moc
+ 
+ #>+ 2
+-mocs: xmlrpciface.moc
++mocs: query.moc
+ 
+ #>+ 3
+ service.moc: $(srcdir)/service.h
+@@ -842,7 +845,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  feedbrowser.moc query.moc xmlrpciface.moc service.moc
++	-rm -f  feedbrowser.moc xmlrpciface.moc query.moc service.moc
+ 
+ #>+ 2
+ KDE_DIST=Makefile.in rssnewsfeed.h rssservice.desktop feedbrowser.h Makefile.am test.sh 
+@@ -908,7 +911,7 @@
+ 	rm -f feedbrowser.all_cpp.final feedbrowser.all_cpp.files
+ 
+ #>+ 11
+-rssservice.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/service.cpp $(srcdir)/query.cpp $(srcdir)/document.cpp $(srcdir)/article.cpp $(srcdir)/xmlrpciface.cpp $(srcdir)/cache.cpp query_skel.cpp service_skel.cpp  xmlrpciface.moc query.moc service.moc
++rssservice.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/service.cpp $(srcdir)/query.cpp $(srcdir)/document.cpp $(srcdir)/article.cpp $(srcdir)/xmlrpciface.cpp $(srcdir)/cache.cpp query_skel.cpp service_skel.cpp  query.moc xmlrpciface.moc service.moc
+ 	@echo 'creating rssservice.all_cpp.cpp ...'; \
+ 	rm -f rssservice.all_cpp.files rssservice.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> rssservice.all_cpp.final; \
+diff -Nru kdenetwork-3.4.1.orig/doc/kcontrol/kcmktalkd/Makefile.in kdenetwork-3.4.1/doc/kcontrol/kcmktalkd/Makefile.in
+--- kdenetwork-3.4.1.orig/doc/kcontrol/kcmktalkd/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/doc/kcontrol/kcmktalkd/Makefile.in	2005-05-24 13:47:07.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -7848,9 +7937,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/doc/kcontrol/lanbrowser/Makefile.in kdenetwork-3.4.1/doc/kcontrol/lanbrowser/Makefile.in
---- kdenetwork-3.4.1.orig/doc/kcontrol/lanbrowser/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/doc/kcontrol/lanbrowser/Makefile.in	2005-05-24 17:07:05.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/doc/kcontrol/lanbrowser/Makefile.in kdenetwork-3.4.1/doc/kcontrol/lanbrowser/Makefile.in
+--- kdenetwork-3.4.1.orig/doc/kcontrol/lanbrowser/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/doc/kcontrol/lanbrowser/Makefile.in	2005-05-24 13:47:07.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -7882,9 +7971,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/doc/kcontrol/Makefile.in kdenetwork-3.4.1/doc/kcontrol/Makefile.in
---- kdenetwork-3.4.1.orig/doc/kcontrol/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/doc/kcontrol/Makefile.in	2005-05-24 17:07:05.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/doc/kcontrol/Makefile.in kdenetwork-3.4.1/doc/kcontrol/Makefile.in
+--- kdenetwork-3.4.1.orig/doc/kcontrol/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/doc/kcontrol/Makefile.in	2005-05-24 13:47:07.000000000 -0400
 @@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -7895,6 +7984,15 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
+@@ -392,7 +395,7 @@
+ xdg_menudir = @xdg_menudir@
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+-SUBDIRS =. kcmktalkd lanbrowser
++SUBDIRS =. lanbrowser kcmktalkd
+ KDE_LANG = en
+ KDE_DOCS = AUTO
+ #>- all: all-recursive
 @@ -400,7 +403,7 @@
  all: docs-am  all-recursive
  
@@ -7916,9 +8014,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/doc/kdict/Makefile.in kdenetwork-3.4.1/doc/kdict/Makefile.in
---- kdenetwork-3.4.1.orig/doc/kdict/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/doc/kdict/Makefile.in	2005-05-24 17:07:05.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/doc/kdict/Makefile.in kdenetwork-3.4.1/doc/kdict/Makefile.in
+--- kdenetwork-3.4.1.orig/doc/kdict/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/doc/kdict/Makefile.in	2005-05-24 13:47:07.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -7950,9 +8048,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/doc/kget/Makefile.in kdenetwork-3.4.1/doc/kget/Makefile.in
---- kdenetwork-3.4.1.orig/doc/kget/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/doc/kget/Makefile.in	2005-05-24 17:07:05.000000000 +0200
+@@ -569,7 +572,7 @@
+ KDE_DIST=Makefile.in applet.png seteditor.png index.docbook mainwin.png Makefile.am conf.png index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) seteditor.png mainwin.png index.docbook applet.png conf.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) seteditor.png conf.png mainwin.png applet.png index.docbook 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -596,20 +599,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdict
+-	@for base in seteditor.png mainwin.png index.docbook applet.png conf.png ; do \
++	@for base in seteditor.png conf.png mainwin.png applet.png index.docbook ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdict/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdict/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in seteditor.png mainwin.png index.docbook applet.png conf.png ; do \
++	for base in seteditor.png conf.png mainwin.png applet.png index.docbook ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdict/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in seteditor.png mainwin.png index.docbook applet.png conf.png ; do \
++	for file in seteditor.png conf.png mainwin.png applet.png index.docbook ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nru kdenetwork-3.4.1.orig/doc/kget/Makefile.in kdenetwork-3.4.1/doc/kget/Makefile.in
+--- kdenetwork-3.4.1.orig/doc/kget/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/doc/kget/Makefile.in	2005-05-24 13:47:07.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -7984,9 +8115,46 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/doc/knewsticker/Makefile.in kdenetwork-3.4.1/doc/knewsticker/Makefile.in
---- kdenetwork-3.4.1.orig/doc/knewsticker/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/doc/knewsticker/Makefile.in	2005-05-24 17:07:05.000000000 +0200
+@@ -566,10 +569,10 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=cr22-action-tool_paste.png cr22-action-tool_shutdown.png cr22-action-tool_expert.png kget1.png fileopen.png cr22-action-tool_delay.png Makefile.in cr22-action-tool_delete.png cr22-action-tool_logwindow.png cr22-action-tool_resume.png kget5.png cr22-action-tool_offline_mode_off.png cr22-action-tool_uselastdir.png kget3.png index.docbook cr22-action-tool_offline_mode_on.png cr22-action-tool_drop_target.png cr22-action-tool_pause.png cr22-action-tool_restart.png cr22-action-tool_timer.png cr22-action-tool_queue.png cr22-action-tool_disconnect.png Makefile.am kget4.png kget2.png index.cache.bz2 
++KDE_DIST=fileopen.png kget1.png cr22-action-tool_expert.png cr22-action-tool_paste.png cr22-action-tool_shutdown.png cr22-action-tool_delay.png Makefile.in cr22-action-tool_delete.png cr22-action-tool_logwindow.png cr22-action-tool_uselastdir.png kget5.png cr22-action-tool_resume.png cr22-action-tool_offline_mode_off.png kget3.png index.docbook cr22-action-tool_offline_mode_on.png cr22-action-tool_drop_target.png cr22-action-tool_pause.png cr22-action-tool_restart.png cr22-action-tool_timer.png cr22-action-tool_queue.png cr22-action-tool_disconnect.png kget4.png Makefile.am kget2.png index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) cr22-action-tool_offline_mode_on.png cr22-action-tool_uselastdir.png cr22-action-tool_timer.png index.docbook fileopen.png cr22-action-tool_offline_mode_off.png cr22-action-tool_disconnect.png cr22-action-tool_restart.png cr22-action-tool_queue.png kget1.png kget2.png kget3.png cr22-action-tool_delay.png kget4.png kget5.png cr22-action-tool_resume.png cr22-action-tool_delete.png cr22-action-tool_expert.png cr22-action-tool_logwindow.png cr22-action-tool_drop_target.png cr22-action-tool_shutdown.png cr22-action-tool_paste.png cr22-action-tool_pause.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) cr22-action-tool_offline_mode_on.png cr22-action-tool_offline_mode_off.png cr22-action-tool_delete.png cr22-action-tool_logwindow.png cr22-action-tool_resume.png cr22-action-tool_shutdown.png cr22-action-tool_timer.png cr22-action-tool_paste.png cr22-action-tool_disconnect.png cr22-action-tool_restart.png cr22-action-tool_delay.png cr22-action-tool_pause.png cr22-action-tool_expert.png cr22-action-tool_drop_target.png kget1.png kget2.png kget3.png kget4.png kget5.png fileopen.png index.docbook cr22-action-tool_uselastdir.png cr22-action-tool_queue.png 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -596,20 +599,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kget
+-	@for base in cr22-action-tool_offline_mode_on.png cr22-action-tool_uselastdir.png cr22-action-tool_timer.png index.docbook fileopen.png cr22-action-tool_offline_mode_off.png cr22-action-tool_disconnect.png cr22-action-tool_restart.png cr22-action-tool_queue.png kget1.png kget2.png kget3.png cr22-action-tool_delay.png kget4.png kget5.png cr22-action-tool_resume.png cr22-action-tool_delete.png cr22-action-tool_expert.png cr22-action-tool_logwindow.png cr22-action-tool_drop_target.png cr22-action-tool_shutdown.png cr22-action-tool_paste.png cr22-action-tool_pause.png ; do \
++	@for base in cr22-action-tool_offline_mode_on.png cr22-action-tool_offline_mode_off.png cr22-action-tool_delete.png cr22-action-tool_logwindow.png cr22-action-tool_resume.png cr22-action-tool_shutdown.png cr22-action-tool_timer.png cr22-action-tool_paste.png cr22-action-tool_disconnect.png cr22-action-tool_restart.png cr22-action-tool_delay.png cr22-action-tool_pause.png cr22-action-tool_expert.png cr22-action-tool_drop_target.png kget1.png kget2.png kget3.png kget4.png kget5.png fileopen.png index.docbook cr22-action-tool_uselastdir.png cr22-action-tool_queue.png ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kget/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kget/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in cr22-action-tool_offline_mode_on.png cr22-action-tool_uselastdir.png cr22-action-tool_timer.png index.docbook fileopen.png cr22-action-tool_offline_mode_off.png cr22-action-tool_disconnect.png cr22-action-tool_restart.png cr22-action-tool_queue.png kget1.png kget2.png kget3.png cr22-action-tool_delay.png kget4.png kget5.png cr22-action-tool_resume.png cr22-action-tool_delete.png cr22-action-tool_expert.png cr22-action-tool_logwindow.png cr22-action-tool_drop_target.png cr22-action-tool_shutdown.png cr22-action-tool_paste.png cr22-action-tool_pause.png ; do \
++	for base in cr22-action-tool_offline_mode_on.png cr22-action-tool_offline_mode_off.png cr22-action-tool_delete.png cr22-action-tool_logwindow.png cr22-action-tool_resume.png cr22-action-tool_shutdown.png cr22-action-tool_timer.png cr22-action-tool_paste.png cr22-action-tool_disconnect.png cr22-action-tool_restart.png cr22-action-tool_delay.png cr22-action-tool_pause.png cr22-action-tool_expert.png cr22-action-tool_drop_target.png kget1.png kget2.png kget3.png kget4.png kget5.png fileopen.png index.docbook cr22-action-tool_uselastdir.png cr22-action-tool_queue.png ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kget/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in cr22-action-tool_offline_mode_on.png cr22-action-tool_uselastdir.png cr22-action-tool_timer.png index.docbook fileopen.png cr22-action-tool_offline_mode_off.png cr22-action-tool_disconnect.png cr22-action-tool_restart.png cr22-action-tool_queue.png kget1.png kget2.png kget3.png cr22-action-tool_delay.png kget4.png kget5.png cr22-action-tool_resume.png cr22-action-tool_delete.png cr22-action-tool_expert.png cr22-action-tool_logwindow.png cr22-action-tool_drop_target.png cr22-action-tool_shutdown.png cr22-action-tool_paste.png cr22-action-tool_pause.png ; do \
++	for file in cr22-action-tool_offline_mode_on.png cr22-action-tool_offline_mode_off.png cr22-action-tool_delete.png cr22-action-tool_logwindow.png cr22-action-tool_resume.png cr22-action-tool_shutdown.png cr22-action-tool_timer.png cr22-action-tool_paste.png cr22-action-tool_disconnect.png cr22-action-tool_restart.png cr22-action-tool_delay.png cr22-action-tool_pause.png cr22-action-tool_expert.png cr22-action-tool_drop_target.png kget1.png kget2.png kget3.png kget4.png kget5.png fileopen.png index.docbook cr22-action-tool_uselastdir.png cr22-action-tool_queue.png ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nru kdenetwork-3.4.1.orig/doc/knewsticker/Makefile.in kdenetwork-3.4.1/doc/knewsticker/Makefile.in
+--- kdenetwork-3.4.1.orig/doc/knewsticker/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/doc/knewsticker/Makefile.in	2005-05-24 13:47:07.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -8018,9 +8186,46 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/doc/kopete/Makefile.in kdenetwork-3.4.1/doc/kopete/Makefile.in
---- kdenetwork-3.4.1.orig/doc/kopete/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/doc/kopete/Makefile.in	2005-05-24 17:07:05.000000000 +0200
+@@ -566,10 +569,10 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=Makefile.in kcmnewsticker-newssources.png kcontrol-icon.png about-icon.png newssite-icon.png knewsticker-childpanel.png knewsticker-icon.png knewsticker-kicker.png index.docbook checknews-icon.png kcmnewsticker-scrollerprefs.png preferences-icon.png kcmnewsticker-newssitedialog.png newarticle-icon.png kcmnewsticker-filters.png help-icon.png contextmenu.png kcmnewsticker-general.png Makefile.am index.cache.bz2 knewsticker-ownwindow.png oldarticle-icon.png 
++KDE_DIST=kcmnewsticker-newssources.png Makefile.in kcontrol-icon.png about-icon.png newssite-icon.png knewsticker-childpanel.png knewsticker-icon.png knewsticker-kicker.png index.docbook kcmnewsticker-scrollerprefs.png checknews-icon.png preferences-icon.png kcmnewsticker-newssitedialog.png kcmnewsticker-filters.png newarticle-icon.png help-icon.png contextmenu.png kcmnewsticker-general.png Makefile.am oldarticle-icon.png index.cache.bz2 knewsticker-ownwindow.png 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) TODO kcmnewsticker-scrollerprefs.png knewsticker-kicker.png checknews-icon.png about-icon.png index.docbook oldarticle-icon.png contextmenu.png help-icon.png knewsticker-icon.png kcmnewsticker-filters.png kcontrol-icon.png kcmnewsticker-newssources.png knewsticker-ownwindow.png newarticle-icon.png kcmnewsticker-general.png newssite-icon.png preferences-icon.png kcmnewsticker-newssitedialog.png knewsticker-childpanel.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) TODO knewsticker-icon.png kcontrol-icon.png contextmenu.png checknews-icon.png newssite-icon.png newarticle-icon.png knewsticker-kicker.png knewsticker-ownwindow.png kcmnewsticker-filters.png preferences-icon.png about-icon.png kcmnewsticker-scrollerprefs.png knewsticker-childpanel.png kcmnewsticker-newssitedialog.png oldarticle-icon.png help-icon.png index.docbook kcmnewsticker-general.png kcmnewsticker-newssources.png 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -596,20 +599,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/knewsticker
+-	@for base in TODO kcmnewsticker-scrollerprefs.png knewsticker-kicker.png checknews-icon.png about-icon.png index.docbook oldarticle-icon.png contextmenu.png help-icon.png knewsticker-icon.png kcmnewsticker-filters.png kcontrol-icon.png kcmnewsticker-newssources.png knewsticker-ownwindow.png newarticle-icon.png kcmnewsticker-general.png newssite-icon.png preferences-icon.png kcmnewsticker-newssitedialog.png knewsticker-childpanel.png ; do \
++	@for base in TODO knewsticker-icon.png kcontrol-icon.png contextmenu.png checknews-icon.png newssite-icon.png newarticle-icon.png knewsticker-kicker.png knewsticker-ownwindow.png kcmnewsticker-filters.png preferences-icon.png about-icon.png kcmnewsticker-scrollerprefs.png knewsticker-childpanel.png kcmnewsticker-newssitedialog.png oldarticle-icon.png help-icon.png index.docbook kcmnewsticker-general.png kcmnewsticker-newssources.png ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/knewsticker/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/knewsticker/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in TODO kcmnewsticker-scrollerprefs.png knewsticker-kicker.png checknews-icon.png about-icon.png index.docbook oldarticle-icon.png contextmenu.png help-icon.png knewsticker-icon.png kcmnewsticker-filters.png kcontrol-icon.png kcmnewsticker-newssources.png knewsticker-ownwindow.png newarticle-icon.png kcmnewsticker-general.png newssite-icon.png preferences-icon.png kcmnewsticker-newssitedialog.png knewsticker-childpanel.png ; do \
++	for base in TODO knewsticker-icon.png kcontrol-icon.png contextmenu.png checknews-icon.png newssite-icon.png newarticle-icon.png knewsticker-kicker.png knewsticker-ownwindow.png kcmnewsticker-filters.png preferences-icon.png about-icon.png kcmnewsticker-scrollerprefs.png knewsticker-childpanel.png kcmnewsticker-newssitedialog.png oldarticle-icon.png help-icon.png index.docbook kcmnewsticker-general.png kcmnewsticker-newssources.png ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/knewsticker/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in TODO kcmnewsticker-scrollerprefs.png knewsticker-kicker.png checknews-icon.png about-icon.png index.docbook oldarticle-icon.png contextmenu.png help-icon.png knewsticker-icon.png kcmnewsticker-filters.png kcontrol-icon.png kcmnewsticker-newssources.png knewsticker-ownwindow.png newarticle-icon.png kcmnewsticker-general.png newssite-icon.png preferences-icon.png kcmnewsticker-newssitedialog.png knewsticker-childpanel.png ; do \
++	for file in TODO knewsticker-icon.png kcontrol-icon.png contextmenu.png checknews-icon.png newssite-icon.png newarticle-icon.png knewsticker-kicker.png knewsticker-ownwindow.png kcmnewsticker-filters.png preferences-icon.png about-icon.png kcmnewsticker-scrollerprefs.png knewsticker-childpanel.png kcmnewsticker-newssitedialog.png oldarticle-icon.png help-icon.png index.docbook kcmnewsticker-general.png kcmnewsticker-newssources.png ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nru kdenetwork-3.4.1.orig/doc/kopete/Makefile.in kdenetwork-3.4.1/doc/kopete/Makefile.in
+--- kdenetwork-3.4.1.orig/doc/kopete/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/doc/kopete/Makefile.in	2005-05-24 13:47:07.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -8052,9 +8257,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/doc/kpf/Makefile.in kdenetwork-3.4.1/doc/kpf/Makefile.in
---- kdenetwork-3.4.1.orig/doc/kpf/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/doc/kpf/Makefile.in	2005-05-24 17:07:05.000000000 +0200
+@@ -569,7 +572,7 @@
+ KDE_DIST=Makefile.in index.docbook menus.docbook Makefile.am index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook menus.docbook 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) menus.docbook index.docbook 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -596,20 +599,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kopete
+-	@for base in index.docbook menus.docbook ; do \
++	@for base in menus.docbook index.docbook ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kopete/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kopete/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in index.docbook menus.docbook ; do \
++	for base in menus.docbook index.docbook ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kopete/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in index.docbook menus.docbook ; do \
++	for file in menus.docbook index.docbook ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nru kdenetwork-3.4.1.orig/doc/kpf/Makefile.in kdenetwork-3.4.1/doc/kpf/Makefile.in
+--- kdenetwork-3.4.1.orig/doc/kpf/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/doc/kpf/Makefile.in	2005-05-24 13:47:07.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -8086,9 +8324,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/doc/kppp/Makefile.in kdenetwork-3.4.1/doc/kppp/Makefile.in
---- kdenetwork-3.4.1.orig/doc/kppp/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/doc/kppp/Makefile.in	2005-05-24 17:07:05.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/doc/kppp/Makefile.in kdenetwork-3.4.1/doc/kppp/Makefile.in
+--- kdenetwork-3.4.1.orig/doc/kppp/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/doc/kppp/Makefile.in	2005-05-24 13:47:07.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -8120,9 +8358,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/doc/krdc/Makefile.in kdenetwork-3.4.1/doc/krdc/Makefile.in
---- kdenetwork-3.4.1.orig/doc/krdc/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/doc/krdc/Makefile.in	2005-05-24 17:07:05.000000000 +0200
+@@ -569,7 +572,7 @@
+ KDE_DIST=kppp-account-ip-tab.png callback.docbook kppp-faq.docbook kppp-account-login-script-tab.png getting-online.docbook kppp-account-dns-tab.png kppp-misc-tab.png kppp-wizard.png index.docbook kppp-graph-tab.png kppp-modem-tab.png dialog-setup.docbook global-settings.docbook accounting.docbook costsgraphs.png chap.docbook wizard.docbook kppp-account-dial-tab.png ttyS-cua.txt Makefile.in kppp-config.png kppp.faq.question kppp-account-gateway-tab.png tricks.docbook hayes.docbook kppp-dialler-tab.png kppp-device-tab.png security.docbook kppp-account-accounting-tab.png Makefile.am costsgraphs.fig kppp-account-execute-tab.png index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kppp.faq.question wizard.docbook costsgraphs.png ttyS-cua.txt kppp-account-accounting-tab.png index.docbook kppp-misc-tab.png security.docbook hayes.docbook chap.docbook kppp-account-gateway-tab.png kppp-account-execute-tab.png kppp-wizard.png kppp-device-tab.png kppp-faq.docbook kppp-config.png kppp-graph-tab.png kppp-modem-tab.png kppp-account-ip-tab.png kppp-account-dial-tab.png getting-online.docbook costsgraphs.fig callback.docbook kppp-account-login-script-tab.png accounting.docbook kppp-dialler-tab.png dialog-setup.docbook kppp-account-dns-tab.png global-settings.docbook tricks.docbook 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) security.docbook kppp-device-tab.png kppp-account-login-script-tab.png wizard.docbook kppp-account-dns-tab.png ttyS-cua.txt getting-online.docbook costsgraphs.fig costsgraphs.png kppp-account-execute-tab.png kppp-modem-tab.png kppp-graph-tab.png chap.docbook kppp-config.png hayes.docbook kppp-faq.docbook kppp.faq.question dialog-setup.docbook kppp-dialler-tab.png kppp-misc-tab.png kppp-account-gateway-tab.png index.docbook kppp-wizard.png kppp-account-accounting-tab.png kppp-account-ip-tab.png global-settings.docbook accounting.docbook callback.docbook tricks.docbook kppp-account-dial-tab.png 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -596,20 +599,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kppp
+-	@for base in kppp.faq.question wizard.docbook costsgraphs.png ttyS-cua.txt kppp-account-accounting-tab.png index.docbook kppp-misc-tab.png security.docbook hayes.docbook chap.docbook kppp-account-gateway-tab.png kppp-account-execute-tab.png kppp-wizard.png kppp-device-tab.png kppp-faq.docbook kppp-config.png kppp-graph-tab.png kppp-modem-tab.png kppp-account-ip-tab.png kppp-account-dial-tab.png getting-online.docbook costsgraphs.fig callback.docbook kppp-account-login-script-tab.png accounting.docbook kppp-dialler-tab.png dialog-setup.docbook kppp-account-dns-tab.png global-settings.docbook tricks.docbook ; do \
++	@for base in security.docbook kppp-device-tab.png kppp-account-login-script-tab.png wizard.docbook kppp-account-dns-tab.png ttyS-cua.txt getting-online.docbook costsgraphs.fig costsgraphs.png kppp-account-execute-tab.png kppp-modem-tab.png kppp-graph-tab.png chap.docbook kppp-config.png hayes.docbook kppp-faq.docbook kppp.faq.question dialog-setup.docbook kppp-dialler-tab.png kppp-misc-tab.png kppp-account-gateway-tab.png index.docbook kppp-wizard.png kppp-account-accounting-tab.png kppp-account-ip-tab.png global-settings.docbook accounting.docbook callback.docbook tricks.docbook kppp-account-dial-tab.png ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kppp/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kppp/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in kppp.faq.question wizard.docbook costsgraphs.png ttyS-cua.txt kppp-account-accounting-tab.png index.docbook kppp-misc-tab.png security.docbook hayes.docbook chap.docbook kppp-account-gateway-tab.png kppp-account-execute-tab.png kppp-wizard.png kppp-device-tab.png kppp-faq.docbook kppp-config.png kppp-graph-tab.png kppp-modem-tab.png kppp-account-ip-tab.png kppp-account-dial-tab.png getting-online.docbook costsgraphs.fig callback.docbook kppp-account-login-script-tab.png accounting.docbook kppp-dialler-tab.png dialog-setup.docbook kppp-account-dns-tab.png global-settings.docbook tricks.docbook ; do \
++	for base in security.docbook kppp-device-tab.png kppp-account-login-script-tab.png wizard.docbook kppp-account-dns-tab.png ttyS-cua.txt getting-online.docbook costsgraphs.fig costsgraphs.png kppp-account-execute-tab.png kppp-modem-tab.png kppp-graph-tab.png chap.docbook kppp-config.png hayes.docbook kppp-faq.docbook kppp.faq.question dialog-setup.docbook kppp-dialler-tab.png kppp-misc-tab.png kppp-account-gateway-tab.png index.docbook kppp-wizard.png kppp-account-accounting-tab.png kppp-account-ip-tab.png global-settings.docbook accounting.docbook callback.docbook tricks.docbook kppp-account-dial-tab.png ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kppp/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in kppp.faq.question wizard.docbook costsgraphs.png ttyS-cua.txt kppp-account-accounting-tab.png index.docbook kppp-misc-tab.png security.docbook hayes.docbook chap.docbook kppp-account-gateway-tab.png kppp-account-execute-tab.png kppp-wizard.png kppp-device-tab.png kppp-faq.docbook kppp-config.png kppp-graph-tab.png kppp-modem-tab.png kppp-account-ip-tab.png kppp-account-dial-tab.png getting-online.docbook costsgraphs.fig callback.docbook kppp-account-login-script-tab.png accounting.docbook kppp-dialler-tab.png dialog-setup.docbook kppp-account-dns-tab.png global-settings.docbook tricks.docbook ; do \
++	for file in security.docbook kppp-device-tab.png kppp-account-login-script-tab.png wizard.docbook kppp-account-dns-tab.png ttyS-cua.txt getting-online.docbook costsgraphs.fig costsgraphs.png kppp-account-execute-tab.png kppp-modem-tab.png kppp-graph-tab.png chap.docbook kppp-config.png hayes.docbook kppp-faq.docbook kppp.faq.question dialog-setup.docbook kppp-dialler-tab.png kppp-misc-tab.png kppp-account-gateway-tab.png index.docbook kppp-wizard.png kppp-account-accounting-tab.png kppp-account-ip-tab.png global-settings.docbook accounting.docbook callback.docbook tricks.docbook kppp-account-dial-tab.png ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nru kdenetwork-3.4.1.orig/doc/krdc/Makefile.in kdenetwork-3.4.1/doc/krdc/Makefile.in
+--- kdenetwork-3.4.1.orig/doc/krdc/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/doc/krdc/Makefile.in	2005-05-24 13:47:07.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -8154,9 +8425,46 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/doc/krfb/Makefile.in kdenetwork-3.4.1/doc/krfb/Makefile.in
---- kdenetwork-3.4.1.orig/doc/krfb/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/doc/krfb/Makefile.in	2005-05-24 17:07:05.000000000 +0200
+@@ -566,10 +569,10 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=snapshot.png preferences_profilestab.eps krdc_window.png preferences_rdpdefaultstab.eps snapshot_vncentry.png authentication.eps snapshot_nobrowse.eps preferences_vncdefaultstab.png snapshot.eps index.docbook preferences_vncdefaultstab.eps krdc_window.eps preferences_profilestab.png preferences_rdpdefaultstab.png Makefile.in window_nofullscreen.png snapshot_nobrowse.png authentication.png snapshot_vncentry.eps snapshot_connectionspeed.png window_fullscreen.png Makefile.am close.png snapshot_connectionspeed.eps index.cache.bz2 
++KDE_DIST=snapshot.png preferences_profilestab.eps krdc_window.png preferences_rdpdefaultstab.eps snapshot_vncentry.png snapshot_nobrowse.eps authentication.eps preferences_vncdefaultstab.png snapshot.eps index.docbook preferences_vncdefaultstab.eps krdc_window.eps preferences_profilestab.png preferences_rdpdefaultstab.png Makefile.in window_nofullscreen.png snapshot_nobrowse.png authentication.png snapshot_vncentry.eps snapshot_connectionspeed.png window_fullscreen.png Makefile.am close.png snapshot_connectionspeed.eps index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) preferences_rdpdefaultstab.png preferences_profilestab.eps snapshot.png snapshot_connectionspeed.png snapshot_connectionspeed.eps snapshot.eps index.docbook close.png krdc_window.png krdc_window.eps snapshot_nobrowse.png authentication.png snapshot_nobrowse.eps authentication.eps preferences_vncdefaultstab.png preferences_profilestab.png window_nofullscreen.png snapshot_vncentry.png window_fullscreen.png preferences_rdpdefaultstab.eps preferences_vncdefaultstab.eps snapshot_vncentry.eps 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) window_nofullscreen.png krdc_window.eps krdc_window.png snapshot_vncentry.eps snapshot_vncentry.png preferences_vncdefaultstab.eps preferences_vncdefaultstab.png snapshot_connectionspeed.eps snapshot_connectionspeed.png snapshot.eps snapshot.png window_fullscreen.png close.png authentication.eps authentication.png preferences_rdpdefaultstab.eps preferences_rdpdefaultstab.png index.docbook snapshot_nobrowse.eps snapshot_nobrowse.png preferences_profilestab.eps preferences_profilestab.png 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -596,20 +599,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krdc
+-	@for base in preferences_rdpdefaultstab.png preferences_profilestab.eps snapshot.png snapshot_connectionspeed.png snapshot_connectionspeed.eps snapshot.eps index.docbook close.png krdc_window.png krdc_window.eps snapshot_nobrowse.png authentication.png snapshot_nobrowse.eps authentication.eps preferences_vncdefaultstab.png preferences_profilestab.png window_nofullscreen.png snapshot_vncentry.png window_fullscreen.png preferences_rdpdefaultstab.eps preferences_vncdefaultstab.eps snapshot_vncentry.eps ; do \
++	@for base in window_nofullscreen.png krdc_window.eps krdc_window.png snapshot_vncentry.eps snapshot_vncentry.png preferences_vncdefaultstab.eps preferences_vncdefaultstab.png snapshot_connectionspeed.eps snapshot_connectionspeed.png snapshot.eps snapshot.png window_fullscreen.png close.png authentication.eps authentication.png preferences_rdpdefaultstab.eps preferences_rdpdefaultstab.png index.docbook snapshot_nobrowse.eps snapshot_nobrowse.png preferences_profilestab.eps preferences_profilestab.png ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krdc/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krdc/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in preferences_rdpdefaultstab.png preferences_profilestab.eps snapshot.png snapshot_connectionspeed.png snapshot_connectionspeed.eps snapshot.eps index.docbook close.png krdc_window.png krdc_window.eps snapshot_nobrowse.png authentication.png snapshot_nobrowse.eps authentication.eps preferences_vncdefaultstab.png preferences_profilestab.png window_nofullscreen.png snapshot_vncentry.png window_fullscreen.png preferences_rdpdefaultstab.eps preferences_vncdefaultstab.eps snapshot_vncentry.eps ; do \
++	for base in window_nofullscreen.png krdc_window.eps krdc_window.png snapshot_vncentry.eps snapshot_vncentry.png preferences_vncdefaultstab.eps preferences_vncdefaultstab.png snapshot_connectionspeed.eps snapshot_connectionspeed.png snapshot.eps snapshot.png window_fullscreen.png close.png authentication.eps authentication.png preferences_rdpdefaultstab.eps preferences_rdpdefaultstab.png index.docbook snapshot_nobrowse.eps snapshot_nobrowse.png preferences_profilestab.eps preferences_profilestab.png ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krdc/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in preferences_rdpdefaultstab.png preferences_profilestab.eps snapshot.png snapshot_connectionspeed.png snapshot_connectionspeed.eps snapshot.eps index.docbook close.png krdc_window.png krdc_window.eps snapshot_nobrowse.png authentication.png snapshot_nobrowse.eps authentication.eps preferences_vncdefaultstab.png preferences_profilestab.png window_nofullscreen.png snapshot_vncentry.png window_fullscreen.png preferences_rdpdefaultstab.eps preferences_vncdefaultstab.eps snapshot_vncentry.eps ; do \
++	for file in window_nofullscreen.png krdc_window.eps krdc_window.png snapshot_vncentry.eps snapshot_vncentry.png preferences_vncdefaultstab.eps preferences_vncdefaultstab.png snapshot_connectionspeed.eps snapshot_connectionspeed.png snapshot.eps snapshot.png window_fullscreen.png close.png authentication.eps authentication.png preferences_rdpdefaultstab.eps preferences_rdpdefaultstab.png index.docbook snapshot_nobrowse.eps snapshot_nobrowse.png preferences_profilestab.eps preferences_profilestab.png ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nru kdenetwork-3.4.1.orig/doc/krfb/Makefile.in kdenetwork-3.4.1/doc/krfb/Makefile.in
+--- kdenetwork-3.4.1.orig/doc/krfb/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/doc/krfb/Makefile.in	2005-05-24 13:47:07.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -8188,9 +8496,46 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/doc/ksirc/Makefile.in kdenetwork-3.4.1/doc/ksirc/Makefile.in
---- kdenetwork-3.4.1.orig/doc/ksirc/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/doc/ksirc/Makefile.in	2005-05-24 17:07:05.000000000 +0200
+@@ -566,10 +569,10 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=screenshot.png connection.eps configuration_network.png invitation_management.eps invitation_management.png configuration_access.png index.docbook personal_invitation.eps configuration_session.png configuration_session.eps configuration_network.eps Makefile.in configuration_access.eps screenshot.eps email_invitation.eps personal_invitation.png email_invitation.png Makefile.am connection.png index.cache.bz2 
++KDE_DIST=screenshot.png connection.eps configuration_network.png invitation_management.eps invitation_management.png index.docbook configuration_access.png personal_invitation.eps configuration_session.png configuration_session.eps configuration_network.eps Makefile.in configuration_access.eps screenshot.eps email_invitation.eps personal_invitation.png email_invitation.png Makefile.am connection.png index.cache.bz2 
+ 
+ #>+ 24
+-index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) personal_invitation.png email_invitation.eps connection.png connection.eps index.docbook screenshot.png configuration_session.png configuration_session.eps screenshot.eps invitation_management.png configuration_network.png invitation_management.eps configuration_network.eps configuration_access.png personal_invitation.eps email_invitation.png configuration_access.eps 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) configuration_session.eps configuration_session.png screenshot.eps screenshot.png personal_invitation.eps personal_invitation.png configuration_network.eps configuration_network.png email_invitation.eps email_invitation.png invitation_management.eps invitation_management.png configuration_access.eps configuration_access.png index.docbook connection.eps connection.png 
+ 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
+ 
+ docs-am: index.cache.bz2
+@@ -596,20 +599,20 @@
+ #>+ 13
+ install-nls:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krfb
+-	@for base in personal_invitation.png email_invitation.eps connection.png connection.eps index.docbook screenshot.png configuration_session.png configuration_session.eps screenshot.eps invitation_management.png configuration_network.png invitation_management.eps configuration_network.eps configuration_access.png personal_invitation.eps email_invitation.png configuration_access.eps ; do \
++	@for base in configuration_session.eps configuration_session.png screenshot.eps screenshot.png personal_invitation.eps personal_invitation.png configuration_network.eps configuration_network.png email_invitation.eps email_invitation.png invitation_management.eps invitation_management.png configuration_access.eps configuration_access.png index.docbook connection.eps connection.png ; do \
+ 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krfb/$$base ;\
+ 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krfb/$$base ;\
+ 	done
+ 
+ uninstall-nls:
+-	for base in personal_invitation.png email_invitation.eps connection.png connection.eps index.docbook screenshot.png configuration_session.png configuration_session.eps screenshot.eps invitation_management.png configuration_network.png invitation_management.eps configuration_network.eps configuration_access.png personal_invitation.eps email_invitation.png configuration_access.eps ; do \
++	for base in configuration_session.eps configuration_session.png screenshot.eps screenshot.png personal_invitation.eps personal_invitation.png configuration_network.eps configuration_network.png email_invitation.eps email_invitation.png invitation_management.eps invitation_management.png configuration_access.eps configuration_access.png index.docbook connection.eps connection.png ; do \
+ 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/krfb/$$base ;\
+ 	done
+ 
+ 
+ #>+ 5
+ distdir-nls:
+-	for file in personal_invitation.png email_invitation.eps connection.png connection.eps index.docbook screenshot.png configuration_session.png configuration_session.eps screenshot.eps invitation_management.png configuration_network.png invitation_management.eps configuration_network.eps configuration_access.png personal_invitation.eps email_invitation.png configuration_access.eps ; do \
++	for file in configuration_session.eps configuration_session.png screenshot.eps screenshot.png personal_invitation.eps personal_invitation.png configuration_network.eps configuration_network.png email_invitation.eps email_invitation.png invitation_management.eps invitation_management.png configuration_access.eps configuration_access.png index.docbook connection.eps connection.png ; do \
+ 	  cp $(srcdir)/$$file $(distdir); \
+ 	done
+ 
+diff -Nru kdenetwork-3.4.1.orig/doc/ksirc/Makefile.in kdenetwork-3.4.1/doc/ksirc/Makefile.in
+--- kdenetwork-3.4.1.orig/doc/ksirc/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/doc/ksirc/Makefile.in	2005-05-24 13:47:07.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -8222,9 +8567,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/doc/ktalkd/Makefile.in kdenetwork-3.4.1/doc/ktalkd/Makefile.in
---- kdenetwork-3.4.1.orig/doc/ktalkd/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/doc/ktalkd/Makefile.in	2005-05-24 17:07:05.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/doc/ktalkd/Makefile.in kdenetwork-3.4.1/doc/ktalkd/Makefile.in
+--- kdenetwork-3.4.1.orig/doc/ktalkd/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/doc/ktalkd/Makefile.in	2005-05-24 13:47:08.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -8256,9 +8601,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/doc/kwifimanager/Makefile.in kdenetwork-3.4.1/doc/kwifimanager/Makefile.in
---- kdenetwork-3.4.1.orig/doc/kwifimanager/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/doc/kwifimanager/Makefile.in	2005-05-24 17:07:05.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/doc/kwifimanager/Makefile.in kdenetwork-3.4.1/doc/kwifimanager/Makefile.in
+--- kdenetwork-3.4.1.orig/doc/kwifimanager/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/doc/kwifimanager/Makefile.in	2005-05-24 13:47:08.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -8290,9 +8635,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/doc/lisa/Makefile.in kdenetwork-3.4.1/doc/lisa/Makefile.in
---- kdenetwork-3.4.1.orig/doc/lisa/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/doc/lisa/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/doc/lisa/Makefile.in kdenetwork-3.4.1/doc/lisa/Makefile.in
+--- kdenetwork-3.4.1.orig/doc/lisa/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/doc/lisa/Makefile.in	2005-05-24 13:47:08.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -8324,9 +8669,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/doc/Makefile.in kdenetwork-3.4.1/doc/Makefile.in
---- kdenetwork-3.4.1.orig/doc/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/doc/Makefile.in	2005-05-24 17:07:05.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/doc/Makefile.in kdenetwork-3.4.1/doc/Makefile.in
+--- kdenetwork-3.4.1.orig/doc/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/doc/Makefile.in	2005-05-24 13:47:07.000000000 -0400
 @@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -8337,7 +8682,14 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -400,7 +403,7 @@
+@@ -394,13 +397,13 @@
+ KDE_DOCS = AUTO
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+-SUBDIRS =. kpf krdc krfb kwifimanager kopete lisa knewsticker kget kppp ktalkd kcontrol ksirc kdict
++SUBDIRS =. kpf kget kppp krdc krfb lisa knewsticker kdict ksirc kwifimanager kcontrol kopete ktalkd
+ #>- all: all-recursive
+ #>+ 1
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -8358,9 +8710,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/filesharing/advanced/kcm_sambaconf/Makefile.in kdenetwork-3.4.1/filesharing/advanced/kcm_sambaconf/Makefile.in
---- kdenetwork-3.4.1.orig/filesharing/advanced/kcm_sambaconf/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/filesharing/advanced/kcm_sambaconf/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/filesharing/advanced/kcm_sambaconf/Makefile.in kdenetwork-3.4.1/filesharing/advanced/kcm_sambaconf/Makefile.in
+--- kdenetwork-3.4.1.orig/filesharing/advanced/kcm_sambaconf/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/filesharing/advanced/kcm_sambaconf/Makefile.in	2005-05-24 13:47:08.000000000 -0400
 @@ -254,6 +254,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -8392,9 +8744,47 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/filesharing/advanced/Makefile.in kdenetwork-3.4.1/filesharing/advanced/Makefile.in
---- kdenetwork-3.4.1.orig/filesharing/advanced/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/filesharing/advanced/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -868,18 +871,18 @@
+ mocs: kcmsambaconf.moc
+ 
+ #>+ 3
+-usertabimpl.moc: $(srcdir)/usertabimpl.h
+-	$(MOC) $(srcdir)/usertabimpl.h -o usertabimpl.moc
++sambafile.moc: $(srcdir)/sambafile.h
++	$(MOC) $(srcdir)/sambafile.h -o sambafile.moc
+ 
+ #>+ 2
+-mocs: usertabimpl.moc
++mocs: sambafile.moc
+ 
+ #>+ 3
+-sambafile.moc: $(srcdir)/sambafile.h
+-	$(MOC) $(srcdir)/sambafile.h -o sambafile.moc
++usertabimpl.moc: $(srcdir)/usertabimpl.h
++	$(MOC) $(srcdir)/usertabimpl.h -o usertabimpl.moc
+ 
+ #>+ 2
+-mocs: sambafile.moc
++mocs: usertabimpl.moc
+ 
+ #>+ 3
+ hiddenfileview.moc: $(srcdir)/hiddenfileview.h
+@@ -948,10 +951,10 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  kcmsambaconf.moc usertabimpl.moc sambafile.moc hiddenfileview.moc sharedlgimpl.moc qmultichecklistitem.moc printerdlgimpl.moc smbconfconfigwidget.moc dictmanager.moc smbpasswdfile.moc filemodedlgimpl.moc
++	-rm -f  kcmsambaconf.moc sambafile.moc usertabimpl.moc hiddenfileview.moc sharedlgimpl.moc qmultichecklistitem.moc printerdlgimpl.moc smbconfconfigwidget.moc dictmanager.moc smbpasswdfile.moc filemodedlgimpl.moc
+ 
+ #>+ 2
+-KDE_DIST=groupselectdlg.ui.h konqinterface.ui groupselectdlg.ui hiddenfileview.h sambashare.h sambafile.h printerdlgimpl.h expertuserdlg.ui hi16-app-kcmsambaconf.png kcmsambaconf.desktop joindomaindlg.ui.h usertab.ui kcmsambaconf.h filemodedlg.ui userselectdlg.ui.h socketoptionsdlg.ui qmultichecklistitem.h common.h linuxpermissionchecker.h kcminterface.ui sharedlgimpl.h socketoptionsdlg.ui.h kcminterface.ui.h Makefile.in konqinterface.ui.h dictmanager.h kcmprinterdlg.ui share.ui.h share.ui smbpasswdfile.h joindomaindlg.ui kcmprinterdlg.ui.h passwd.h usertabimpl.h filemodedlgimpl.h usertab.ui.h smbconfconfigwidget.h Makefile.am userselectdlg.ui programmingconventions.txt 
++KDE_DIST=groupselectdlg.ui.h konqinterface.ui groupselectdlg.ui hiddenfileview.h sambashare.h printerdlgimpl.h sambafile.h expertuserdlg.ui hi16-app-kcmsambaconf.png kcmsambaconf.desktop joindomaindlg.ui.h usertab.ui kcmsambaconf.h filemodedlg.ui userselectdlg.ui.h socketoptionsdlg.ui qmultichecklistitem.h common.h linuxpermissionchecker.h kcminterface.ui sharedlgimpl.h socketoptionsdlg.ui.h kcminterface.ui.h Makefile.in konqinterface.ui.h dictmanager.h kcmprinterdlg.ui share.ui share.ui.h smbpasswdfile.h joindomaindlg.ui kcmprinterdlg.ui.h passwd.h usertabimpl.h filemodedlgimpl.h usertab.ui.h smbconfconfigwidget.h Makefile.am userselectdlg.ui programmingconventions.txt 
+ 
+ #>+ 13
+ clean-ui:
+diff -Nru kdenetwork-3.4.1.orig/filesharing/advanced/Makefile.in kdenetwork-3.4.1/filesharing/advanced/Makefile.in
+--- kdenetwork-3.4.1.orig/filesharing/advanced/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/filesharing/advanced/Makefile.in	2005-05-24 13:47:08.000000000 -0400
 @@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -8426,9 +8816,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/filesharing/advanced/nfs/Makefile.in kdenetwork-3.4.1/filesharing/advanced/nfs/Makefile.in
---- kdenetwork-3.4.1.orig/filesharing/advanced/nfs/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/filesharing/advanced/nfs/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/filesharing/advanced/nfs/Makefile.in kdenetwork-3.4.1/filesharing/advanced/nfs/Makefile.in
+--- kdenetwork-3.4.1.orig/filesharing/advanced/nfs/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/filesharing/advanced/nfs/Makefile.in	2005-05-24 13:47:08.000000000 -0400
 @@ -225,6 +225,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -8460,9 +8850,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/filesharing/advanced/propsdlgplugin/Makefile.in kdenetwork-3.4.1/filesharing/advanced/propsdlgplugin/Makefile.in
---- kdenetwork-3.4.1.orig/filesharing/advanced/propsdlgplugin/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/filesharing/advanced/propsdlgplugin/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/filesharing/advanced/propsdlgplugin/Makefile.in kdenetwork-3.4.1/filesharing/advanced/propsdlgplugin/Makefile.in
+--- kdenetwork-3.4.1.orig/filesharing/advanced/propsdlgplugin/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/filesharing/advanced/propsdlgplugin/Makefile.in	2005-05-24 13:47:08.000000000 -0400
 @@ -247,6 +247,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -8494,9 +8884,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/filesharing/Makefile.in kdenetwork-3.4.1/filesharing/Makefile.in
---- kdenetwork-3.4.1.orig/filesharing/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/filesharing/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/filesharing/Makefile.in kdenetwork-3.4.1/filesharing/Makefile.in
+--- kdenetwork-3.4.1.orig/filesharing/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/filesharing/Makefile.in	2005-05-24 13:47:08.000000000 -0400
 @@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -8528,9 +8918,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/filesharing/simple/Makefile.in kdenetwork-3.4.1/filesharing/simple/Makefile.in
---- kdenetwork-3.4.1.orig/filesharing/simple/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/filesharing/simple/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/filesharing/simple/Makefile.in kdenetwork-3.4.1/filesharing/simple/Makefile.in
+--- kdenetwork-3.4.1.orig/filesharing/simple/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/filesharing/simple/Makefile.in	2005-05-24 13:47:09.000000000 -0400
 @@ -242,6 +242,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -8562,9 +8952,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kdict/applet/Makefile.in kdenetwork-3.4.1/kdict/applet/Makefile.in
---- kdenetwork-3.4.1.orig/kdict/applet/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/kdict/applet/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kdict/applet/Makefile.in kdenetwork-3.4.1/kdict/applet/Makefile.in
+--- kdenetwork-3.4.1.orig/kdict/applet/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/kdict/applet/Makefile.in	2005-05-24 13:47:09.000000000 -0400
 @@ -236,6 +236,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -8596,9 +8986,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kdict/Makefile.in kdenetwork-3.4.1/kdict/Makefile.in
---- kdenetwork-3.4.1.orig/kdict/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/kdict/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kdict/Makefile.in kdenetwork-3.4.1/kdict/Makefile.in
+--- kdenetwork-3.4.1.orig/kdict/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/kdict/Makefile.in	2005-05-24 13:47:09.000000000 -0400
 @@ -260,6 +260,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -8630,9 +9020,125 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kdict/pics/Makefile.in kdenetwork-3.4.1/kdict/pics/Makefile.in
---- kdenetwork-3.4.1.orig/kdict/pics/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/kdict/pics/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -942,13 +945,6 @@
+ 	$(DCOPIDL2CPP) --c++-suffix cpp --no-signals --no-stub dcopinterface.kidl
+ 
+ #>+ 3
+-sets.moc: $(srcdir)/sets.h
+-	$(MOC) $(srcdir)/sets.h -o sets.moc
+-
+-#>+ 2
+-mocs: sets.moc
+-
+-#>+ 3
+ actions.moc: $(srcdir)/actions.h
+ 	$(MOC) $(srcdir)/actions.h -o actions.moc
+ 
+@@ -956,25 +952,18 @@
+ mocs: actions.moc
+ 
+ #>+ 3
+-options.moc: $(srcdir)/options.h
+-	$(MOC) $(srcdir)/options.h -o options.moc
+-
+-#>+ 2
+-mocs: options.moc
+-
+-#>+ 3
+-queryview.moc: $(srcdir)/queryview.h
+-	$(MOC) $(srcdir)/queryview.h -o queryview.moc
++sets.moc: $(srcdir)/sets.h
++	$(MOC) $(srcdir)/sets.h -o sets.moc
+ 
+ #>+ 2
+-mocs: queryview.moc
++mocs: sets.moc
+ 
+ #>+ 3
+-toplevel.moc: $(srcdir)/toplevel.h
+-	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
++options.moc: $(srcdir)/options.h
++	$(MOC) $(srcdir)/options.h -o options.moc
+ 
+ #>+ 2
+-mocs: toplevel.moc
++mocs: options.moc
+ 
+ #>+ 3
+ application.moc: $(srcdir)/application.h
+@@ -998,8 +987,22 @@
+ mocs: dict.moc
+ 
+ #>+ 3
++queryview.moc: $(srcdir)/queryview.h
++	$(MOC) $(srcdir)/queryview.h -o queryview.moc
++
++#>+ 2
++mocs: queryview.moc
++
++#>+ 3
++toplevel.moc: $(srcdir)/toplevel.h
++	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
++
++#>+ 2
++mocs: toplevel.moc
++
++#>+ 3
+ clean-metasources:
+-	-rm -f  sets.moc actions.moc options.moc queryview.moc toplevel.moc application.moc matchview.moc dict.moc
++	-rm -f  actions.moc sets.moc options.moc application.moc matchview.moc dict.moc queryview.moc toplevel.moc
+ 
+ #>+ 2
+ KDE_DIST=crsc-app-kdict.svgz kdictui.rc cr16-app-kdict.png cr48-app-kdict.png cr32-app-kdict.png dcopinterface.h Makefile.in cr64-app-kdict.png kdict.desktop cr128-app-kdict.png Makefile.am LICENSE 
+@@ -1014,6 +1017,8 @@
+ 
+ #>+ 22
+ install-kde-icons:
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kdict.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdict.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
+ 	$(INSTALL_DATA) $(srcdir)/crsc-app-kdict.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kdict.svgz
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+@@ -1024,16 +1029,14 @@
+ 	$(INSTALL_DATA) $(srcdir)/cr128-app-kdict.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdict.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-kdict.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdict.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kdict.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdict.png
+ 
+ uninstall-kde-icons:
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdict.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kdict.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kdict.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kdict.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kdict.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kdict.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kdict.png
+ 
+ #>+ 15
+ force-reedit:
+@@ -1074,7 +1077,7 @@
+ 
+ 
+ #>+ 11
+-kdict.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/actions.cpp $(srcdir)/dict.cpp $(srcdir)/options.cpp $(srcdir)/queryview.cpp $(srcdir)/toplevel.cpp $(srcdir)/sets.cpp $(srcdir)/matchview.cpp $(srcdir)/application.cpp dcopinterface_skel.cpp  actions.moc sets.moc options.moc toplevel.moc queryview.moc application.moc matchview.moc dict.moc
++kdict.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/actions.cpp $(srcdir)/dict.cpp $(srcdir)/options.cpp $(srcdir)/queryview.cpp $(srcdir)/toplevel.cpp $(srcdir)/sets.cpp $(srcdir)/matchview.cpp $(srcdir)/application.cpp dcopinterface_skel.cpp  sets.moc actions.moc options.moc application.moc matchview.moc dict.moc queryview.moc toplevel.moc
+ 	@echo 'creating kdict.all_cpp.cpp ...'; \
+ 	rm -f kdict.all_cpp.files kdict.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kdict.all_cpp.final; \
+@@ -1121,8 +1124,8 @@
+ matchview.lo: matchview.moc 
+ actions.lo: actions.moc 
+ options.lo: options.moc 
+-actions.o: actions.moc 
+ toplevel.o: toplevel.moc 
++actions.o: actions.moc 
+ dict.lo: dict.moc 
+ nmcheck: 
+ queryview.o: queryview.moc 
+diff -Nru kdenetwork-3.4.1.orig/kdict/pics/Makefile.in kdenetwork-3.4.1/kdict/pics/Makefile.in
+--- kdenetwork-3.4.1.orig/kdict/pics/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/kdict/pics/Makefile.in	2005-05-24 13:47:09.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -8664,9 +9170,32 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kdnssd/ioslave/Makefile.in kdenetwork-3.4.1/kdnssd/ioslave/Makefile.in
---- kdenetwork-3.4.1.orig/kdnssd/ioslave/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/kdnssd/ioslave/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -571,19 +574,19 @@
+ 
+ #>+ 15
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kdicticondir)/crystalsvg/22x22/actions
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-define_clip.png $(DESTDIR)$(kdicticondir)/crystalsvg/22x22/actions/define_clip.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kdicticondir)/crystalsvg/32x32/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr32-action-define_clip.png $(DESTDIR)$(kdicticondir)/crystalsvg/32x32/actions/define_clip.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kdicticondir)/crystalsvg/16x16/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-define_clip.png $(DESTDIR)$(kdicticondir)/crystalsvg/16x16/actions/define_clip.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-query_erase.png $(DESTDIR)$(kdicticondir)/crystalsvg/16x16/actions/query_erase.png
++	$(mkinstalldirs) $(DESTDIR)$(kdicticondir)/crystalsvg/22x22/actions
++	$(INSTALL_DATA) $(srcdir)/cr22-action-define_clip.png $(DESTDIR)$(kdicticondir)/crystalsvg/22x22/actions/define_clip.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kdicticondir)/crystalsvg/22x22/actions/define_clip.png
+ 	-rm -f $(DESTDIR)$(kdicticondir)/crystalsvg/32x32/actions/define_clip.png
+ 	-rm -f $(DESTDIR)$(kdicticondir)/crystalsvg/16x16/actions/define_clip.png
+ 	-rm -f $(DESTDIR)$(kdicticondir)/crystalsvg/16x16/actions/query_erase.png
++	-rm -f $(DESTDIR)$(kdicticondir)/crystalsvg/22x22/actions/define_clip.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdenetwork-3.4.1.orig/kdnssd/ioslave/Makefile.in kdenetwork-3.4.1/kdnssd/ioslave/Makefile.in
+--- kdenetwork-3.4.1.orig/kdnssd/ioslave/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/kdnssd/ioslave/Makefile.in	2005-05-24 13:47:09.000000000 -0400
 @@ -237,6 +237,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -8698,9 +9227,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kdnssd/kdedmodule/Makefile.in kdenetwork-3.4.1/kdnssd/kdedmodule/Makefile.in
---- kdenetwork-3.4.1.orig/kdnssd/kdedmodule/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/kdnssd/kdedmodule/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -819,7 +822,7 @@
+ 	-rm -f  dnssd.moc
+ 
+ #>+ 2
+-KDE_DIST=_telnet._tcp zeroconf.protocol _ssh._tcp _ftp._tcp dnssd.h CONFIG_FORMAT zeroconf.desktop _http._tcp Makefile.in _nfs._tcp _ldap._tcp _webdav._tcp Makefile.am 
++KDE_DIST=_telnet._tcp zeroconf.protocol _ssh._tcp _ftp._tcp CONFIG_FORMAT dnssd.h zeroconf.desktop _http._tcp Makefile.in _nfs._tcp _ldap._tcp _webdav._tcp Makefile.am 
+ 
+ #>+ 3
+ clean-closures:
+diff -Nru kdenetwork-3.4.1.orig/kdnssd/kdedmodule/Makefile.in kdenetwork-3.4.1/kdnssd/kdedmodule/Makefile.in
+--- kdenetwork-3.4.1.orig/kdnssd/kdedmodule/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/kdnssd/kdedmodule/Makefile.in	2005-05-24 13:47:09.000000000 -0400
 @@ -236,6 +236,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -8732,9 +9270,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kdnssd/Makefile.in kdenetwork-3.4.1/kdnssd/Makefile.in
---- kdenetwork-3.4.1.orig/kdnssd/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/kdnssd/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kdnssd/Makefile.in kdenetwork-3.4.1/kdnssd/Makefile.in
+--- kdenetwork-3.4.1.orig/kdnssd/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/kdnssd/Makefile.in	2005-05-24 13:47:09.000000000 -0400
 @@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -8766,9 +9304,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kfile-plugins/Makefile.in kdenetwork-3.4.1/kfile-plugins/Makefile.in
---- kdenetwork-3.4.1.orig/kfile-plugins/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/kfile-plugins/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kfile-plugins/Makefile.in kdenetwork-3.4.1/kfile-plugins/Makefile.in
+--- kdenetwork-3.4.1.orig/kfile-plugins/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/kfile-plugins/Makefile.in	2005-05-24 13:47:09.000000000 -0400
 @@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -8800,9 +9338,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kfile-plugins/torrent/Makefile.in kdenetwork-3.4.1/kfile-plugins/torrent/Makefile.in
---- kdenetwork-3.4.1.orig/kfile-plugins/torrent/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/kfile-plugins/torrent/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kfile-plugins/torrent/Makefile.in kdenetwork-3.4.1/kfile-plugins/torrent/Makefile.in
+--- kdenetwork-3.4.1.orig/kfile-plugins/torrent/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/kfile-plugins/torrent/Makefile.in	2005-05-24 13:47:09.000000000 -0400
 @@ -241,6 +241,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -8834,9 +9372,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kget/icons/Makefile.in kdenetwork-3.4.1/kget/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kget/icons/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/kget/icons/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kget/icons/Makefile.in kdenetwork-3.4.1/kget/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kget/icons/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/kget/icons/Makefile.in	2005-05-24 13:47:09.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -8868,9 +9406,114 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kget/kget_plug_in/Makefile.in kdenetwork-3.4.1/kget/kget_plug_in/Makefile.in
---- kdenetwork-3.4.1.orig/kget/kget_plug_in/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/kget/kget_plug_in/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -564,7 +567,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=cr22-action-bar6.png cr22-action-tool_expert.png cr22-action-tool_logwindow.png cr22-action-tool_uselastdir.png cr22-action-bar0.png cr22-action-tool_drop_target.png cr22-action-bar4.png cr22-action-tool_dock.png cr22-action-tool_pause.png cr22-action-tool_paste.png cr22-action-tool_shutdown.png cr22-action-bar3.png cr22-action-tool_delay.png Makefile.in cr22-action-bar5.png cr22-action-tool_preferences.png cr22-action-tool_resume.png cr22-action-tool_offline_mode_off.png cr22-action-tool_offline_mode_on.png cr22-action-bar2.png cr22-action-dock.png cr22-action-tool_clipboard.png cr22-action-tool_restart.png cr22-action-tool_timer.png cr22-action-tool_disconnect.png cr22-action-tool_queue.png Makefile.am cr22-action-bar1.png cr22-action-tool_normal.png 
++KDE_DIST=cr22-action-bar6.png cr22-action-tool_expert.png cr22-action-tool_logwindow.png cr22-action-tool_uselastdir.png cr22-action-bar0.png cr22-action-bar4.png cr22-action-tool_drop_target.png cr22-action-tool_dock.png cr22-action-tool_pause.png cr22-action-tool_paste.png cr22-action-tool_shutdown.png cr22-action-bar3.png cr22-action-tool_delay.png Makefile.in cr22-action-bar5.png cr22-action-tool_preferences.png cr22-action-tool_resume.png cr22-action-tool_offline_mode_off.png cr22-action-tool_offline_mode_on.png cr22-action-bar2.png cr22-action-dock.png cr22-action-tool_restart.png cr22-action-tool_clipboard.png cr22-action-tool_timer.png cr22-action-tool_queue.png cr22-action-tool_disconnect.png cr22-action-bar1.png Makefile.am cr22-action-tool_normal.png 
+ 
+ #>+ 2
+ docs-am:
+@@ -573,61 +576,61 @@
+ install-kde-icons:
+ 	$(mkinstalldirs) $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_offline_mode_on.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_offline_mode_on.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_uselastdir.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_uselastdir.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_offline_mode_off.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_offline_mode_off.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_logwindow.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_logwindow.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_dock.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_dock.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_resume.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_resume.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_shutdown.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_shutdown.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_preferences.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_preferences.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_timer.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_timer.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_offline_mode_off.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_offline_mode_off.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-dock.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/dock.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-bar0.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar0.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_queue.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_queue.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_restart.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_restart.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-bar1.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar1.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_paste.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_paste.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_clipboard.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_clipboard.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_disconnect.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_disconnect.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_restart.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_restart.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_delay.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_delay.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_pause.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_pause.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_expert.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_expert.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_drop_target.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_drop_target.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_normal.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_normal.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-bar0.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar0.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-bar1.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar1.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-bar2.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar2.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-bar3.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar3.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-bar4.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar4.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-bar5.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar5.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-bar6.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar6.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_clipboard.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_clipboard.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_delay.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_delay.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_preferences.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_preferences.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_resume.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_resume.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_expert.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_expert.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_logwindow.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_logwindow.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_drop_target.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_drop_target.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_shutdown.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_shutdown.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_paste.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_paste.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_pause.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_pause.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_uselastdir.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_uselastdir.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-tool_queue.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_queue.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-dock.png $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/dock.png
+ 
+ uninstall-kde-icons:
+ 	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_offline_mode_on.png
+-	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_uselastdir.png
++	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_offline_mode_off.png
++	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_logwindow.png
+ 	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_dock.png
++	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_resume.png
++	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_shutdown.png
++	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_preferences.png
+ 	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_timer.png
+-	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_offline_mode_off.png
+-	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/dock.png
+-	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar0.png
+-	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_queue.png
+-	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_restart.png
+-	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar1.png
++	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_paste.png
++	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_clipboard.png
+ 	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_disconnect.png
++	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_restart.png
++	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_delay.png
++	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_pause.png
++	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_expert.png
++	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_drop_target.png
+ 	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_normal.png
++	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar0.png
++	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar1.png
+ 	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar2.png
+ 	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar3.png
+ 	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar4.png
+ 	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar5.png
+ 	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/bar6.png
+-	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_clipboard.png
+-	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_delay.png
+-	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_preferences.png
+-	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_resume.png
+-	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_expert.png
+-	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_logwindow.png
+-	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_drop_target.png
+-	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_shutdown.png
+-	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_paste.png
+-	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_pause.png
++	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_uselastdir.png
++	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/tool_queue.png
++	-rm -f $(DESTDIR)$(kgeticondir)/crystalsvg/22x22/actions/dock.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdenetwork-3.4.1.orig/kget/kget_plug_in/Makefile.in kdenetwork-3.4.1/kget/kget_plug_in/Makefile.in
+--- kdenetwork-3.4.1.orig/kget/kget_plug_in/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/kget/kget_plug_in/Makefile.in	2005-05-24 13:47:10.000000000 -0400
 @@ -235,6 +235,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -8902,9 +9545,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kget/Makefile.in kdenetwork-3.4.1/kget/Makefile.in
---- kdenetwork-3.4.1.orig/kget/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/kget/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kget/Makefile.in kdenetwork-3.4.1/kget/Makefile.in
+--- kdenetwork-3.4.1.orig/kget/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/kget/Makefile.in	2005-05-24 13:47:09.000000000 -0400
 @@ -273,6 +273,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -8936,9 +9579,77 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kget/pics/Makefile.in kdenetwork-3.4.1/kget/pics/Makefile.in
---- kdenetwork-3.4.1.orig/kget/pics/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/kget/pics/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -1012,18 +1015,18 @@
+ mocs: dlgAdvanced.moc
+ 
+ #>+ 3
+-docking.moc: $(srcdir)/docking.h
+-	$(MOC) $(srcdir)/docking.h -o docking.moc
++transfer.moc: $(srcdir)/transfer.h
++	$(MOC) $(srcdir)/transfer.h -o transfer.moc
+ 
+ #>+ 2
+-mocs: docking.moc
++mocs: transfer.moc
+ 
+ #>+ 3
+-transfer.moc: $(srcdir)/transfer.h
+-	$(MOC) $(srcdir)/transfer.h -o transfer.moc
++docking.moc: $(srcdir)/docking.h
++	$(MOC) $(srcdir)/docking.h -o docking.moc
+ 
+ #>+ 2
+-mocs: transfer.moc
++mocs: docking.moc
+ 
+ #>+ 3
+ slave.moc: $(srcdir)/slave.h
+@@ -1054,18 +1057,18 @@
+ mocs: dlgSystem.moc
+ 
+ #>+ 3
+-kmainwidget.moc: $(srcdir)/kmainwidget.h
+-	$(MOC) $(srcdir)/kmainwidget.h -o kmainwidget.moc
++dlgConnection.moc: $(srcdir)/dlgConnection.h
++	$(MOC) $(srcdir)/dlgConnection.h -o dlgConnection.moc
+ 
+ #>+ 2
+-mocs: kmainwidget.moc
++mocs: dlgConnection.moc
+ 
+ #>+ 3
+-dlgConnection.moc: $(srcdir)/dlgConnection.h
+-	$(MOC) $(srcdir)/dlgConnection.h -o dlgConnection.moc
++kmainwidget.moc: $(srcdir)/kmainwidget.h
++	$(MOC) $(srcdir)/kmainwidget.h -o kmainwidget.moc
+ 
+ #>+ 2
+-mocs: dlgConnection.moc
++mocs: kmainwidget.moc
+ 
+ #>+ 3
+ droptarget.moc: $(srcdir)/droptarget.h
+@@ -1104,7 +1107,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  dockindividual.moc logwindow.moc dlgAdvanced.moc docking.moc transfer.moc slave.moc dlgDirectories.moc transferlist.moc dlgSystem.moc kmainwidget.moc dlgConnection.moc droptarget.moc dlgLimits.moc dlgAutomation.moc dlgIndividual.moc dlgPreferences.moc
++	-rm -f  dockindividual.moc logwindow.moc dlgAdvanced.moc transfer.moc docking.moc slave.moc dlgDirectories.moc transferlist.moc dlgSystem.moc dlgConnection.moc kmainwidget.moc droptarget.moc dlgLimits.moc dlgAutomation.moc dlgIndividual.moc dlgPreferences.moc
+ 
+ #>+ 2
+ KDE_DIST=kgetui.rc dlglimitsbase.ui dlgadvancedbase.ui Makefile.in dlgsystembase.ui x-kgetlist.desktop safedelete.h dlgautomationbase.ui dlgdirectoriesbase.ui dlgconnectionbase.ui cr48-mime-kget_list.png Makefile.am kget_iface.h cr48-app-kget.png 
+@@ -1177,7 +1180,7 @@
+ 
+ 
+ #>+ 11
+-kget.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/getfilejob.cpp $(srcdir)/slaveevent.cpp $(srcdir)/slave.cpp $(srcdir)/transferlist.cpp $(srcdir)/transfer.cpp $(srcdir)/settings.cpp $(srcdir)/logwindow.cpp $(srcdir)/kmainwidget.cpp $(srcdir)/kfileio.cpp $(srcdir)/droptarget.cpp $(srcdir)/docking.cpp $(srcdir)/dlgSystem.cpp $(srcdir)/dlgPreferences.cpp $(srcdir)/dlgLimits.cpp $(srcdir)/dlgIndividual.cpp $(srcdir)/dlgDirectories.cpp $(srcdir)/dlgConnection.cpp $(srcdir)/dlgAutomation.cpp $(srcdir)/dlgAdvanced.cpp $(srcdir)/main.cpp $(srcdir)/dockindividual.cpp $(srcdir)/safedelete.cpp kget_iface_skel.cpp dlgconnectionbase.cpp dlgautomationbase.cpp dlglimitsbase.cpp dlgadvancedbase.cpp dlgdirectoriesbase.cpp dlgsystembase.cpp  dlgdirectoriesbase.moc dockindividual.moc dlglimitsbase.moc dlgadvancedbase.moc dlgconnectionbase.moc logwindow.moc dlgAdvanced.moc transfer.moc docking.moc slave.moc dlgDirectories.moc dlgsystembase.moc transferlist.moc dlgSystem.moc dlgautomationbase.moc kmainwidget.moc dlgConnection.moc droptarget.moc dlgAutomation.moc dlgLimits.moc dlgIndividual.moc dlgPreferences.moc
++kget.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/getfilejob.cpp $(srcdir)/slaveevent.cpp $(srcdir)/slave.cpp $(srcdir)/transferlist.cpp $(srcdir)/transfer.cpp $(srcdir)/settings.cpp $(srcdir)/logwindow.cpp $(srcdir)/kmainwidget.cpp $(srcdir)/kfileio.cpp $(srcdir)/droptarget.cpp $(srcdir)/docking.cpp $(srcdir)/dlgSystem.cpp $(srcdir)/dlgPreferences.cpp $(srcdir)/dlgLimits.cpp $(srcdir)/dlgIndividual.cpp $(srcdir)/dlgDirectories.cpp $(srcdir)/dlgConnection.cpp $(srcdir)/dlgAutomation.cpp $(srcdir)/dlgAdvanced.cpp $(srcdir)/main.cpp $(srcdir)/dockindividual.cpp $(srcdir)/safedelete.cpp kget_iface_skel.cpp dlgconnectionbase.cpp dlgautomationbase.cpp dlglimitsbase.cpp dlgadvancedbase.cpp dlgdirectoriesbase.cpp dlgsystembase.cpp  dlgdirectoriesbase.moc dockindividual.moc dlglimitsbase.moc dlgadvancedbase.moc dlgconnectionbase.moc logwindow.moc dlgAdvanced.moc docking.moc transfer.moc slave.moc dlgDirectories.moc dlgsystembase.moc transferlist.moc dlgSystem.moc dlgautomationbase.moc dlgConnection.moc kmainwidget.moc droptarget.moc dlgAutomation.moc dlgLimits.moc dlgIndividual.moc dlgPreferences.moc
+ 	@echo 'creating kget.all_cpp.cpp ...'; \
+ 	rm -f kget.all_cpp.files kget.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kget.all_cpp.final; \
+diff -Nru kdenetwork-3.4.1.orig/kget/pics/Makefile.in kdenetwork-3.4.1/kget/pics/Makefile.in
+--- kdenetwork-3.4.1.orig/kget/pics/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/kget/pics/Makefile.in	2005-05-24 13:47:10.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -8970,9 +9681,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kget/sounds/Makefile.in kdenetwork-3.4.1/kget/sounds/Makefile.in
---- kdenetwork-3.4.1.orig/kget/sounds/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/kget/sounds/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -597,7 +600,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=connect1.png try5.png try3.png md_finished.png connect5.png try6.png connect2.png connect3.png try0.png try7.png Makefile.in md_queued.png connect0.png connect4.png retrying.png md_scheduled.png try4.png try2.png connect6.png md_delayed.png target.png connect7.png try1.png Makefile.am 
++KDE_DIST=connect1.png try5.png try3.png md_finished.png connect5.png try6.png connect2.png connect3.png try0.png try7.png Makefile.in connect0.png md_queued.png connect4.png retrying.png md_scheduled.png try4.png try2.png connect6.png md_delayed.png target.png connect7.png try1.png Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdenetwork-3.4.1.orig/kget/sounds/Makefile.in kdenetwork-3.4.1/kget/sounds/Makefile.in
+--- kdenetwork-3.4.1.orig/kget/sounds/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/kget/sounds/Makefile.in	2005-05-24 13:47:10.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -9004,9 +9724,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/knewsticker/common/Makefile.in kdenetwork-3.4.1/knewsticker/common/Makefile.in
---- kdenetwork-3.4.1.orig/knewsticker/common/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/knewsticker/common/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/knewsticker/common/Makefile.in kdenetwork-3.4.1/knewsticker/common/Makefile.in
+--- kdenetwork-3.4.1.orig/knewsticker/common/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/knewsticker/common/Makefile.in	2005-05-24 13:47:10.000000000 -0400
 @@ -231,6 +231,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -9038,9 +9758,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/knewsticker/knewstickerstub/Makefile.in kdenetwork-3.4.1/knewsticker/knewstickerstub/Makefile.in
---- kdenetwork-3.4.1.orig/knewsticker/knewstickerstub/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/knewsticker/knewstickerstub/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/knewsticker/knewstickerstub/Makefile.in kdenetwork-3.4.1/knewsticker/knewstickerstub/Makefile.in
+--- kdenetwork-3.4.1.orig/knewsticker/knewstickerstub/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/knewsticker/knewstickerstub/Makefile.in	2005-05-24 13:47:10.000000000 -0400
 @@ -234,6 +234,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -9072,9 +9792,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/knewsticker/kntsrcfilepropsdlg/Makefile.in kdenetwork-3.4.1/knewsticker/kntsrcfilepropsdlg/Makefile.in
---- kdenetwork-3.4.1.orig/knewsticker/kntsrcfilepropsdlg/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/knewsticker/kntsrcfilepropsdlg/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/knewsticker/kntsrcfilepropsdlg/Makefile.in kdenetwork-3.4.1/knewsticker/kntsrcfilepropsdlg/Makefile.in
+--- kdenetwork-3.4.1.orig/knewsticker/kntsrcfilepropsdlg/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/knewsticker/kntsrcfilepropsdlg/Makefile.in	2005-05-24 13:47:10.000000000 -0400
 @@ -238,6 +238,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -9106,9 +9826,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/knewsticker/Makefile.in kdenetwork-3.4.1/knewsticker/Makefile.in
---- kdenetwork-3.4.1.orig/knewsticker/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/knewsticker/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/knewsticker/Makefile.in kdenetwork-3.4.1/knewsticker/Makefile.in
+--- kdenetwork-3.4.1.orig/knewsticker/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/knewsticker/Makefile.in	2005-05-24 13:47:10.000000000 -0400
 @@ -266,6 +266,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -9140,9 +9860,77 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/icons/Makefile.in kdenetwork-3.4.1/kopete/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/icons/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/icons/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -1021,18 +1024,18 @@
+ mocs: newsscroller.moc
+ 
+ #>+ 3
+-knewstickerconfig.moc: $(srcdir)/knewstickerconfig.h
+-	$(MOC) $(srcdir)/knewstickerconfig.h -o knewstickerconfig.moc
++knewsticker.moc: $(srcdir)/knewsticker.h
++	$(MOC) $(srcdir)/knewsticker.h -o knewsticker.moc
+ 
+ #>+ 2
+-mocs: knewstickerconfig.moc
++mocs: knewsticker.moc
+ 
+ #>+ 3
+-knewsticker.moc: $(srcdir)/knewsticker.h
+-	$(MOC) $(srcdir)/knewsticker.h -o knewsticker.moc
++knewstickerconfig.moc: $(srcdir)/knewstickerconfig.h
++	$(MOC) $(srcdir)/knewstickerconfig.h -o knewstickerconfig.moc
+ 
+ #>+ 2
+-mocs: knewsticker.moc
++mocs: knewstickerconfig.moc
+ 
+ #>+ 3
+ newssourcedlgimpl.moc: $(srcdir)/newssourcedlgimpl.h
+@@ -1043,10 +1046,10 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  newsscroller.moc knewstickerconfig.moc knewsticker.moc newssourcedlgimpl.moc
++	-rm -f  newsscroller.moc knewsticker.moc knewstickerconfig.moc newssourcedlgimpl.moc
+ 
+ #>+ 2
+-KDE_DIST=knewstickerconfigwidget.ui newssourcedlg.ui knewsticker-standalone.desktop eventsrc cr48-app-knewsticker.png cr32-app-knewsticker.png Makefile.in knewsticker.desktop knt-0.1-0.2.pl knewstickerconfig.h Makefile.am knewsticker.upd cr16-app-knewsticker.png newssourcedlgimpl.h 
++KDE_DIST=knewstickerconfigwidget.ui newssourcedlg.ui knewsticker-standalone.desktop eventsrc cr48-app-knewsticker.png cr32-app-knewsticker.png Makefile.in knewsticker.desktop knt-0.1-0.2.pl knewstickerconfig.h Makefile.am knewsticker.upd newssourcedlgimpl.h cr16-app-knewsticker.png 
+ 
+ #>+ 4
+ clean-idl:
+@@ -1068,17 +1071,17 @@
+ 
+ #>+ 13
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-knewsticker.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knewsticker.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-knewsticker.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knewsticker.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-knewsticker.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knewsticker.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-knewsticker.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knewsticker.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knewsticker.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/knewsticker.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/knewsticker.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/knewsticker.png
+ 
+ #>+ 15
+ force-reedit:
+@@ -1119,7 +1122,7 @@
+ 
+ 
+ #>+ 11
+-knewsticker_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/newsscroller.cpp $(srcdir)/knewsticker.cpp $(srcdir)/knewstickerconfig.cpp $(srcdir)/newssourcedlgimpl.cpp knewsticker_skel.cpp knewstickerconfigwidget.cpp newssourcedlg.cpp  knewstickerconfigwidget.moc knewsticker.moc knewstickerconfig.moc newsscroller.moc newssourcedlgimpl.moc newssourcedlg.moc
++knewsticker_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/newsscroller.cpp $(srcdir)/knewsticker.cpp $(srcdir)/knewstickerconfig.cpp $(srcdir)/newssourcedlgimpl.cpp knewsticker_skel.cpp knewstickerconfigwidget.cpp newssourcedlg.cpp  knewstickerconfigwidget.moc knewstickerconfig.moc knewsticker.moc newsscroller.moc newssourcedlgimpl.moc newssourcedlg.moc
+ 	@echo 'creating knewsticker_panelapplet_la.all_cpp.cpp ...'; \
+ 	rm -f knewsticker_panelapplet_la.all_cpp.files knewsticker_panelapplet_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> knewsticker_panelapplet_la.all_cpp.final; \
+diff -Nru kdenetwork-3.4.1.orig/kopete/icons/Makefile.in kdenetwork-3.4.1/kopete/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/icons/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/kopete/icons/Makefile.in	2005-05-24 13:47:10.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -9174,9 +9962,175 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/kopete/addcontactwizard/Makefile.in kdenetwork-3.4.1/kopete/kopete/addcontactwizard/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/kopete/addcontactwizard/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/kopete/addcontactwizard/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -564,104 +567,104 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=hi16-action-emoticon.png cr16-action-metacontact_unknown.png cr32-action-metacontact_online.png cr16-action-kopeteavailable.png hi32-action-kopeteavailable.png hi48-action-kopeteavailable.png cr32-action-kopeteaway.png cr32-action-newmsg.png cr32-action-metacontact_unknown.png cr32-action-account_offline_overlay.png cr16-action-metacontact_online.png cr32-action-metacontact_offline.png cr22-action-kopeteavailable.png hi16-action-newmsg.png hi16-action-kopeteavailable.png cr32-action-kopeteavailable.png hi16-action-kopeteaway.png cr22-action-account_offline_overlay.png hi22-action-kopeteavailable.png hi16-action-status_unknown.png hi48-action-kopeteaway.png cr48-action-metacontact_offline.png cr48-action-metacontact_online.png Makefile.in cr16-action-status_unknown.png cr48-action-metacontact_away.png crsc-action-account_offline_overlay.svgz cr32-action-metacontact_away.png hi22-action-kopeteaway.png cr32-action-newmessage.mng cr16-action-newmsg.png cr16-action-kopeteaway.png cr16-action-metacontact_away.png cr48-action-kopeteaway.png cr16-action-emoticon.png cr48-action-kopeteavailable.png cr16-action-account_offline_overlay.png hi32-action-newmessage.mng Makefile.am cr22-action-kopeteaway.png cr16-action-metacontact_offline.png hi32-action-kopeteaway.png 
++KDE_DIST=hi16-action-emoticon.png cr16-action-metacontact_unknown.png cr32-action-metacontact_online.png cr16-action-kopeteavailable.png hi32-action-kopeteavailable.png hi48-action-kopeteavailable.png cr32-action-kopeteaway.png cr32-action-newmsg.png cr32-action-account_offline_overlay.png cr32-action-metacontact_unknown.png cr16-action-metacontact_online.png cr32-action-metacontact_offline.png hi16-action-newmsg.png cr22-action-kopeteavailable.png hi16-action-kopeteavailable.png cr32-action-kopeteavailable.png hi16-action-kopeteaway.png hi22-action-kopeteavailable.png cr22-action-account_offline_overlay.png hi48-action-kopeteaway.png hi16-action-status_unknown.png cr48-action-metacontact_offline.png cr48-action-metacontact_online.png Makefile.in cr16-action-status_unknown.png cr48-action-metacontact_away.png crsc-action-account_offline_overlay.svgz cr32-action-metacontact_away.png hi22-action-kopeteaway.png cr32-action-newmessage.mng cr16-action-newmsg.png cr16-action-kopeteaway.png cr16-action-metacontact_away.png cr48-action-kopeteaway.png cr16-action-emoticon.png cr48-action-kopeteavailable.png cr16-action-account_offline_overlay.png hi32-action-newmessage.mng Makefile.am cr22-action-kopeteaway.png cr16-action-metacontact_offline.png hi32-action-kopeteaway.png 
+ 
+ #>+ 2
+ docs-am:
+ 
+ #>+ 93
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions/kopeteavailable.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions
++	$(INSTALL_DATA) $(srcdir)/cr48-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/kopeteaway.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions
++	$(INSTALL_DATA) $(srcdir)/hi16-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/kopeteaway.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions
++	$(INSTALL_DATA) $(srcdir)/cr22-action-account_offline_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/account_offline_overlay.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
++	$(INSTALL_DATA) $(srcdir)/cr16-action-metacontact_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_online.png
++	$(INSTALL_DATA) $(srcdir)/hi16-action-emoticon.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/emoticon.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/kopeteaway.png
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/48x48/actions
+-	$(INSTALL_DATA) $(srcdir)/hi48-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/hicolor/48x48/actions/kopeteaway.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-emoticon.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/emoticon.png
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-metacontact_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_online.png
++	$(INSTALL_DATA) $(srcdir)/cr48-action-metacontact_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_away.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/kopeteavailable.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr32-action-metacontact_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_offline.png
++	$(INSTALL_DATA) $(srcdir)/cr48-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/kopeteavailable.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-metacontact_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_away.png
++	$(INSTALL_DATA) $(srcdir)/cr48-action-metacontact_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_offline.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/32x32/actions
+ 	$(INSTALL_DATA) $(srcdir)/hi32-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/hicolor/32x32/actions/kopeteavailable.png
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions
+-	$(INSTALL_DATA) $(srcdir)/hi16-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/kopeteavailable.png
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/actions
+-	$(INSTALL_DATA) $(srcdir)/crsc-action-account_offline_overlay.svgz $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/actions/account_offline_overlay.svgz
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-metacontact_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_away.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-newmessage.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/newmessage.mng
+-	$(INSTALL_DATA) $(srcdir)/hi48-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/hicolor/48x48/actions/kopeteavailable.png
+-	$(INSTALL_DATA) $(srcdir)/hi16-action-newmsg.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/newmsg.png
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-account_offline_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/account_offline_overlay.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-account_offline_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/account_offline_overlay.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-account_offline_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/account_offline_overlay.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-newmsg.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/newmsg.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-status_unknown.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/status_unknown.png
++	$(INSTALL_DATA) $(srcdir)/cr48-action-metacontact_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_online.png
++	$(INSTALL_DATA) $(srcdir)/hi16-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/kopeteavailable.png
++	$(INSTALL_DATA) $(srcdir)/hi16-action-status_unknown.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/status_unknown.png
+ 	$(INSTALL_DATA) $(srcdir)/hi32-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/hicolor/32x32/actions/kopeteaway.png
+ 	$(INSTALL_DATA) $(srcdir)/cr32-action-metacontact_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_online.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-metacontact_unknown.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_unknown.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/kopeteaway.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions
++	$(INSTALL_DATA) $(srcdir)/hi22-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions/kopeteaway.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-metacontact_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_offline.png
+-	$(INSTALL_DATA) $(srcdir)/hi16-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/kopeteaway.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-metacontact_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_online.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/actions
++	$(INSTALL_DATA) $(srcdir)/crsc-action-account_offline_overlay.svgz $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/actions/account_offline_overlay.svgz
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/kopeteaway.png
+-	$(INSTALL_DATA) $(srcdir)/hi16-action-emoticon.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/emoticon.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-metacontact_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_offline.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/kopeteaway.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-metacontact_unknown.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_unknown.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-metacontact_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_away.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-metacontact_unknown.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_unknown.png
++	$(INSTALL_DATA) $(srcdir)/hi16-action-newmsg.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/newmsg.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-account_offline_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/account_offline_overlay.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-metacontact_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_away.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/kopeteavailable.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-account_offline_overlay.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/account_offline_overlay.png
++	$(INSTALL_DATA) $(srcdir)/hi22-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions/kopeteavailable.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/48x48/actions
++	$(INSTALL_DATA) $(srcdir)/hi48-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/hicolor/48x48/actions/kopeteavailable.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-newmsg.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/newmsg.png
+ 	$(INSTALL_DATA) $(srcdir)/hi32-action-newmessage.mng $(DESTDIR)$(kopeteicondir)/hicolor/32x32/actions/newmessage.mng
+ 	$(INSTALL_DATA) $(srcdir)/cr32-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/kopeteavailable.png
++	$(INSTALL_DATA) $(srcdir)/cr32-action-newmessage.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/newmessage.mng
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/kopeteavailable.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-kopeteavailable.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/kopeteavailable.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-newmsg.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/newmsg.png
+-	$(INSTALL_DATA) $(srcdir)/hi16-action-status_unknown.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/status_unknown.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-newmsg.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/newmsg.png
+-	$(INSTALL_DATA) $(srcdir)/hi22-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions/kopeteaway.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/kopeteaway.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-metacontact_unknown.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_unknown.png
++	$(INSTALL_DATA) $(srcdir)/hi48-action-kopeteaway.png $(DESTDIR)$(kopeteicondir)/hicolor/48x48/actions/kopeteaway.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions/kopeteavailable.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/kopeteaway.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/kopeteaway.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/account_offline_overlay.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_online.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/emoticon.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/kopeteaway.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/48x48/actions/kopeteaway.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/emoticon.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_online.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_away.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/kopeteavailable.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_offline.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/kopeteavailable.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_away.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_offline.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/32x32/actions/kopeteavailable.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/kopeteavailable.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/actions/account_offline_overlay.svgz
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_away.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/newmessage.mng
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/48x48/actions/kopeteavailable.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/newmsg.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/account_offline_overlay.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/account_offline_overlay.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/account_offline_overlay.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/newmsg.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/status_unknown.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_online.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/kopeteavailable.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/status_unknown.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/32x32/actions/kopeteaway.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_online.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_unknown.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/kopeteaway.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions/kopeteaway.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_offline.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/kopeteaway.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_online.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/actions/account_offline_overlay.svgz
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/kopeteaway.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/emoticon.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/metacontact_offline.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/kopeteaway.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_unknown.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/metacontact_away.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_unknown.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/newmsg.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/account_offline_overlay.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_away.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/kopeteavailable.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/account_offline_overlay.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions/kopeteavailable.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/48x48/actions/kopeteavailable.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/newmsg.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/32x32/actions/newmessage.mng
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/kopeteavailable.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/newmessage.mng
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/kopeteavailable.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/kopeteavailable.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/newmsg.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/status_unknown.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/newmsg.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/22x22/actions/kopeteaway.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/kopeteaway.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/metacontact_unknown.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/48x48/actions/kopeteaway.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdenetwork-3.4.1.orig/kopete/kopete/addcontactwizard/Makefile.in kdenetwork-3.4.1/kopete/kopete/addcontactwizard/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/kopete/addcontactwizard/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/kopete/kopete/addcontactwizard/Makefile.in	2005-05-24 13:47:11.000000000 -0400
 @@ -230,6 +230,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -9208,9 +10162,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/kopete/chatwindow/Makefile.in kdenetwork-3.4.1/kopete/kopete/chatwindow/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/kopete/chatwindow/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/kopete/chatwindow/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/kopete/chatwindow/Makefile.in kdenetwork-3.4.1/kopete/kopete/chatwindow/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/kopete/chatwindow/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/kopete/kopete/chatwindow/Makefile.in	2005-05-24 13:47:11.000000000 -0400
 @@ -270,6 +270,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -9242,9 +10196,57 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/kopete/config/accounts/Makefile.in kdenetwork-3.4.1/kopete/kopete/config/accounts/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/kopete/config/accounts/Makefile.in	2005-05-23 18:09:02.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/kopete/config/accounts/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -911,11 +914,11 @@
+ mocs: kopeteemailwindow.moc
+ 
+ #>+ 3
+-chatmemberslistwidget.moc: $(srcdir)/chatmemberslistwidget.h
+-	$(MOC) $(srcdir)/chatmemberslistwidget.h -o chatmemberslistwidget.moc
++kopeteemoticonaction.moc: $(srcdir)/kopeteemoticonaction.h
++	$(MOC) $(srcdir)/kopeteemoticonaction.h -o kopeteemoticonaction.moc
+ 
+ #>+ 2
+-mocs: chatmemberslistwidget.moc
++mocs: kopeteemoticonaction.moc
+ 
+ #>+ 3
+ kopetechatwindow.moc: $(srcdir)/kopetechatwindow.h
+@@ -925,11 +928,11 @@
+ mocs: kopetechatwindow.moc
+ 
+ #>+ 3
+-kopeteemoticonaction.moc: $(srcdir)/kopeteemoticonaction.h
+-	$(MOC) $(srcdir)/kopeteemoticonaction.h -o kopeteemoticonaction.moc
++chatmemberslistwidget.moc: $(srcdir)/chatmemberslistwidget.h
++	$(MOC) $(srcdir)/chatmemberslistwidget.h -o chatmemberslistwidget.moc
+ 
+ #>+ 2
+-mocs: kopeteemoticonaction.moc
++mocs: chatmemberslistwidget.moc
+ 
+ #>+ 8
+ kopete_emailwindow.la.closure: $(kopete_emailwindow_la_OBJECTS) $(kopete_emailwindow_la_DEPENDENCIES)
+@@ -951,7 +954,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  krichtexteditpart.moc emoticonselector.moc chattexteditpart.moc chatmessagepart.moc chatview.moc kopeteemailwindow.moc chatmemberslistwidget.moc kopetechatwindow.moc kopeteemoticonaction.moc
++	-rm -f  krichtexteditpart.moc emoticonselector.moc chattexteditpart.moc chatmessagepart.moc chatview.moc kopeteemailwindow.moc kopeteemoticonaction.moc kopetechatwindow.moc chatmemberslistwidget.moc
+ 
+ #>+ 2
+ KDE_DIST=kopeteemailwindow.rc kopetechatwindow.h emoticonselector.h emailwindow.desktop chatwindow.desktop chattexteditpart.h chatmemberslistwidget.h krichtexteditpart.h kopetechatwindow.rc chatview.h Makefile.in kopeteemoticonaction.h kopeterichtexteditpartfull.rc chatmessagepart.h kopeteemailwindow.h Makefile.am 
+@@ -1002,7 +1005,7 @@
+ 
+ 
+ #>+ 11
+-kopete_chatwindow_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/chatmessagepart.cpp $(srcdir)/emoticonselector.cpp $(srcdir)/kopeteemoticonaction.cpp $(srcdir)/chattexteditpart.cpp $(srcdir)/krichtexteditpart.cpp $(srcdir)/chatview.cpp $(srcdir)/kopetechatwindow.cpp $(srcdir)/chatmemberslistwidget.cpp  krichtexteditpart.moc emoticonselector.moc chatmessagepart.moc chattexteditpart.moc chatview.moc kopeteemoticonaction.moc chatmemberslistwidget.moc kopetechatwindow.moc
++kopete_chatwindow_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/chatmessagepart.cpp $(srcdir)/emoticonselector.cpp $(srcdir)/kopeteemoticonaction.cpp $(srcdir)/chattexteditpart.cpp $(srcdir)/krichtexteditpart.cpp $(srcdir)/chatview.cpp $(srcdir)/kopetechatwindow.cpp $(srcdir)/chatmemberslistwidget.cpp  krichtexteditpart.moc emoticonselector.moc chatmessagepart.moc chattexteditpart.moc chatview.moc chatmemberslistwidget.moc kopeteemoticonaction.moc kopetechatwindow.moc
+ 	@echo 'creating kopete_chatwindow_la.all_cpp.cpp ...'; \
+ 	rm -f kopete_chatwindow_la.all_cpp.files kopete_chatwindow_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kopete_chatwindow_la.all_cpp.final; \
+diff -Nru kdenetwork-3.4.1.orig/kopete/kopete/config/accounts/Makefile.in kdenetwork-3.4.1/kopete/kopete/config/accounts/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/kopete/config/accounts/Makefile.in	2005-05-23 12:09:02.000000000 -0400
++++ kdenetwork-3.4.1/kopete/kopete/config/accounts/Makefile.in	2005-05-24 13:47:11.000000000 -0400
 @@ -241,6 +241,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -9276,9 +10278,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/kopete/config/appearance/Makefile.in kdenetwork-3.4.1/kopete/kopete/config/appearance/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/kopete/config/appearance/Makefile.in	2005-05-23 18:09:02.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/kopete/config/appearance/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -792,7 +795,7 @@
+ 	-rm -f  addaccountwizard.moc kopeteaccountconfig.moc
+ 
+ #>+ 2
+-KDE_DIST=kopeteaccountconfig.h addaccountwizardpage3.ui kopete_accountconfig.desktop addaccountwizardpage1.ui Makefile.in kopeteaccountconfigbase.ui Makefile.am addaccountwizard.h addaccountwizardpage2.ui 
++KDE_DIST=kopeteaccountconfig.h addaccountwizardpage3.ui kopete_accountconfig.desktop addaccountwizardpage1.ui Makefile.in kopeteaccountconfigbase.ui Makefile.am addaccountwizardpage2.ui addaccountwizard.h 
+ 
+ #>+ 7
+ clean-ui:
+diff -Nru kdenetwork-3.4.1.orig/kopete/kopete/config/appearance/Makefile.in kdenetwork-3.4.1/kopete/kopete/config/appearance/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/kopete/config/appearance/Makefile.in	2005-05-23 12:09:02.000000000 -0400
++++ kdenetwork-3.4.1/kopete/kopete/config/appearance/Makefile.in	2005-05-24 13:47:11.000000000 -0400
 @@ -241,6 +241,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -9310,9 +10321,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/kopete/config/behavior/Makefile.in kdenetwork-3.4.1/kopete/kopete/config/behavior/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/kopete/config/behavior/Makefile.in	2005-05-23 18:09:02.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/kopete/config/behavior/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -799,7 +802,7 @@
+ 	-rm -f  tooltipeditdialog.moc appearanceconfig.moc
+ 
+ #>+ 2
+-KDE_DIST=kopete_appearanceconfig.desktop tooltipeditwidget.ui appearanceconfig.h appearanceconfig_emoticons.ui Makefile.in appearanceconfig_colors.ui tooltipeditdialog.h appearanceconfig_contactlist.ui appearanceconfig_chatwindow.ui Makefile.am 
++KDE_DIST=kopete_appearanceconfig.desktop tooltipeditwidget.ui appearanceconfig_emoticons.ui appearanceconfig.h Makefile.in appearanceconfig_colors.ui tooltipeditdialog.h appearanceconfig_contactlist.ui Makefile.am appearanceconfig_chatwindow.ui 
+ 
+ #>+ 8
+ clean-ui:
+diff -Nru kdenetwork-3.4.1.orig/kopete/kopete/config/behavior/Makefile.in kdenetwork-3.4.1/kopete/kopete/config/behavior/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/kopete/config/behavior/Makefile.in	2005-05-23 12:09:02.000000000 -0400
++++ kdenetwork-3.4.1/kopete/kopete/config/behavior/Makefile.in	2005-05-24 13:47:11.000000000 -0400
 @@ -239,6 +239,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -9344,9 +10364,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/kopete/config/Makefile.in kdenetwork-3.4.1/kopete/kopete/config/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/kopete/config/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/kopete/config/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/kopete/config/Makefile.in kdenetwork-3.4.1/kopete/kopete/config/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/kopete/config/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/kopete/kopete/config/Makefile.in	2005-05-24 13:47:11.000000000 -0400
 @@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -9378,9 +10398,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/kopete/config/plugins/Makefile.in kdenetwork-3.4.1/kopete/kopete/config/plugins/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/kopete/config/plugins/Makefile.in	2005-05-23 18:09:02.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/kopete/config/plugins/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/kopete/config/plugins/Makefile.in kdenetwork-3.4.1/kopete/kopete/config/plugins/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/kopete/config/plugins/Makefile.in	2005-05-23 12:09:02.000000000 -0400
++++ kdenetwork-3.4.1/kopete/kopete/config/plugins/Makefile.in	2005-05-24 13:47:11.000000000 -0400
 @@ -222,6 +222,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -9412,9 +10432,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/kopete/contactlist/Makefile.in kdenetwork-3.4.1/kopete/kopete/contactlist/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/kopete/contactlist/Makefile.in	2005-05-23 18:09:02.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/kopete/contactlist/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/kopete/contactlist/Makefile.in kdenetwork-3.4.1/kopete/kopete/contactlist/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/kopete/contactlist/Makefile.in	2005-05-23 12:09:02.000000000 -0400
++++ kdenetwork-3.4.1/kopete/kopete/contactlist/Makefile.in	2005-05-24 13:47:11.000000000 -0400
 @@ -239,6 +239,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -9446,9 +10466,47 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/kopete/kconf_update/Makefile.in kdenetwork-3.4.1/kopete/kopete/kconf_update/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/kopete/kconf_update/Makefile.in	2005-05-23 18:09:02.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/kopete/kconf_update/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -759,18 +762,18 @@
+ mocs: customnotificationprops.moc
+ 
+ #>+ 3
+-kopetecontactlistview.moc: $(srcdir)/kopetecontactlistview.h
+-	$(MOC) $(srcdir)/kopetecontactlistview.h -o kopetecontactlistview.moc
++kopetelviprops.moc: $(srcdir)/kopetelviprops.h
++	$(MOC) $(srcdir)/kopetelviprops.h -o kopetelviprops.moc
+ 
+ #>+ 2
+-mocs: kopetecontactlistview.moc
++mocs: kopetelviprops.moc
+ 
+ #>+ 3
+-kopetelviprops.moc: $(srcdir)/kopetelviprops.h
+-	$(MOC) $(srcdir)/kopetelviprops.h -o kopetelviprops.moc
++kopetecontactlistview.moc: $(srcdir)/kopetecontactlistview.h
++	$(MOC) $(srcdir)/kopetecontactlistview.h -o kopetecontactlistview.moc
+ 
+ #>+ 2
+-mocs: kopetelviprops.moc
++mocs: kopetecontactlistview.moc
+ 
+ #>+ 3
+ kopetelistview.moc: $(srcdir)/kopetelistview.h
+@@ -823,10 +826,10 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  kopetegrouplistaction.moc customnotificationprops.moc kopetecontactlistview.moc kopetelviprops.moc kopetelistview.moc kabcexport.moc linkaddressbookui.moc kopetelistviewitem.moc kopetelistviewsearchline.moc kopetemetacontactlvi.moc kopetegroupviewitem.moc
++	-rm -f  kopetegrouplistaction.moc customnotificationprops.moc kopetelviprops.moc kopetecontactlistview.moc kopetelistview.moc kabcexport.moc linkaddressbookui.moc kopetelistviewitem.moc kopetelistviewsearchline.moc kopetemetacontactlvi.moc kopetegroupviewitem.moc
+ 
+ #>+ 2
+-KDE_DIST=kopetelviprops.h kopetecontactlistview.h kopetegrouplistaction.h linkaddressbookui_base.ui configure.in.in kopetegroupviewitem.h kopetestatusgroupviewitem.h customnotifications.ui Makefile.in kopetelistview.h kopetemetalvipropswidget.ui kopetemetacontactlvi.h kopetegvipropswidget.ui kabcexport_base.ui kopeteaddrbookexportui.ui Makefile.am kopetelistviewsearchline.h kopetelistviewitem.h 
++KDE_DIST=kopetelviprops.h kopetecontactlistview.h kopetegrouplistaction.h linkaddressbookui_base.ui configure.in.in kopetegroupviewitem.h customnotifications.ui kopetestatusgroupviewitem.h Makefile.in kopetelistview.h kopetemetalvipropswidget.ui kopetegvipropswidget.ui kopetemetacontactlvi.h kabcexport_base.ui kopeteaddrbookexportui.ui Makefile.am kopetelistviewsearchline.h kopetelistviewitem.h 
+ 
+ #>+ 9
+ clean-ui:
+diff -Nru kdenetwork-3.4.1.orig/kopete/kopete/kconf_update/Makefile.in kdenetwork-3.4.1/kopete/kopete/kconf_update/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/kopete/kconf_update/Makefile.in	2005-05-23 12:09:02.000000000 -0400
++++ kdenetwork-3.4.1/kopete/kopete/kconf_update/Makefile.in	2005-05-24 13:47:11.000000000 -0400
 @@ -261,6 +261,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -9480,9 +10538,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kconfPROGRAMS: $(kconf_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/kopete/Makefile.in kdenetwork-3.4.1/kopete/kopete/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/kopete/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/kopete/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/kopete/Makefile.in kdenetwork-3.4.1/kopete/kopete/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/kopete/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/kopete/kopete/Makefile.in	2005-05-24 13:47:10.000000000 -0400
 @@ -264,6 +264,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -9514,9 +10572,121 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/libkopete/Makefile.in kdenetwork-3.4.1/kopete/libkopete/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/libkopete/Makefile.in	2005-05-23 18:09:02.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/libkopete/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -1000,18 +1003,18 @@
+ mocs: kopetewindow.moc
+ 
+ #>+ 3
+-kopeteapplication.moc: $(srcdir)/kopeteapplication.h
+-	$(MOC) $(srcdir)/kopeteapplication.h -o kopeteapplication.moc
++kimifaceimpl.moc: $(srcdir)/kimifaceimpl.h
++	$(MOC) $(srcdir)/kimifaceimpl.h -o kimifaceimpl.moc
+ 
+ #>+ 2
+-mocs: kopeteapplication.moc
++mocs: kimifaceimpl.moc
+ 
+ #>+ 3
+-kimifaceimpl.moc: $(srcdir)/kimifaceimpl.h
+-	$(MOC) $(srcdir)/kimifaceimpl.h -o kimifaceimpl.moc
++kopeteapplication.moc: $(srcdir)/kopeteapplication.h
++	$(MOC) $(srcdir)/kopeteapplication.h -o kopeteapplication.moc
+ 
+ #>+ 2
+-mocs: kimifaceimpl.moc
++mocs: kopeteapplication.moc
+ 
+ #>+ 3
+ systemtray.moc: $(srcdir)/systemtray.h
+@@ -1029,10 +1032,10 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  kopeteglobalawaydialog.moc kopeteballoon.moc kopetewindow.moc kopeteapplication.moc kimifaceimpl.moc systemtray.moc kopeteaccountstatusbaricon.moc
++	-rm -f  kopeteglobalawaydialog.moc kopeteballoon.moc kopetewindow.moc kimifaceimpl.moc kopeteapplication.moc systemtray.moc kopeteaccountstatusbaricon.moc
+ 
+ #>+ 2
+-KDE_DIST=systemtray.h kopeteapplication.h kopetewindow.h kopete.desktop kopeteaccountstatusbaricon.h cr22-app-kopete_some_online.png eventsrc cr22-app-kopete_offline.png kimiface.h crsc-app-kopete2.svgz cr64-app-kopete.png cr16-app-kopete.png cr22-app-kopete_all_away.png kopeteiface.h kopeteglobalawaydialog.h Makefile.in x-kopete-emoticons.desktop cr16-mime-kopete_emoticons.png cr48-app-kopete.png kopeteui.rc kopeteballoon.h cr22-app-kopete.png cr32-app-kopete.png cr22-app-kopete_some_away.png kopeteglobalawaydialog.cpp Makefile.am cr128-app-kopete.png cr22-mime-kopete_emoticons.png 
++KDE_DIST=systemtray.h kopeteapplication.h kopetewindow.h kopete.desktop kopeteaccountstatusbaricon.h cr22-app-kopete_some_online.png eventsrc cr22-app-kopete_offline.png kimiface.h crsc-app-kopete2.svgz cr64-app-kopete.png cr16-app-kopete.png cr22-app-kopete_all_away.png kopeteiface.h kopeteglobalawaydialog.h x-kopete-emoticons.desktop cr16-mime-kopete_emoticons.png Makefile.in cr48-app-kopete.png kopeteui.rc kopeteballoon.h cr22-app-kopete.png cr32-app-kopete.png kopeteglobalawaydialog.cpp cr22-app-kopete_some_away.png cr128-app-kopete.png Makefile.am cr22-mime-kopete_emoticons.png 
+ 
+ #>+ 5
+ clean-idl:
+@@ -1045,43 +1048,43 @@
+ 
+ #>+ 39
+ install-kde-icons:
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
++	$(INSTALL_DATA) $(srcdir)/cr22-app-kopete_some_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_some_away.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-kopete.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kopete.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kopete.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-kopete_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_offline.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kopete.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kopete.png
++	$(INSTALL_DATA) $(srcdir)/cr22-app-kopete_all_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_all_away.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
+ 	$(INSTALL_DATA) $(srcdir)/crsc-app-kopete2.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kopete2.svgz
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes
++	$(INSTALL_DATA) $(srcdir)/cr16-mime-kopete_emoticons.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kopete_emoticons.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr128-app-kopete.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kopete.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-kopete.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-app-kopete_some_online.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_some_online.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes
+-	$(INSTALL_DATA) $(srcdir)/cr16-mime-kopete_emoticons.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kopete_emoticons.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kopete.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kopete.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-kopete.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kopete.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-kopete.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kopete.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-kopete_some_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_some_away.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kopete.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kopete.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes
+ 	$(INSTALL_DATA) $(srcdir)/cr22-mime-kopete_emoticons.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kopete_emoticons.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-kopete_all_away.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_all_away.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-kopete_offline.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_offline.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kopete.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kopete.png
+ 
+ uninstall-kde-icons:
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_some_away.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kopete.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_offline.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kopete.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_all_away.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kopete2.svgz
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kopete_emoticons.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kopete.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_some_online.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/kopete_emoticons.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kopete.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kopete.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kopete.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_some_away.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kopete.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/kopete_emoticons.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_all_away.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kopete_offline.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kopete.png
+ 
+ #>+ 15
+ force-reedit:
+@@ -1122,7 +1125,7 @@
+ 
+ 
+ #>+ 11
+-kopete.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kopeteapplication.cpp $(srcdir)/kopeteiface.cpp $(srcdir)/systemtray.cpp $(srcdir)/kopeteballoon.cpp $(srcdir)/kopetewindow.cpp $(srcdir)/kopeteaccountstatusbaricon.cpp $(srcdir)/kimifaceimpl.cpp kopeteiface_skel.cpp kimiface_skel.cpp  kopeteballoon.moc kopetewindow.moc kimifaceimpl.moc kopeteapplication.moc systemtray.moc kopeteaccountstatusbaricon.moc
++kopete.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/kopeteapplication.cpp $(srcdir)/kopeteiface.cpp $(srcdir)/systemtray.cpp $(srcdir)/kopeteballoon.cpp $(srcdir)/kopetewindow.cpp $(srcdir)/kopeteaccountstatusbaricon.cpp $(srcdir)/kimifaceimpl.cpp kopeteiface_skel.cpp kimiface_skel.cpp  kopeteballoon.moc kopetewindow.moc kopeteapplication.moc kimifaceimpl.moc systemtray.moc kopeteaccountstatusbaricon.moc
+ 	@echo 'creating kopete.all_cpp.cpp ...'; \
+ 	rm -f kopete.all_cpp.files kopete.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kopete.all_cpp.final; \
+diff -Nru kdenetwork-3.4.1.orig/kopete/libkopete/Makefile.in kdenetwork-3.4.1/kopete/libkopete/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/libkopete/Makefile.in	2005-05-23 12:09:02.000000000 -0400
++++ kdenetwork-3.4.1/kopete/libkopete/Makefile.in	2005-05-24 13:47:12.000000000 -0400
 @@ -304,6 +304,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -9548,9 +10718,127 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/libkopete/private/Makefile.in kdenetwork-3.4.1/kopete/libkopete/private/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/libkopete/private/Makefile.in	2005-05-23 18:09:02.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/libkopete/private/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -1265,18 +1268,18 @@
+ mocs: kopeteaccount.moc
+ 
+ #>+ 3
+-kopetewalletmanager.moc: $(srcdir)/kopetewalletmanager.h
+-	$(MOC) $(srcdir)/kopetewalletmanager.h -o kopetewalletmanager.moc
++kopetecontact.moc: $(srcdir)/kopetecontact.h
++	$(MOC) $(srcdir)/kopetecontact.h -o kopetecontact.moc
+ 
+ #>+ 2
+-mocs: kopetewalletmanager.moc
++mocs: kopetecontact.moc
+ 
+ #>+ 3
+-kopetecontact.moc: $(srcdir)/kopetecontact.h
+-	$(MOC) $(srcdir)/kopetecontact.h -o kopetecontact.moc
++kopetewalletmanager.moc: $(srcdir)/kopetewalletmanager.h
++	$(MOC) $(srcdir)/kopetewalletmanager.h -o kopetewalletmanager.moc
+ 
+ #>+ 2
+-mocs: kopetecontact.moc
++mocs: kopetewalletmanager.moc
+ 
+ #>+ 3
+ kopeteaccountmanager.moc: $(srcdir)/kopeteaccountmanager.h
+@@ -1293,18 +1296,18 @@
+ mocs: kopetecommandhandler.moc
+ 
+ #>+ 3
+-kopetepluginmanager.moc: $(srcdir)/kopetepluginmanager.h
+-	$(MOC) $(srcdir)/kopetepluginmanager.h -o kopetepluginmanager.moc
++kopeteawayaction.moc: $(srcdir)/kopeteawayaction.h
++	$(MOC) $(srcdir)/kopeteawayaction.h -o kopeteawayaction.moc
+ 
+ #>+ 2
+-mocs: kopetepluginmanager.moc
++mocs: kopeteawayaction.moc
+ 
+ #>+ 3
+-kopeteawayaction.moc: $(srcdir)/kopeteawayaction.h
+-	$(MOC) $(srcdir)/kopeteawayaction.h -o kopeteawayaction.moc
++kopetepluginmanager.moc: $(srcdir)/kopetepluginmanager.h
++	$(MOC) $(srcdir)/kopetepluginmanager.h -o kopetepluginmanager.moc
+ 
+ #>+ 2
+-mocs: kopeteawayaction.moc
++mocs: kopetepluginmanager.moc
+ 
+ #>+ 3
+ kautoconfig.moc: $(srcdir)/kautoconfig.h
+@@ -1398,18 +1401,18 @@
+ mocs: kopeteplugin.moc
+ 
+ #>+ 3
+-kopetesimplemessagehandler.moc: $(srcdir)/kopetesimplemessagehandler.h
+-	$(MOC) $(srcdir)/kopetesimplemessagehandler.h -o kopetesimplemessagehandler.moc
++kcautoconfigmodule.moc: $(srcdir)/kcautoconfigmodule.h
++	$(MOC) $(srcdir)/kcautoconfigmodule.h -o kcautoconfigmodule.moc
+ 
+ #>+ 2
+-mocs: kopetesimplemessagehandler.moc
++mocs: kcautoconfigmodule.moc
+ 
+ #>+ 3
+-kcautoconfigmodule.moc: $(srcdir)/kcautoconfigmodule.h
+-	$(MOC) $(srcdir)/kcautoconfigmodule.h -o kcautoconfigmodule.moc
++kopetesimplemessagehandler.moc: $(srcdir)/kopetesimplemessagehandler.h
++	$(MOC) $(srcdir)/kopetesimplemessagehandler.h -o kopetesimplemessagehandler.moc
+ 
+ #>+ 2
+-mocs: kcautoconfigmodule.moc
++mocs: kopetesimplemessagehandler.moc
+ 
+ #>+ 3
+ kopetecontactlist.moc: $(srcdir)/kopetecontactlist.h
+@@ -1454,18 +1457,18 @@
+ mocs: kopeteonlinestatusmanager.moc
+ 
+ #>+ 3
+-kopetemessagemanagerfactory.moc: $(srcdir)/kopetemessagemanagerfactory.h
+-	$(MOC) $(srcdir)/kopetemessagemanagerfactory.h -o kopetemessagemanagerfactory.moc
++kopetemessageevent.moc: $(srcdir)/kopetemessageevent.h
++	$(MOC) $(srcdir)/kopetemessageevent.h -o kopetemessageevent.moc
+ 
+ #>+ 2
+-mocs: kopetemessagemanagerfactory.moc
++mocs: kopetemessageevent.moc
+ 
+ #>+ 3
+-kopetemessageevent.moc: $(srcdir)/kopetemessageevent.h
+-	$(MOC) $(srcdir)/kopetemessageevent.h -o kopetemessageevent.moc
++kopetemessagemanagerfactory.moc: $(srcdir)/kopetemessagemanagerfactory.h
++	$(MOC) $(srcdir)/kopetemessagemanagerfactory.h -o kopetemessagemanagerfactory.moc
+ 
+ #>+ 2
+-mocs: kopetemessageevent.moc
++mocs: kopetemessagemanagerfactory.moc
+ 
+ #>+ 3
+ kopetemessagemanager.moc: $(srcdir)/kopetemessagemanager.h
+@@ -1483,7 +1486,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  kopetexsl.moc kopeteaccount.moc kopetewalletmanager.moc kopetecontact.moc kopeteaccountmanager.moc kopetecommandhandler.moc kopetepluginmanager.moc kopeteawayaction.moc kautoconfig.moc kopeteblacklister.moc kabcpersistence.moc kopetecontactlistelement.moc kopetemessagehandlerchain.moc kopetegroup.moc kopeteprotocol.moc kopetemessagehandler.moc connectionmanager.moc kopeteawaydialog.moc kopeteaway.moc kopetepassword.moc kopeteplugin.moc kopetesimplemessagehandler.moc kcautoconfigmodule.moc kopetecontactlist.moc kopetetransfermanager.moc kopetetask.moc kopetepasswordedaccount.moc managedconnectionaccount.moc kopeteonlinestatusmanager.moc kopetemessagemanagerfactory.moc kopetemessageevent.moc kopetemessagemanager.moc kopetemetacontact.moc
++	-rm -f  kopetexsl.moc kopeteaccount.moc kopetecontact.moc kopetewalletmanager.moc kopeteaccountmanager.moc kopetecommandhandler.moc kopeteawayaction.moc kopetepluginmanager.moc kautoconfig.moc kopeteblacklister.moc kabcpersistence.moc kopetecontactlistelement.moc kopetemessagehandlerchain.moc kopetegroup.moc kopeteprotocol.moc kopetemessagehandler.moc connectionmanager.moc kopeteawaydialog.moc kopeteaway.moc kopetepassword.moc kopeteplugin.moc kcautoconfigmodule.moc kopetesimplemessagehandler.moc kopetecontactlist.moc kopetetransfermanager.moc kopetetask.moc kopetepasswordedaccount.moc managedconnectionaccount.moc kopeteonlinestatusmanager.moc kopetemessageevent.moc kopetemessagemanagerfactory.moc kopetemessagemanager.moc kopetemetacontact.moc
+ 
+ #>+ 2
+ KDE_DIST=connectionmanager.h PORTING kopetenotifyevent.h API-TODO kautoconfig.h kopetewalletmanager.h clientiface.h kopeteui.desktop kopetepluginmanager.h kopetemimesourcefactory.h kopeteplugin.desktop kopetecommandui.rc kcautoconfigmodule.h configure.in.in Makefile.in kopeteproperties.h kopeteprotocol.desktop Makefile.am networkstatuscommon.cpp 
+@@ -1540,7 +1543,7 @@
+ 
+ 
+ #>+ 11
+-libkopete_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/connectionmanager.cpp $(srcdir)/kopeteonlinestatus.cpp $(srcdir)/kopeteonlinestatusmanager.cpp $(srcdir)/kopeteprotocol.cpp $(srcdir)/kopetecontact.cpp $(srcdir)/kopetepluginmanager.cpp $(srcdir)/kopeteplugin.cpp $(srcdir)/kopetemessage.cpp $(srcdir)/kopetemessagemanager.cpp $(srcdir)/kopetemessagemanagerfactory.cpp $(srcdir)/kopetecontactlist.cpp $(srcdir)/kopetemetacontact.cpp $(srcdir)/kopeteawaydialog.cpp $(srcdir)/kopetetransfermanager.cpp $(srcdir)/kopetegroup.cpp $(srcdir)/kcautoconfigmodule.cpp $(srcdir)/kopeteaccountmanager.cpp $(srcdir)/kopeteaccount.cpp $(srcdir)/kopetecontactlistelement.cpp $(srcdir)/kopetecommandhandler.cpp $(srcdir)/kopetenotifyclient.cpp $(srcdir)/kopeteaway.cpp $(srcdir)/kopeteawayaction.cpp $(srcdir)/kautoconfig.cpp $(srcdir)/kopetewalletmanager.cpp $(srcdir)/kopetecontactproperty.cpp $(srcdir)/kopetepassword.cpp $(srcdir)/kopeteglobal.cpp $(srcdir)/kopeteuiglobal.cpp $(srcdir)/kopetepasswordedaccount.cpp $(srcdir)/kopetemimetypehandler.cpp $(srcdir)/kopetetask.cpp $(srcdir)/kopetemimesourcefactory.cpp $(srcdir)/kopetexsl.cpp $(srcdir)/kopeteeventpresentation.cpp $(srcdir)/kopetenotifyevent.cpp $(srcdir)/kopetenotifydataobject.cpp $(srcdir)/kopeteblacklister.cpp $(srcdir)/kopetemessageevent.cpp $(srcdir)/kopetemessagehandler.cpp $(srcdir)/kopetemessagehandlerchain.cpp $(srcdir)/kopetesimplemessagehandler.cpp $(srcdir)/kopeteproperties.cpp $(srcdir)/kabcpersistence.cpp $(srcdir)/managedconnectionaccount.cpp connectionmanager_skel.cpp clientiface_stub.cpp  kopeteaccount.moc kopetexsl.moc kopetecontact.moc kopetewalletmanager.moc kopeteaccountmanager.moc kopetecommandhandler.moc kopetepluginmanager.moc kopeteawayaction.moc kautoconfig.moc kopeteblacklister.moc kabcpersistence.moc kopetecontactlistelement.moc kopetemessagehandlerchain.moc kopetegroup.moc kopeteprotocol.moc kopetemessagehandler.moc connectionmanager.moc kopeteawaydialog.moc kopeteaway.moc kopetepassword.moc kopeteplugin.moc kopetesimplemessagehandler.moc kcautoconfigmodule.moc kopetecontactlist.moc kopetetransfermanager.moc kopetetask.moc kopetepasswordedaccount.moc managedconnectionaccount.moc kopeteonlinestatusmanager.moc kopetemessagemanagerfactory.moc kopetemessageevent.moc kopetemessagemanager.moc kopetemetacontact.moc
++libkopete_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/connectionmanager.cpp $(srcdir)/kopeteonlinestatus.cpp $(srcdir)/kopeteonlinestatusmanager.cpp $(srcdir)/kopeteprotocol.cpp $(srcdir)/kopetecontact.cpp $(srcdir)/kopetepluginmanager.cpp $(srcdir)/kopeteplugin.cpp $(srcdir)/kopetemessage.cpp $(srcdir)/kopetemessagemanager.cpp $(srcdir)/kopetemessagemanagerfactory.cpp $(srcdir)/kopetecontactlist.cpp $(srcdir)/kopetemetacontact.cpp $(srcdir)/kopeteawaydialog.cpp $(srcdir)/kopetetransfermanager.cpp $(srcdir)/kopetegroup.cpp $(srcdir)/kcautoconfigmodule.cpp $(srcdir)/kopeteaccountmanager.cpp $(srcdir)/kopeteaccount.cpp $(srcdir)/kopetecontactlistelement.cpp $(srcdir)/kopetecommandhandler.cpp $(srcdir)/kopetenotifyclient.cpp $(srcdir)/kopeteaway.cpp $(srcdir)/kopeteawayaction.cpp $(srcdir)/kautoconfig.cpp $(srcdir)/kopetewalletmanager.cpp $(srcdir)/kopetecontactproperty.cpp $(srcdir)/kopetepassword.cpp $(srcdir)/kopeteglobal.cpp $(srcdir)/kopeteuiglobal.cpp $(srcdir)/kopetepasswordedaccount.cpp $(srcdir)/kopetemimetypehandler.cpp $(srcdir)/kopetetask.cpp $(srcdir)/kopetemimesourcefactory.cpp $(srcdir)/kopetexsl.cpp $(srcdir)/kopeteeventpresentation.cpp $(srcdir)/kopetenotifyevent.cpp $(srcdir)/kopetenotifydataobject.cpp $(srcdir)/kopeteblacklister.cpp $(srcdir)/kopetemessageevent.cpp $(srcdir)/kopetemessagehandler.cpp $(srcdir)/kopetemessagehandlerchain.cpp $(srcdir)/kopetesimplemessagehandler.cpp $(srcdir)/kopeteproperties.cpp $(srcdir)/kabcpersistence.cpp $(srcdir)/managedconnectionaccount.cpp connectionmanager_skel.cpp clientiface_stub.cpp  kopeteaccount.moc kopetexsl.moc kopetewalletmanager.moc kopetecontact.moc kopeteaccountmanager.moc kopetecommandhandler.moc kopeteawayaction.moc kopetepluginmanager.moc kautoconfig.moc kopeteblacklister.moc kabcpersistence.moc kopetecontactlistelement.moc kopetemessagehandlerchain.moc kopetegroup.moc kopeteprotocol.moc kopetemessagehandler.moc connectionmanager.moc kopeteawaydialog.moc kopeteaway.moc kopetepassword.moc kopeteplugin.moc kcautoconfigmodule.moc kopetesimplemessagehandler.moc kopetecontactlist.moc kopetetransfermanager.moc kopetetask.moc kopetepasswordedaccount.moc managedconnectionaccount.moc kopeteonlinestatusmanager.moc kopetemessageevent.moc kopetemessagemanagerfactory.moc kopetemessagemanager.moc kopetemetacontact.moc
+ 	@echo 'creating libkopete_la.all_cpp.cpp ...'; \
+ 	rm -f libkopete_la.all_cpp.files libkopete_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkopete_la.all_cpp.final; \
+diff -Nru kdenetwork-3.4.1.orig/kopete/libkopete/private/Makefile.in kdenetwork-3.4.1/kopete/libkopete/private/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/libkopete/private/Makefile.in	2005-05-23 12:09:02.000000000 -0400
++++ kdenetwork-3.4.1/kopete/libkopete/private/Makefile.in	2005-05-24 13:47:12.000000000 -0400
 @@ -226,6 +226,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -9582,9 +10870,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/libkopete/tests/Makefile.in kdenetwork-3.4.1/kopete/libkopete/tests/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/libkopete/tests/Makefile.in	2005-05-23 18:09:02.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/libkopete/tests/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -733,7 +736,7 @@
+ 	-rm -f  kopeteviewmanager.moc kopeteemoticons.moc kopeteprefs.moc kopetecommand.moc
+ 
+ #>+ 2
+-KDE_DIST=kopetecommand.h kopeteprefs.h kopeteemoticons.h Makefile.in Makefile.am kopeteviewmanager.h 
++KDE_DIST=kopetecommand.h kopeteprefs.h kopeteemoticons.h Makefile.in kopeteviewmanager.h Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdenetwork-3.4.1.orig/kopete/libkopete/tests/Makefile.in kdenetwork-3.4.1/kopete/libkopete/tests/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/libkopete/tests/Makefile.in	2005-05-23 12:09:02.000000000 -0400
++++ kdenetwork-3.4.1/kopete/libkopete/tests/Makefile.in	2005-05-24 13:47:12.000000000 -0400
 @@ -245,6 +245,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -9616,9 +10913,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-checkPROGRAMS:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/libkopete/ui/Makefile.in kdenetwork-3.4.1/kopete/libkopete/ui/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/libkopete/ui/Makefile.in	2005-05-23 18:09:02.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/libkopete/ui/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/libkopete/ui/Makefile.in kdenetwork-3.4.1/kopete/libkopete/ui/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/libkopete/ui/Makefile.in	2005-05-23 12:09:02.000000000 -0400
++++ kdenetwork-3.4.1/kopete/libkopete/ui/Makefile.in	2005-05-24 13:47:12.000000000 -0400
 @@ -243,6 +243,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -9650,9 +10947,39 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/Makefile.in kdenetwork-3.4.1/kopete/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/Makefile.in	2005-05-24 17:07:06.000000000 +0200
+@@ -797,22 +800,22 @@
+ mocs: kopetestdaction.moc
+ 
+ #>+ 3
+-kopetepasswordwidget.moc: $(srcdir)/kopetepasswordwidget.h
+-	$(MOC) $(srcdir)/kopetepasswordwidget.h -o kopetepasswordwidget.moc
++accountselector.moc: $(srcdir)/accountselector.h
++	$(MOC) $(srcdir)/accountselector.h -o accountselector.moc
+ 
+ #>+ 2
+-mocs: kopetepasswordwidget.moc
++mocs: accountselector.moc
+ 
+ #>+ 3
+-accountselector.moc: $(srcdir)/accountselector.h
+-	$(MOC) $(srcdir)/accountselector.h -o accountselector.moc
++kopetepasswordwidget.moc: $(srcdir)/kopetepasswordwidget.h
++	$(MOC) $(srcdir)/kopetepasswordwidget.h -o kopetepasswordwidget.moc
+ 
+ #>+ 2
+-mocs: accountselector.moc
++mocs: kopetepasswordwidget.moc
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  userinfodialog.moc kopetecontactaction.moc kopetefileconfirmdialog.moc addcontactpage.moc kopetestdaction.moc kopetepasswordwidget.moc accountselector.moc
++	-rm -f  userinfodialog.moc kopetecontactaction.moc kopetefileconfirmdialog.moc addcontactpage.moc kopetestdaction.moc accountselector.moc kopetepasswordwidget.moc
+ 
+ #>+ 2
+ KDE_DIST=fileconfirmbase.ui widgets.cw kopetepasswordwidgetbase.ui kopeteawaydialogbase.ui Makefile.in kopetepassworddialog.ui Makefile.am 
+diff -Nru kdenetwork-3.4.1.orig/kopete/Makefile.in kdenetwork-3.4.1/kopete/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/kopete/Makefile.in	2005-05-24 13:47:10.000000000 -0400
 @@ -205,6 +205,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -9684,9 +11011,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/addbookmarks/Makefile.in kdenetwork-3.4.1/kopete/plugins/addbookmarks/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/addbookmarks/Makefile.in	2005-05-23 18:09:02.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/plugins/addbookmarks/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/addbookmarks/Makefile.in kdenetwork-3.4.1/kopete/plugins/addbookmarks/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/addbookmarks/Makefile.in	2005-05-23 12:09:02.000000000 -0400
++++ kdenetwork-3.4.1/kopete/plugins/addbookmarks/Makefile.in	2005-05-24 13:47:12.000000000 -0400
 @@ -256,6 +256,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -9718,9 +11045,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/alias/Makefile.in kdenetwork-3.4.1/kopete/plugins/alias/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/alias/Makefile.in	2005-05-23 18:09:02.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/plugins/alias/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/alias/Makefile.in kdenetwork-3.4.1/kopete/plugins/alias/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/alias/Makefile.in	2005-05-23 12:09:02.000000000 -0400
++++ kdenetwork-3.4.1/kopete/plugins/alias/Makefile.in	2005-05-24 13:47:12.000000000 -0400
 @@ -246,6 +246,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -9752,9 +11079,57 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/autoreplace/icons/Makefile.in kdenetwork-3.4.1/kopete/plugins/autoreplace/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/autoreplace/icons/Makefile.in	2005-05-23 18:09:02.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/plugins/autoreplace/icons/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -809,18 +812,18 @@
+ 
+ 
+ #>+ 3
+-aliasplugin.moc: $(srcdir)/aliasplugin.h
+-	$(MOC) $(srcdir)/aliasplugin.h -o aliasplugin.moc
++aliaspreferences.moc: $(srcdir)/aliaspreferences.h
++	$(MOC) $(srcdir)/aliaspreferences.h -o aliaspreferences.moc
+ 
+ #>+ 2
+-mocs: aliasplugin.moc
++mocs: aliaspreferences.moc
+ 
+ #>+ 3
+-aliaspreferences.moc: $(srcdir)/aliaspreferences.h
+-	$(MOC) $(srcdir)/aliaspreferences.h -o aliaspreferences.moc
++aliasplugin.moc: $(srcdir)/aliasplugin.h
++	$(MOC) $(srcdir)/aliasplugin.h -o aliasplugin.moc
+ 
+ #>+ 2
+-mocs: aliaspreferences.moc
++mocs: aliasplugin.moc
+ 
+ #>+ 3
+ editaliasdialog.moc: $(srcdir)/editaliasdialog.h
+@@ -840,10 +843,10 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  aliasplugin.moc aliaspreferences.moc editaliasdialog.moc
++	-rm -f  aliaspreferences.moc aliasplugin.moc editaliasdialog.moc
+ 
+ #>+ 2
+-KDE_DIST=aliaspreferences.h aliasplugin.h editaliasdialog.h kopete_alias.desktop kopete_alias_config.desktop Makefile.in aliasdialog.ui aliasdialogbase.ui Makefile.am 
++KDE_DIST=aliaspreferences.h aliasplugin.h editaliasdialog.h kopete_alias.desktop kopete_alias_config.desktop aliasdialog.ui Makefile.in aliasdialogbase.ui Makefile.am 
+ 
+ #>+ 5
+ clean-ui:
+@@ -938,8 +941,8 @@
+ 
+ #>+ 11
+ nmcheck: 
+-aliaspreferences.o: aliaspreferences.moc 
+ aliasplugin.o: aliasplugin.moc 
++aliaspreferences.o: aliaspreferences.moc 
+ $(srcdir)/editaliasdialog.cpp: aliasdialogbase.h aliasdialog.h 
+ nmcheck-am: nmcheck
+ aliasplugin.lo: aliasplugin.moc 
+diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/autoreplace/icons/Makefile.in kdenetwork-3.4.1/kopete/plugins/autoreplace/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/autoreplace/icons/Makefile.in	2005-05-23 12:09:02.000000000 -0400
++++ kdenetwork-3.4.1/kopete/plugins/autoreplace/icons/Makefile.in	2005-05-24 13:47:12.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -9786,9 +11161,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/autoreplace/Makefile.in kdenetwork-3.4.1/kopete/plugins/autoreplace/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/autoreplace/Makefile.in	2005-05-23 18:09:02.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/plugins/autoreplace/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/autoreplace/Makefile.in kdenetwork-3.4.1/kopete/plugins/autoreplace/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/autoreplace/Makefile.in	2005-05-23 12:09:02.000000000 -0400
++++ kdenetwork-3.4.1/kopete/plugins/autoreplace/Makefile.in	2005-05-24 13:47:12.000000000 -0400
 @@ -267,6 +267,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -9820,9 +11195,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/connectionstatus/Makefile.in kdenetwork-3.4.1/kopete/plugins/connectionstatus/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/connectionstatus/Makefile.in	2005-05-23 18:09:02.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/plugins/connectionstatus/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/connectionstatus/Makefile.in kdenetwork-3.4.1/kopete/plugins/connectionstatus/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/connectionstatus/Makefile.in	2005-05-23 12:09:02.000000000 -0400
++++ kdenetwork-3.4.1/kopete/plugins/connectionstatus/Makefile.in	2005-05-24 13:47:12.000000000 -0400
 @@ -234,6 +234,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -9854,9 +11229,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/contactnotes/Makefile.in kdenetwork-3.4.1/kopete/plugins/contactnotes/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/contactnotes/Makefile.in	2005-05-23 18:09:02.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/plugins/contactnotes/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/contactnotes/Makefile.in kdenetwork-3.4.1/kopete/plugins/contactnotes/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/contactnotes/Makefile.in	2005-05-23 12:09:02.000000000 -0400
++++ kdenetwork-3.4.1/kopete/plugins/contactnotes/Makefile.in	2005-05-24 13:47:12.000000000 -0400
 @@ -238,6 +238,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -9888,9 +11263,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/cryptography/icons/Makefile.in kdenetwork-3.4.1/kopete/plugins/cryptography/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/cryptography/icons/Makefile.in	2005-05-23 18:09:02.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/plugins/cryptography/icons/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/cryptography/icons/Makefile.in kdenetwork-3.4.1/kopete/plugins/cryptography/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/cryptography/icons/Makefile.in	2005-05-23 12:09:02.000000000 -0400
++++ kdenetwork-3.4.1/kopete/plugins/cryptography/icons/Makefile.in	2005-05-24 13:47:12.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -9922,9 +11297,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/cryptography/Makefile.in kdenetwork-3.4.1/kopete/plugins/cryptography/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/cryptography/Makefile.in	2005-05-23 18:09:02.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/plugins/cryptography/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/cryptography/Makefile.in kdenetwork-3.4.1/kopete/plugins/cryptography/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/cryptography/Makefile.in	2005-05-23 12:09:02.000000000 -0400
++++ kdenetwork-3.4.1/kopete/plugins/cryptography/Makefile.in	2005-05-24 13:47:12.000000000 -0400
 @@ -270,6 +270,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -9956,9 +11331,70 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/highlight/icons/Makefile.in kdenetwork-3.4.1/kopete/plugins/highlight/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/highlight/icons/Makefile.in	2005-05-23 18:09:02.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/plugins/highlight/icons/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -966,6 +969,13 @@
+ 
+ 
+ #>+ 3
++cryptographyguiclient.moc: $(srcdir)/cryptographyguiclient.h
++	$(MOC) $(srcdir)/cryptographyguiclient.h -o cryptographyguiclient.moc
++
++#>+ 2
++mocs: cryptographyguiclient.moc
++
++#>+ 3
+ kgpginterface.moc: $(srcdir)/kgpginterface.h
+ 	$(MOC) $(srcdir)/kgpginterface.h -o kgpginterface.moc
+ 
+@@ -973,11 +983,11 @@
+ mocs: kgpginterface.moc
+ 
+ #>+ 3
+-cryptographyguiclient.moc: $(srcdir)/cryptographyguiclient.h
+-	$(MOC) $(srcdir)/cryptographyguiclient.h -o cryptographyguiclient.moc
++cryptographyselectuserkey.moc: $(srcdir)/cryptographyselectuserkey.h
++	$(MOC) $(srcdir)/cryptographyselectuserkey.h -o cryptographyselectuserkey.moc
+ 
+ #>+ 2
+-mocs: cryptographyguiclient.moc
++mocs: cryptographyselectuserkey.moc
+ 
+ #>+ 3
+ kgpgselkey.moc: $(srcdir)/kgpgselkey.h
+@@ -994,13 +1004,6 @@
+ mocs: popuppublic.moc
+ 
+ #>+ 3
+-cryptographyselectuserkey.moc: $(srcdir)/cryptographyselectuserkey.h
+-	$(MOC) $(srcdir)/cryptographyselectuserkey.h -o cryptographyselectuserkey.moc
+-
+-#>+ 2
+-mocs: cryptographyselectuserkey.moc
+-
+-#>+ 3
+ cryptographypreferences.moc: $(srcdir)/cryptographypreferences.h
+ 	$(MOC) $(srcdir)/cryptographypreferences.h -o cryptographypreferences.moc
+ 
+@@ -1025,7 +1028,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  kgpginterface.moc cryptographyguiclient.moc kgpgselkey.moc popuppublic.moc cryptographyselectuserkey.moc cryptographypreferences.moc cryptographyplugin.moc
++	-rm -f  cryptographyguiclient.moc kgpginterface.moc cryptographyselectuserkey.moc kgpgselkey.moc popuppublic.moc cryptographypreferences.moc cryptographyplugin.moc
+ 
+ #>+ 2
+ KDE_DIST=cryptographychatui.rc kopete_cryptography.desktop cryptographyguiclient.h kgpginterface.h cryptographyuserkey_ui.ui kgpgselkey.h kopete_cryptography_config.desktop cryptographyselectuserkey.h Makefile.in cryptographypreferences.h cryptographyplugin.h cryptographyui.rc cryptographyprefsbase.ui Makefile.am popuppublic.h 
+@@ -1094,7 +1097,7 @@
+ 	rm -f kcm_kopete_cryptography_la.all_cpp.final kcm_kopete_cryptography_la.all_cpp.files
+ 
+ #>+ 11
+-kopete_cryptography_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cryptographyplugin.cpp $(srcdir)/kgpginterface.cpp $(srcdir)/cryptographyguiclient.cpp $(srcdir)/cryptographyselectuserkey.cpp $(srcdir)/popuppublic.cpp $(srcdir)/kgpgselkey.cpp cryptographyuserkey_ui.cpp  cryptographyguiclient.moc kgpginterface.moc cryptographyuserkey_ui.moc cryptographyselectuserkey.moc popuppublic.moc kgpgselkey.moc cryptographyplugin.moc
++kopete_cryptography_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/cryptographyplugin.cpp $(srcdir)/kgpginterface.cpp $(srcdir)/cryptographyguiclient.cpp $(srcdir)/cryptographyselectuserkey.cpp $(srcdir)/popuppublic.cpp $(srcdir)/kgpgselkey.cpp cryptographyuserkey_ui.cpp  kgpginterface.moc cryptographyguiclient.moc cryptographyuserkey_ui.moc popuppublic.moc kgpgselkey.moc cryptographyselectuserkey.moc cryptographyplugin.moc
+ 	@echo 'creating kopete_cryptography_la.all_cpp.cpp ...'; \
+ 	rm -f kopete_cryptography_la.all_cpp.files kopete_cryptography_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kopete_cryptography_la.all_cpp.final; \
+diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/highlight/icons/Makefile.in kdenetwork-3.4.1/kopete/plugins/highlight/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/highlight/icons/Makefile.in	2005-05-23 12:09:02.000000000 -0400
++++ kdenetwork-3.4.1/kopete/plugins/highlight/icons/Makefile.in	2005-05-24 13:47:12.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -9990,9 +11426,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/highlight/Makefile.in kdenetwork-3.4.1/kopete/plugins/highlight/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/highlight/Makefile.in	2005-05-23 18:09:02.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/plugins/highlight/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/highlight/Makefile.in kdenetwork-3.4.1/kopete/plugins/highlight/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/highlight/Makefile.in	2005-05-23 12:09:02.000000000 -0400
++++ kdenetwork-3.4.1/kopete/plugins/highlight/Makefile.in	2005-05-24 13:47:12.000000000 -0400
 @@ -267,6 +267,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -10024,9 +11460,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/history/Makefile.in kdenetwork-3.4.1/kopete/plugins/history/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/history/Makefile.in	2005-05-23 18:09:02.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/plugins/history/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -964,7 +967,7 @@
+ 	-rm -f  highlightpreferences.moc highlightplugin.moc
+ 
+ #>+ 2
+-KDE_DIST=kopete_highlight.desktop highlightconfig.h filter.h highlightprefsbase.ui highlightplugin.h highlightpreferences.h Makefile.in Makefile.am kopete_highlight_config.desktop 
++KDE_DIST=kopete_highlight.desktop highlightconfig.h filter.h highlightplugin.h highlightprefsbase.ui highlightpreferences.h Makefile.in Makefile.am kopete_highlight_config.desktop 
+ 
+ #>+ 4
+ clean-ui:
+diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/history/Makefile.in kdenetwork-3.4.1/kopete/plugins/history/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/history/Makefile.in	2005-05-23 12:09:02.000000000 -0400
++++ kdenetwork-3.4.1/kopete/plugins/history/Makefile.in	2005-05-24 13:47:12.000000000 -0400
 @@ -253,6 +253,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -10058,9 +11503,52 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/latex/icons/Makefile.in kdenetwork-3.4.1/kopete/plugins/latex/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/latex/icons/Makefile.in	2005-05-23 18:09:02.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/plugins/latex/icons/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -866,18 +869,18 @@
+ 
+ 
+ #>+ 3
+-historyplugin.moc: $(srcdir)/historyplugin.h
+-	$(MOC) $(srcdir)/historyplugin.h -o historyplugin.moc
++historyguiclient.moc: $(srcdir)/historyguiclient.h
++	$(MOC) $(srcdir)/historyguiclient.h -o historyguiclient.moc
+ 
+ #>+ 2
+-mocs: historyplugin.moc
++mocs: historyguiclient.moc
+ 
+ #>+ 3
+-historyguiclient.moc: $(srcdir)/historyguiclient.h
+-	$(MOC) $(srcdir)/historyguiclient.h -o historyguiclient.moc
++historyplugin.moc: $(srcdir)/historyplugin.h
++	$(MOC) $(srcdir)/historyplugin.h -o historyplugin.moc
+ 
+ #>+ 2
+-mocs: historyguiclient.moc
++mocs: historyplugin.moc
+ 
+ #>+ 3
+ historylogger.moc: $(srcdir)/historylogger.h
+@@ -911,7 +914,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  historyplugin.moc historyguiclient.moc historylogger.moc historypreferences.moc historydialog.moc
++	-rm -f  historyguiclient.moc historyplugin.moc historylogger.moc historypreferences.moc historydialog.moc
+ 
+ #>+ 2
+ KDE_DIST=historyprefsui.ui historyviewer.ui historypreferences.h historyconfig.kcfgc kopete_history_config.desktop historyui.rc historyguiclient.h kopete_history.desktop historyplugin.h historylogger.h historyconfig.kcfg Makefile.in historychatui.rc Makefile.am historydialog.h 
+@@ -986,7 +989,7 @@
+ 	rm -f kcm_kopete_history_la.all_cpp.final kcm_kopete_history_la.all_cpp.files
+ 
+ #>+ 11
+-kopete_history_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/historyplugin.cpp $(srcdir)/historydialog.cpp $(srcdir)/historylogger.cpp $(srcdir)/converter.cpp $(srcdir)/historyguiclient.cpp historyviewer.cpp historyconfig.cpp  historyguiclient.moc historyplugin.moc historylogger.moc historyviewer.moc historydialog.moc
++kopete_history_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/historyplugin.cpp $(srcdir)/historydialog.cpp $(srcdir)/historylogger.cpp $(srcdir)/converter.cpp $(srcdir)/historyguiclient.cpp historyviewer.cpp historyconfig.cpp  historyplugin.moc historyguiclient.moc historylogger.moc historyviewer.moc historydialog.moc
+ 	@echo 'creating kopete_history_la.all_cpp.cpp ...'; \
+ 	rm -f kopete_history_la.all_cpp.files kopete_history_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kopete_history_la.all_cpp.final; \
+diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/latex/icons/Makefile.in kdenetwork-3.4.1/kopete/plugins/latex/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/latex/icons/Makefile.in	2005-05-23 12:09:02.000000000 -0400
++++ kdenetwork-3.4.1/kopete/plugins/latex/icons/Makefile.in	2005-05-24 13:47:12.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -10092,9 +11580,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/latex/Makefile.in kdenetwork-3.4.1/kopete/plugins/latex/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/latex/Makefile.in	2005-05-23 18:09:02.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/plugins/latex/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/latex/Makefile.in kdenetwork-3.4.1/kopete/plugins/latex/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/latex/Makefile.in	2005-05-23 12:09:02.000000000 -0400
++++ kdenetwork-3.4.1/kopete/plugins/latex/Makefile.in	2005-05-24 13:47:12.000000000 -0400
 @@ -266,6 +266,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -10126,9 +11614,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/Makefile.in kdenetwork-3.4.1/kopete/plugins/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/Makefile.in	2005-05-23 18:09:02.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/plugins/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/Makefile.in kdenetwork-3.4.1/kopete/plugins/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/Makefile.in	2005-05-23 12:09:02.000000000 -0400
++++ kdenetwork-3.4.1/kopete/plugins/Makefile.in	2005-05-24 13:47:12.000000000 -0400
 @@ -207,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -10160,9 +11648,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/motionautoaway/Makefile.in kdenetwork-3.4.1/kopete/plugins/motionautoaway/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/motionautoaway/Makefile.in	2005-05-23 18:09:02.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/plugins/motionautoaway/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/motionautoaway/Makefile.in kdenetwork-3.4.1/kopete/plugins/motionautoaway/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/motionautoaway/Makefile.in	2005-05-23 12:09:02.000000000 -0400
++++ kdenetwork-3.4.1/kopete/plugins/motionautoaway/Makefile.in	2005-05-24 13:47:13.000000000 -0400
 @@ -250,6 +250,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -10194,9 +11682,43 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/netmeeting/Makefile.in kdenetwork-3.4.1/kopete/plugins/netmeeting/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/netmeeting/Makefile.in	2005-05-23 18:09:02.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/plugins/netmeeting/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -832,18 +835,18 @@
+ 
+ 
+ #>+ 3
+-motionawayplugin.moc: $(srcdir)/motionawayplugin.h
+-	$(MOC) $(srcdir)/motionawayplugin.h -o motionawayplugin.moc
++motionawaypreferences.moc: $(srcdir)/motionawaypreferences.h
++	$(MOC) $(srcdir)/motionawaypreferences.h -o motionawaypreferences.moc
+ 
+ #>+ 2
+-mocs: motionawayplugin.moc
++mocs: motionawaypreferences.moc
+ 
+ #>+ 3
+-motionawaypreferences.moc: $(srcdir)/motionawaypreferences.h
+-	$(MOC) $(srcdir)/motionawaypreferences.h -o motionawaypreferences.moc
++motionawayplugin.moc: $(srcdir)/motionawayplugin.h
++	$(MOC) $(srcdir)/motionawayplugin.h -o motionawayplugin.moc
+ 
+ #>+ 2
+-mocs: motionawaypreferences.moc
++mocs: motionawayplugin.moc
+ 
+ #>+ 8
+ kopete_motionaway.la.closure: $(kopete_motionaway_la_OBJECTS) $(kopete_motionaway_la_DEPENDENCIES)
+@@ -856,7 +859,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  motionawayplugin.moc motionawaypreferences.moc
++	-rm -f  motionawaypreferences.moc motionawayplugin.moc
+ 
+ #>+ 2
+ KDE_DIST=kopete_motionaway.desktop COPYING.motion motionawayplugin.h motionawayprefs.ui kopete_motionaway_config.desktop motionawayconfig.kcfg configure.in.in Makefile.in motionawaypreferences.h motionawayconfig.kcfgc Makefile.am 
+diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/netmeeting/Makefile.in kdenetwork-3.4.1/kopete/plugins/netmeeting/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/netmeeting/Makefile.in	2005-05-23 12:09:02.000000000 -0400
++++ kdenetwork-3.4.1/kopete/plugins/netmeeting/Makefile.in	2005-05-24 13:47:13.000000000 -0400
 @@ -254,6 +254,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -10228,9 +11750,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/nowlistening/Makefile.in kdenetwork-3.4.1/kopete/plugins/nowlistening/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/nowlistening/Makefile.in	2005-05-23 18:09:02.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/plugins/nowlistening/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -880,7 +883,7 @@
+ 	-rm -f  netmeetingplugin.moc netmeetingpreferences.moc netmeetinginvitation.moc netmeetingguiclient.moc
+ 
+ #>+ 2
+-KDE_DIST=netmeetingchatui.rc kopete_netmeeting.desktop netmeetinginvitation.h netmeetingpreferences.h kopete_netmeeting_config.desktop Makefile.in netmeetingguiclient.h netmeetingplugin.h Makefile.am netmeetingprefs_ui.ui 
++KDE_DIST=netmeetingchatui.rc kopete_netmeeting.desktop netmeetinginvitation.h netmeetingpreferences.h kopete_netmeeting_config.desktop Makefile.in netmeetingguiclient.h netmeetingplugin.h netmeetingprefs_ui.ui Makefile.am 
+ 
+ #>+ 4
+ clean-ui:
+diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/nowlistening/Makefile.in kdenetwork-3.4.1/kopete/plugins/nowlistening/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/nowlistening/Makefile.in	2005-05-23 12:09:02.000000000 -0400
++++ kdenetwork-3.4.1/kopete/plugins/nowlistening/Makefile.in	2005-05-24 13:47:13.000000000 -0400
 @@ -76,8 +76,7 @@
  	nowlisteningconfig.lo nowlisteningprefs.lo
  @KDE_USE_FINAL_FALSE@kcm_kopete_nowlistening_la_OBJECTS = $(kcm_kopete_nowlistening_la_nofinal_OBJECTS)
@@ -10283,9 +11814,52 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/smpppdcs/config/Makefile.in kdenetwork-3.4.1/kopete/plugins/smpppdcs/config/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/smpppdcs/config/Makefile.in	2005-05-23 18:09:02.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/plugins/smpppdcs/config/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -857,18 +859,18 @@
+ mocs: nowlisteningpreferences.moc
+ 
+ #>+ 3
+-nowlisteningguiclient.moc: $(srcdir)/nowlisteningguiclient.h
+-	$(MOC) $(srcdir)/nowlisteningguiclient.h -o nowlisteningguiclient.moc
++nowlisteningplugin.moc: $(srcdir)/nowlisteningplugin.h
++	$(MOC) $(srcdir)/nowlisteningplugin.h -o nowlisteningplugin.moc
+ 
+ #>+ 2
+-mocs: nowlisteningguiclient.moc
++mocs: nowlisteningplugin.moc
+ 
+ #>+ 3
+-nowlisteningplugin.moc: $(srcdir)/nowlisteningplugin.h
+-	$(MOC) $(srcdir)/nowlisteningplugin.h -o nowlisteningplugin.moc
++nowlisteningguiclient.moc: $(srcdir)/nowlisteningguiclient.h
++	$(MOC) $(srcdir)/nowlisteningguiclient.h -o nowlisteningguiclient.moc
+ 
+ #>+ 2
+-mocs: nowlisteningplugin.moc
++mocs: nowlisteningguiclient.moc
+ 
+ #>+ 8
+ kopete_nowlistening.la.closure: $(kopete_nowlistening_la_OBJECTS) $(kopete_nowlistening_la_DEPENDENCIES)
+@@ -881,7 +883,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  nowlisteningpreferences.moc nowlisteningguiclient.moc nowlisteningplugin.moc
++	-rm -f  nowlisteningpreferences.moc nowlisteningplugin.moc nowlisteningguiclient.moc
+ 
+ #>+ 2
+ KDE_DIST=nlkscd.h nowlisteningguiclient.h nowlisteningpreferences.h nowlisteningconfig.h nlnoatun.h kopete_nowlistening_config.desktop nowlisteningprefs.ui nlmediaplayer.h DESIGN nowlisteningchatui.rc configure.in.in Makefile.in nljuk.h kopete_nowlistening.desktop nlamarok.h nowlisteningplugin.h nowlisteningui.rc Makefile.am nlxmms.h 
+@@ -949,7 +951,7 @@
+ 	rm -f kcm_kopete_nowlistening_la.all_cpp.final kcm_kopete_nowlistening_la.all_cpp.files
+ 
+ #>+ 11
+-kopete_nowlistening_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/nowlisteningconfig.cpp $(srcdir)/nowlisteningplugin.cpp $(srcdir)/nlkscd.cpp $(srcdir)/nlnoatun.cpp $(srcdir)/nlxmms.cpp $(srcdir)/nowlisteningguiclient.cpp $(srcdir)/nljuk.cpp $(srcdir)/nlamarok.cpp $(srcdir)/nlkaffeine.cpp  nowlisteningplugin.moc nowlisteningguiclient.moc
++kopete_nowlistening_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/nowlisteningconfig.cpp $(srcdir)/nowlisteningplugin.cpp $(srcdir)/nlkscd.cpp $(srcdir)/nlnoatun.cpp $(srcdir)/nlxmms.cpp $(srcdir)/nowlisteningguiclient.cpp $(srcdir)/nljuk.cpp $(srcdir)/nlamarok.cpp $(srcdir)/nlkaffeine.cpp  nowlisteningguiclient.moc nowlisteningplugin.moc
+ 	@echo 'creating kopete_nowlistening_la.all_cpp.cpp ...'; \
+ 	rm -f kopete_nowlistening_la.all_cpp.files kopete_nowlistening_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kopete_nowlistening_la.all_cpp.final; \
+diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/smpppdcs/config/Makefile.in kdenetwork-3.4.1/kopete/plugins/smpppdcs/config/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/smpppdcs/config/Makefile.in	2005-05-23 12:09:02.000000000 -0400
++++ kdenetwork-3.4.1/kopete/plugins/smpppdcs/config/Makefile.in	2005-05-24 13:47:13.000000000 -0400
 @@ -241,6 +241,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -10317,9 +11891,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/smpppdcs/icons/Makefile.in kdenetwork-3.4.1/kopete/plugins/smpppdcs/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/smpppdcs/icons/Makefile.in	2005-05-23 18:09:02.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/plugins/smpppdcs/icons/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/smpppdcs/icons/Makefile.in kdenetwork-3.4.1/kopete/plugins/smpppdcs/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/smpppdcs/icons/Makefile.in	2005-05-23 12:09:02.000000000 -0400
++++ kdenetwork-3.4.1/kopete/plugins/smpppdcs/icons/Makefile.in	2005-05-24 13:47:13.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -10351,9 +11925,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/smpppdcs/Makefile.in kdenetwork-3.4.1/kopete/plugins/smpppdcs/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/smpppdcs/Makefile.in	2005-05-23 18:09:02.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/plugins/smpppdcs/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/smpppdcs/Makefile.in kdenetwork-3.4.1/kopete/plugins/smpppdcs/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/smpppdcs/Makefile.in	2005-05-23 12:09:02.000000000 -0400
++++ kdenetwork-3.4.1/kopete/plugins/smpppdcs/Makefile.in	2005-05-24 13:47:13.000000000 -0400
 @@ -246,6 +246,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -10385,9 +11959,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/statistics/Makefile.in kdenetwork-3.4.1/kopete/plugins/statistics/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/statistics/Makefile.in	2005-05-23 18:09:02.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/plugins/statistics/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/statistics/Makefile.in kdenetwork-3.4.1/kopete/plugins/statistics/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/statistics/Makefile.in	2005-05-23 12:09:02.000000000 -0400
++++ kdenetwork-3.4.1/kopete/plugins/statistics/Makefile.in	2005-05-24 13:47:13.000000000 -0400
 @@ -255,6 +255,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -10419,9 +11993,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/statistics/sqlite/Makefile.in kdenetwork-3.4.1/kopete/plugins/statistics/sqlite/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/statistics/sqlite/Makefile.in	2005-05-23 18:09:03.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/plugins/statistics/sqlite/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/statistics/sqlite/Makefile.in kdenetwork-3.4.1/kopete/plugins/statistics/sqlite/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/statistics/sqlite/Makefile.in	2005-05-23 12:09:03.000000000 -0400
++++ kdenetwork-3.4.1/kopete/plugins/statistics/sqlite/Makefile.in	2005-05-24 13:47:13.000000000 -0400
 @@ -247,6 +247,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -10453,9 +12027,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/texteffect/icons/Makefile.in kdenetwork-3.4.1/kopete/plugins/texteffect/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/texteffect/icons/Makefile.in	2005-05-23 18:09:03.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/plugins/texteffect/icons/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/texteffect/icons/Makefile.in kdenetwork-3.4.1/kopete/plugins/texteffect/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/texteffect/icons/Makefile.in	2005-05-23 12:09:03.000000000 -0400
++++ kdenetwork-3.4.1/kopete/plugins/texteffect/icons/Makefile.in	2005-05-24 13:47:13.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -10487,9 +12061,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/texteffect/Makefile.in kdenetwork-3.4.1/kopete/plugins/texteffect/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/texteffect/Makefile.in	2005-05-23 18:09:03.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/plugins/texteffect/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/texteffect/Makefile.in kdenetwork-3.4.1/kopete/plugins/texteffect/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/texteffect/Makefile.in	2005-05-23 12:09:03.000000000 -0400
++++ kdenetwork-3.4.1/kopete/plugins/texteffect/Makefile.in	2005-05-24 13:47:13.000000000 -0400
 @@ -267,6 +267,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -10521,9 +12095,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/translator/Makefile.in kdenetwork-3.4.1/kopete/plugins/translator/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/translator/Makefile.in	2005-05-23 18:09:03.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/plugins/translator/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/translator/Makefile.in kdenetwork-3.4.1/kopete/plugins/translator/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/translator/Makefile.in	2005-05-23 12:09:03.000000000 -0400
++++ kdenetwork-3.4.1/kopete/plugins/translator/Makefile.in	2005-05-24 13:47:13.000000000 -0400
 @@ -257,6 +257,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -10555,9 +12129,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/plugins/webpresence/Makefile.in kdenetwork-3.4.1/kopete/plugins/webpresence/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/plugins/webpresence/Makefile.in	2005-05-23 18:09:03.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/plugins/webpresence/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -879,7 +882,7 @@
+ 	-rm -f  translatorplugin.moc translatorguiclient.moc translatordialog.moc
+ 
+ #>+ 2
+-KDE_DIST=translatorchatui.rc translatordialog.h kopete_translator_config.desktop translatorlanguages.h translatorprefsbase.ui kopete_translator.desktop Makefile.in translatorplugin.h translatorui.rc translatorguiclient.h Makefile.am 
++KDE_DIST=translatorchatui.rc translatordialog.h kopete_translator_config.desktop translatorlanguages.h translatorprefsbase.ui kopete_translator.desktop Makefile.in translatorui.rc translatorplugin.h translatorguiclient.h Makefile.am 
+ 
+ #>+ 4
+ clean-ui:
+diff -Nru kdenetwork-3.4.1.orig/kopete/plugins/webpresence/Makefile.in kdenetwork-3.4.1/kopete/plugins/webpresence/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/plugins/webpresence/Makefile.in	2005-05-23 12:09:03.000000000 -0400
++++ kdenetwork-3.4.1/kopete/plugins/webpresence/Makefile.in	2005-05-24 13:47:13.000000000 -0400
 @@ -248,6 +248,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -10589,9 +12172,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/gadu/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/gadu/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/gadu/icons/Makefile.in	2005-05-23 18:09:03.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/gadu/icons/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/gadu/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/gadu/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/gadu/icons/Makefile.in	2005-05-23 12:09:03.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/gadu/icons/Makefile.in	2005-05-24 13:47:13.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -10623,9 +12206,75 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/gadu/libgadu/Makefile.in kdenetwork-3.4.1/kopete/protocols/gadu/libgadu/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/gadu/libgadu/Makefile.in	2005-05-23 18:09:03.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/gadu/libgadu/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -564,7 +567,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=cr16-action-gg_invi_d.png cr16-action-gg_busy_d.png cr16-action-gg_connecting.png cr32-app-gadu_protocol.png cr16-action-gg_online.png cr16-action-gg_offline.png cr16-action-gg_invi.png cr16-action-gg_busy.png cr16-action-gg_ignored.png cr16-action-gg_con.mng cr16-action-gg_offline_d.png Makefile.in cr16-app-gadu_protocol.png cr16-action-gg_away.png cr16-action-gg_online_d.png Makefile.am 
++KDE_DIST=cr16-action-gg_invi_d.png cr16-action-gg_busy_d.png cr16-action-gg_connecting.png cr32-app-gadu_protocol.png cr16-action-gg_online.png cr16-action-gg_offline.png cr16-action-gg_invi.png cr16-action-gg_busy.png cr16-action-gg_ignored.png cr16-action-gg_con.mng cr16-action-gg_offline_d.png Makefile.in cr16-action-gg_away.png cr16-app-gadu_protocol.png cr16-action-gg_online_d.png Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+@@ -572,38 +575,38 @@
+ #>+ 35
+ install-kde-icons:
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_offline.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_con.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_con.mng
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_away.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_busy.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_busy.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_connecting.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_connecting.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_online.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_busy_d.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_busy_d.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_invi.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_invi.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_offline_d.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_offline_d.png
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-gadu_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/gadu_protocol.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_ignored.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_ignored.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_online_d.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_online_d.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_online.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-gadu_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/gadu_protocol.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_offline_d.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_offline_d.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_offline.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_online_d.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_online_d.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_away.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_busy_d.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_busy_d.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_invi_d.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_invi_d.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_ignored.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_ignored.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-gadu_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/gadu_protocol.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-gg_con.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_con.mng
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_offline.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_con.mng
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_away.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_busy.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_connecting.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_online.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_busy_d.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_invi.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_online.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/gadu_protocol.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_offline_d.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/gadu_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_ignored.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_offline.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_online_d.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/gadu_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_away.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_busy_d.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_invi_d.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_ignored.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/gadu_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/gg_con.mng
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/gadu/libgadu/Makefile.in kdenetwork-3.4.1/kopete/protocols/gadu/libgadu/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/gadu/libgadu/Makefile.in	2005-05-23 12:09:03.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/gadu/libgadu/Makefile.in	2005-05-24 13:47:13.000000000 -0400
 @@ -217,6 +217,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -10657,9 +12306,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/gadu/Makefile.in kdenetwork-3.4.1/kopete/protocols/gadu/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/gadu/Makefile.in	2005-05-23 18:09:03.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/gadu/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/gadu/Makefile.in kdenetwork-3.4.1/kopete/protocols/gadu/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/gadu/Makefile.in	2005-05-23 12:09:03.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/gadu/Makefile.in	2005-05-24 13:47:13.000000000 -0400
 @@ -265,6 +265,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -10691,9 +12340,96 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/gadu/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/gadu/ui/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/gadu/ui/Makefile.in	2005-05-23 18:09:03.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/gadu/ui/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -986,11 +989,11 @@
+ mocs: gaducommands.moc
+ 
+ #>+ 3
+-gadupubdir.moc: $(srcdir)/gadupubdir.h
+-	$(MOC) $(srcdir)/gadupubdir.h -o gadupubdir.moc
++gadueditcontact.moc: $(srcdir)/gadueditcontact.h
++	$(MOC) $(srcdir)/gadueditcontact.h -o gadueditcontact.moc
+ 
+ #>+ 2
+-mocs: gadupubdir.moc
++mocs: gadueditcontact.moc
+ 
+ #>+ 3
+ gaduregisteraccount.moc: $(srcdir)/gaduregisteraccount.h
+@@ -1000,11 +1003,11 @@
+ mocs: gaduregisteraccount.moc
+ 
+ #>+ 3
+-gadueditcontact.moc: $(srcdir)/gadueditcontact.h
+-	$(MOC) $(srcdir)/gadueditcontact.h -o gadueditcontact.moc
++gadupubdir.moc: $(srcdir)/gadupubdir.h
++	$(MOC) $(srcdir)/gadupubdir.h -o gadupubdir.moc
+ 
+ #>+ 2
+-mocs: gadueditcontact.moc
++mocs: gadupubdir.moc
+ 
+ #>+ 3
+ gaduaway.moc: $(srcdir)/gaduaway.h
+@@ -1021,25 +1024,25 @@
+ mocs: gaduprotocol.moc
+ 
+ #>+ 3
+-gaducontact.moc: $(srcdir)/gaducontact.h
+-	$(MOC) $(srcdir)/gaducontact.h -o gaducontact.moc
++gadueditaccount.moc: $(srcdir)/gadueditaccount.h
++	$(MOC) $(srcdir)/gadueditaccount.h -o gadueditaccount.moc
+ 
+ #>+ 2
+-mocs: gaducontact.moc
++mocs: gadueditaccount.moc
+ 
+ #>+ 3
+-gadueditaccount.moc: $(srcdir)/gadueditaccount.h
+-	$(MOC) $(srcdir)/gadueditaccount.h -o gadueditaccount.moc
++gaducontact.moc: $(srcdir)/gaducontact.h
++	$(MOC) $(srcdir)/gaducontact.h -o gaducontact.moc
+ 
+ #>+ 2
+-mocs: gadueditaccount.moc
++mocs: gaducontact.moc
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  gaduaddcontactpage.moc gadudcctransaction.moc gadusession.moc gadudcc.moc gadudccserver.moc gaduaccount.moc gaducommands.moc gadupubdir.moc gaduregisteraccount.moc gadueditcontact.moc gaduaway.moc gaduprotocol.moc gaducontact.moc gadueditaccount.moc
++	-rm -f  gaduaddcontactpage.moc gadudcctransaction.moc gadusession.moc gadudcc.moc gadudccserver.moc gaduaccount.moc gaducommands.moc gadueditcontact.moc gaduregisteraccount.moc gadupubdir.moc gaduaway.moc gaduprotocol.moc gadueditaccount.moc gaducontact.moc
+ 
+ #>+ 2
+-KDE_DIST=README.gadu gaduaddcontactpage.h gadurichtextformat.h gadueditcontact.h gadupubdir.h gaduaccount.h gadudccserver.h kopete_gadu.desktop gaducontactlist.h gaducontact.h gadueditaccount.h gaduprotocol.h gaducommands.h gadudcc.h Makefile.in gaduregisteraccount.h gadudcctransaction.h gaduaway.h gadusession.h Makefile.am 
++KDE_DIST=README.gadu gaduaddcontactpage.h gadueditcontact.h gadurichtextformat.h gadupubdir.h gaduaccount.h gadudccserver.h kopete_gadu.desktop gaducontactlist.h gaducontact.h gadueditaccount.h gaduprotocol.h gaducommands.h gadudcc.h Makefile.in gaduregisteraccount.h gadudcctransaction.h gaduaway.h gadusession.h Makefile.am 
+ 
+ #>+ 3
+ clean-closures:
+@@ -1087,7 +1090,7 @@
+ 
+ 
+ #>+ 11
+-kopete_gadu_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/gaduaway.cpp $(srcdir)/gadueditcontact.cpp $(srcdir)/gaducommands.cpp $(srcdir)/gadueditaccount.cpp $(srcdir)/gadusession.cpp $(srcdir)/gaducontact.cpp $(srcdir)/gaduaddcontactpage.cpp $(srcdir)/gaduprotocol.cpp $(srcdir)/gaduaccount.cpp $(srcdir)/gadupubdir.cpp $(srcdir)/gaduregisteraccount.cpp $(srcdir)/gaducontactlist.cpp $(srcdir)/gadurichtextformat.cpp $(srcdir)/gadudccserver.cpp $(srcdir)/gadudcctransaction.cpp $(srcdir)/gadudcc.cpp  gaduaddcontactpage.moc gadudcctransaction.moc gadusession.moc gadudcc.moc gadudccserver.moc gaduaccount.moc gaducommands.moc gadueditcontact.moc gaduregisteraccount.moc gadupubdir.moc gaduaway.moc gaduprotocol.moc gadueditaccount.moc gaducontact.moc
++kopete_gadu_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/gaduaway.cpp $(srcdir)/gadueditcontact.cpp $(srcdir)/gaducommands.cpp $(srcdir)/gadueditaccount.cpp $(srcdir)/gadusession.cpp $(srcdir)/gaducontact.cpp $(srcdir)/gaduaddcontactpage.cpp $(srcdir)/gaduprotocol.cpp $(srcdir)/gaduaccount.cpp $(srcdir)/gadupubdir.cpp $(srcdir)/gaduregisteraccount.cpp $(srcdir)/gaducontactlist.cpp $(srcdir)/gadurichtextformat.cpp $(srcdir)/gadudccserver.cpp $(srcdir)/gadudcctransaction.cpp $(srcdir)/gadudcc.cpp  gaduaddcontactpage.moc gadudcctransaction.moc gadusession.moc gadudcc.moc gadudccserver.moc gaduaccount.moc gaducommands.moc gadupubdir.moc gaduregisteraccount.moc gadueditcontact.moc gaduaway.moc gaduprotocol.moc gaducontact.moc gadueditaccount.moc
+ 	@echo 'creating kopete_gadu_la.all_cpp.cpp ...'; \
+ 	rm -f kopete_gadu_la.all_cpp.files kopete_gadu_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kopete_gadu_la.all_cpp.final; \
+@@ -1142,11 +1145,11 @@
+ gadupubdir.o: gadupubdir.moc 
+ gadueditaccount.lo: gadueditaccount.moc 
+ gadudccserver.lo: gadudccserver.moc 
+-gadueditcontact.lo: gadueditcontact.moc 
+ gadueditcontact.o: gadueditcontact.moc 
++gadueditcontact.lo: gadueditcontact.moc 
+ gaducontact.o: gaducontact.moc 
+-gaduaccount.o: gaduaccount.moc 
+ gadupubdir.lo: gadupubdir.moc 
++gaduaccount.o: gaduaccount.moc 
+ gaduaway.lo: gaduaway.moc 
+ gaducommands.lo: gaducommands.moc 
+ gaduaddcontactpage.o: gaduaddcontactpage.moc 
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/gadu/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/gadu/ui/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/gadu/ui/Makefile.in	2005-05-23 12:09:03.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/gadu/ui/Makefile.in	2005-05-24 13:47:13.000000000 -0400
 @@ -223,6 +223,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -10725,9 +12461,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/groupwise/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/icons/Makefile.in	2005-05-23 18:09:03.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/groupwise/icons/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/groupwise/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/icons/Makefile.in	2005-05-23 12:09:03.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/groupwise/icons/Makefile.in	2005-05-24 13:47:14.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -10759,9 +12495,92 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/Makefile.in	2005-05-23 18:09:03.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -564,7 +567,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=cr22-app-groupwise_protocol.png cr16-action-groupwise_connecting.mng cr16-app-groupwise_protocol.png cr16-action-groupwise_online.png cr16-action-logging.png cr48-app-groupwise_protocol.png cr22-action-logging.png cr48-action-logging.png cr16-action-groupwise_away.png cr32-action-logging.png cr16-action-groupwise_invisible.png Makefile.in cr16-action-groupwise_busy.png cr64-app-groupwise_protocol.png cr32-app-groupwise_protocol.png Makefile.am cr64-action-logging.png 
++KDE_DIST=cr22-app-groupwise_protocol.png cr16-action-groupwise_connecting.mng cr16-app-groupwise_protocol.png cr16-action-groupwise_online.png cr16-action-logging.png cr48-app-groupwise_protocol.png cr22-action-logging.png cr48-action-logging.png cr16-action-groupwise_away.png cr32-action-logging.png cr16-action-groupwise_invisible.png Makefile.in cr64-app-groupwise_protocol.png cr16-action-groupwise_busy.png cr32-app-groupwise_protocol.png Makefile.am cr64-action-logging.png 
+ 
+ #>+ 2
+ docs-am:
+@@ -572,47 +575,47 @@
+ #>+ 44
+ install-kde-icons:
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-groupwise_invisible.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_invisible.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-groupwise_busy.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_busy.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-groupwise_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/groupwise_protocol.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-groupwise_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_connecting.mng
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-groupwise_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/groupwise_protocol.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions
++	$(INSTALL_DATA) $(srcdir)/cr48-action-logging.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/logging.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-groupwise_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_online.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions
++	$(INSTALL_DATA) $(srcdir)/cr22-action-logging.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/logging.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps
++	$(INSTALL_DATA) $(srcdir)/cr22-app-groupwise_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps/groupwise_protocol.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr64-app-groupwise_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/groupwise_protocol.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-logging.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/logging.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-groupwise_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/groupwise_protocol.png
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-logging.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/logging.png
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions
+-	$(INSTALL_DATA) $(srcdir)/cr32-action-logging.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/logging.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-logging.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/logging.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-groupwise_busy.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_busy.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-groupwise_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_online.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-groupwise_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_connecting.mng
++	$(INSTALL_DATA) $(srcdir)/cr16-action-groupwise_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_away.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr64-action-logging.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/actions/logging.png
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions
+-	$(INSTALL_DATA) $(srcdir)/cr48-action-logging.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/logging.png
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-groupwise_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps/groupwise_protocol.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-groupwise_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_away.png
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-groupwise_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/groupwise_protocol.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-groupwise_invisible.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_invisible.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions
++	$(INSTALL_DATA) $(srcdir)/cr32-action-logging.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/logging.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_invisible.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/groupwise_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/groupwise_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/groupwise_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/logging.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/logging.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/logging.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_busy.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_online.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/groupwise_protocol.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_connecting.mng
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/actions/logging.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/groupwise_protocol.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/actions/logging.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_online.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/actions/logging.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps/groupwise_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/groupwise_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/logging.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/groupwise_protocol.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_away.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/groupwise_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/actions/logging.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/groupwise_invisible.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/actions/logging.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/Makefile.in	2005-05-23 12:09:03.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/Makefile.in	2005-05-24 13:47:14.000000000 -0400
 @@ -264,6 +264,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -10793,9 +12612,68 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/qca/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/qca/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/qca/Makefile.in	2005-05-23 18:09:03.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/qca/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -934,18 +937,18 @@
+ 
+ 
+ #>+ 3
+-responseprotocol.moc: $(srcdir)/responseprotocol.h
+-	$(MOC) $(srcdir)/responseprotocol.h -o responseprotocol.moc
++userdetailsmanager.moc: $(srcdir)/userdetailsmanager.h
++	$(MOC) $(srcdir)/userdetailsmanager.h -o userdetailsmanager.moc
+ 
+ #>+ 2
+-mocs: responseprotocol.moc
++mocs: userdetailsmanager.moc
+ 
+ #>+ 3
+-userdetailsmanager.moc: $(srcdir)/userdetailsmanager.h
+-	$(MOC) $(srcdir)/userdetailsmanager.h -o userdetailsmanager.moc
++responseprotocol.moc: $(srcdir)/responseprotocol.h
++	$(MOC) $(srcdir)/responseprotocol.h -o responseprotocol.moc
+ 
+ #>+ 2
+-mocs: userdetailsmanager.moc
++mocs: responseprotocol.moc
+ 
+ #>+ 3
+ stream.moc: $(srcdir)/stream.h
+@@ -955,18 +958,18 @@
+ mocs: stream.moc
+ 
+ #>+ 3
+-task.moc: $(srcdir)/task.h
+-	$(MOC) $(srcdir)/task.h -o task.moc
++tlshandler.moc: $(srcdir)/tlshandler.h
++	$(MOC) $(srcdir)/tlshandler.h -o tlshandler.moc
+ 
+ #>+ 2
+-mocs: task.moc
++mocs: tlshandler.moc
+ 
+ #>+ 3
+-tlshandler.moc: $(srcdir)/tlshandler.h
+-	$(MOC) $(srcdir)/tlshandler.h -o tlshandler.moc
++task.moc: $(srcdir)/task.h
++	$(MOC) $(srcdir)/task.h -o task.moc
+ 
+ #>+ 2
+-mocs: tlshandler.moc
++mocs: task.moc
+ 
+ #>+ 3
+ qcatlshandler.moc: $(srcdir)/qcatlshandler.h
+@@ -1056,7 +1059,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  responseprotocol.moc userdetailsmanager.moc stream.moc task.moc tlshandler.moc qcatlshandler.moc client.moc coreprotocol.moc eventprotocol.moc bytestream.moc gwclientstream.moc securestream.moc privacymanager.moc safedelete.moc connector.moc inputprotocolbase.moc
++	-rm -f  userdetailsmanager.moc responseprotocol.moc stream.moc tlshandler.moc task.moc qcatlshandler.moc client.moc coreprotocol.moc eventprotocol.moc bytestream.moc gwclientstream.moc securestream.moc privacymanager.moc safedelete.moc connector.moc inputprotocolbase.moc
+ 
+ #>+ 2
+ KDE_DIST=transferbase.h rtf.ll Makefile.in Makefile.am 
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/qca/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/qca/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/qca/Makefile.in	2005-05-23 12:09:03.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/qca/Makefile.in	2005-05-24 13:47:14.000000000 -0400
 @@ -205,6 +205,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -10827,9 +12705,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in	2005-05-23 18:09:03.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in	2005-05-23 12:09:03.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/qca/src/Makefile.in	2005-05-24 13:47:14.000000000 -0400
 @@ -220,6 +220,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -10861,9 +12739,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in	2005-05-23 18:09:03.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in	2005-05-23 12:09:03.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/tasks/Makefile.in	2005-05-24 13:47:14.000000000 -0400
 @@ -247,6 +247,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -10895,9 +12773,104 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in	2005-05-23 18:09:03.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -839,13 +842,6 @@
+ mocs: connectiontask.moc
+ 
+ #>+ 3
+-updateitemtask.moc: $(srcdir)/updateitemtask.h
+-	$(MOC) $(srcdir)/updateitemtask.h -o updateitemtask.moc
+-
+-#>+ 2
+-mocs: updateitemtask.moc
+-
+-#>+ 3
+ logintask.moc: $(srcdir)/logintask.h
+ 	$(MOC) $(srcdir)/logintask.h -o logintask.moc
+ 
+@@ -860,6 +856,13 @@
+ mocs: createcontactinstancetask.moc
+ 
+ #>+ 3
++updateitemtask.moc: $(srcdir)/updateitemtask.h
++	$(MOC) $(srcdir)/updateitemtask.h -o updateitemtask.moc
++
++#>+ 2
++mocs: updateitemtask.moc
++
++#>+ 3
+ rejectinvitetask.moc: $(srcdir)/rejectinvitetask.h
+ 	$(MOC) $(srcdir)/rejectinvitetask.h -o rejectinvitetask.moc
+ 
+@@ -881,18 +884,18 @@
+ mocs: getdetailstask.moc
+ 
+ #>+ 3
+-searchtask.moc: $(srcdir)/searchtask.h
+-	$(MOC) $(srcdir)/searchtask.h -o searchtask.moc
++privacyitemtask.moc: $(srcdir)/privacyitemtask.h
++	$(MOC) $(srcdir)/privacyitemtask.h -o privacyitemtask.moc
+ 
+ #>+ 2
+-mocs: searchtask.moc
++mocs: privacyitemtask.moc
+ 
+ #>+ 3
+-privacyitemtask.moc: $(srcdir)/privacyitemtask.h
+-	$(MOC) $(srcdir)/privacyitemtask.h -o privacyitemtask.moc
++searchtask.moc: $(srcdir)/searchtask.h
++	$(MOC) $(srcdir)/searchtask.h -o searchtask.moc
+ 
+ #>+ 2
+-mocs: privacyitemtask.moc
++mocs: searchtask.moc
+ 
+ #>+ 3
+ joinconferencetask.moc: $(srcdir)/joinconferencetask.h
+@@ -973,10 +976,10 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  deleteitemtask.moc createfoldertask.moc leaveconferencetask.moc setstatustask.moc requesttask.moc modifycontactlisttask.moc pollsearchresultstask.moc getstatustask.moc connectiontask.moc updateitemtask.moc logintask.moc createcontactinstancetask.moc rejectinvitetask.moc createconferencetask.moc getdetailstask.moc searchtask.moc privacyitemtask.moc joinconferencetask.moc createcontacttask.moc conferencetask.moc typingtask.moc needfoldertask.moc updatecontacttask.moc updatefoldertask.moc eventtask.moc movecontacttask.moc statustask.moc keepalivetask.moc
++	-rm -f  deleteitemtask.moc createfoldertask.moc leaveconferencetask.moc setstatustask.moc requesttask.moc modifycontactlisttask.moc pollsearchresultstask.moc getstatustask.moc connectiontask.moc logintask.moc createcontactinstancetask.moc updateitemtask.moc rejectinvitetask.moc createconferencetask.moc getdetailstask.moc privacyitemtask.moc searchtask.moc joinconferencetask.moc createcontacttask.moc conferencetask.moc typingtask.moc needfoldertask.moc updatecontacttask.moc updatefoldertask.moc eventtask.moc movecontacttask.moc statustask.moc keepalivetask.moc
+ 
+ #>+ 2
+-KDE_DIST=gwtasklogin.cpp keepalivetask.h createcontactinstancetask.h Makefile.in Makefile.am gwtasklogin.h 
++KDE_DIST=gwtasklogin.cpp keepalivetask.h createcontactinstancetask.h Makefile.in gwtasklogin.h Makefile.am 
+ 
+ #>+ 3
+ clean-closures:
+@@ -1024,7 +1027,7 @@
+ 
+ 
+ #>+ 11
+-libgroupwise_tasks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/requesttask.cpp $(srcdir)/eventtask.cpp $(srcdir)/logintask.cpp $(srcdir)/setstatustask.cpp $(srcdir)/statustask.cpp $(srcdir)/conferencetask.cpp $(srcdir)/createconferencetask.cpp $(srcdir)/sendmessagetask.cpp $(srcdir)/getdetailstask.cpp $(srcdir)/getstatustask.cpp $(srcdir)/typingtask.cpp $(srcdir)/connectiontask.cpp $(srcdir)/sendinvitetask.cpp $(srcdir)/joinconferencetask.cpp $(srcdir)/leaveconferencetask.cpp $(srcdir)/rejectinvitetask.cpp $(srcdir)/keepalivetask.cpp $(srcdir)/createcontacttask.cpp $(srcdir)/modifycontactlisttask.cpp $(srcdir)/createfoldertask.cpp $(srcdir)/movecontacttask.cpp $(srcdir)/updateitemtask.cpp $(srcdir)/createcontactinstancetask.cpp $(srcdir)/deleteitemtask.cpp $(srcdir)/updatefoldertask.cpp $(srcdir)/updatecontacttask.cpp $(srcdir)/searchtask.cpp $(srcdir)/pollsearchresultstask.cpp $(srcdir)/privacyitemtask.cpp $(srcdir)/needfoldertask.cpp  deleteitemtask.moc createfoldertask.moc setstatustask.moc leaveconferencetask.moc requesttask.moc modifycontactlisttask.moc pollsearchresultstask.moc getstatustask.moc connectiontask.moc createcontactinstancetask.moc logintask.moc updateitemtask.moc createconferencetask.moc rejectinvitetask.moc getdetailstask.moc privacyitemtask.moc searchtask.moc joinconferencetask.moc conferencetask.moc createcontacttask.moc typingtask.moc needfoldertask.moc updatefoldertask.moc updatecontacttask.moc eventtask.moc movecontacttask.moc keepalivetask.moc statustask.moc
++libgroupwise_tasks_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/requesttask.cpp $(srcdir)/eventtask.cpp $(srcdir)/logintask.cpp $(srcdir)/setstatustask.cpp $(srcdir)/statustask.cpp $(srcdir)/conferencetask.cpp $(srcdir)/createconferencetask.cpp $(srcdir)/sendmessagetask.cpp $(srcdir)/getdetailstask.cpp $(srcdir)/getstatustask.cpp $(srcdir)/typingtask.cpp $(srcdir)/connectiontask.cpp $(srcdir)/sendinvitetask.cpp $(srcdir)/joinconferencetask.cpp $(srcdir)/leaveconferencetask.cpp $(srcdir)/rejectinvitetask.cpp $(srcdir)/keepalivetask.cpp $(srcdir)/createcontacttask.cpp $(srcdir)/modifycontactlisttask.cpp $(srcdir)/createfoldertask.cpp $(srcdir)/movecontacttask.cpp $(srcdir)/updateitemtask.cpp $(srcdir)/createcontactinstancetask.cpp $(srcdir)/deleteitemtask.cpp $(srcdir)/updatefoldertask.cpp $(srcdir)/updatecontacttask.cpp $(srcdir)/searchtask.cpp $(srcdir)/pollsearchresultstask.cpp $(srcdir)/privacyitemtask.cpp $(srcdir)/needfoldertask.cpp  deleteitemtask.moc createfoldertask.moc setstatustask.moc leaveconferencetask.moc requesttask.moc modifycontactlisttask.moc pollsearchresultstask.moc getstatustask.moc connectiontask.moc updateitemtask.moc createcontactinstancetask.moc logintask.moc createconferencetask.moc rejectinvitetask.moc getdetailstask.moc searchtask.moc privacyitemtask.moc joinconferencetask.moc conferencetask.moc createcontacttask.moc typingtask.moc needfoldertask.moc updatefoldertask.moc updatecontacttask.moc eventtask.moc movecontacttask.moc keepalivetask.moc statustask.moc
+ 	@echo 'creating libgroupwise_tasks_la.all_cpp.cpp ...'; \
+ 	rm -f libgroupwise_tasks_la.all_cpp.files libgroupwise_tasks_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libgroupwise_tasks_la.all_cpp.final; \
+@@ -1101,8 +1104,8 @@
+ conferencetask.lo: conferencetask.moc 
+ createcontacttask.o: createcontacttask.moc 
+ logintask.lo: logintask.moc 
+-createcontactinstancetask.lo: createcontactinstancetask.moc 
+ searchtask.lo: searchtask.moc 
++createcontactinstancetask.lo: createcontactinstancetask.moc 
+ updatecontacttask.lo: updatecontacttask.moc 
+ setstatustask.lo: setstatustask.moc 
+ logintask.o: logintask.moc 
+@@ -1115,8 +1118,8 @@
+ typingtask.lo: typingtask.moc 
+ requesttask.o: requesttask.moc 
+ updateitemtask.lo: updateitemtask.moc 
+-privacyitemtask.lo: privacyitemtask.moc 
+ rejectinvitetask.lo: rejectinvitetask.moc 
++privacyitemtask.lo: privacyitemtask.moc 
+ joinconferencetask.lo: joinconferencetask.moc 
+ statustask.o: statustask.moc 
+ typingtask.o: typingtask.moc 
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in	2005-05-23 12:09:03.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/tasks/tests/Makefile.in	2005-05-24 13:47:14.000000000 -0400
 @@ -221,6 +221,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -10929,9 +12902,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstPROGRAMS:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/tests/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/tests/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/tests/Makefile.in	2005-05-23 18:09:03.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/tests/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/tests/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/tests/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/libgroupwise/tests/Makefile.in	2005-05-23 12:09:03.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/groupwise/libgroupwise/tests/Makefile.in	2005-05-24 13:47:14.000000000 -0400
 @@ -241,6 +241,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -10963,9 +12936,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstPROGRAMS:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/groupwise/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/Makefile.in	2005-05-23 18:09:03.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/groupwise/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/groupwise/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/Makefile.in	2005-05-23 12:09:03.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/groupwise/Makefile.in	2005-05-24 13:47:14.000000000 -0400
 @@ -260,6 +260,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -10997,9 +12970,87 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/groupwise/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/ui/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/ui/Makefile.in	2005-05-23 18:09:03.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/groupwise/ui/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -935,18 +938,18 @@
+ 
+ 
+ #>+ 3
+-gwprotocol.moc: $(srcdir)/gwprotocol.h
+-	$(MOC) $(srcdir)/gwprotocol.h -o gwprotocol.moc
++gwaccount.moc: $(srcdir)/gwaccount.h
++	$(MOC) $(srcdir)/gwaccount.h -o gwaccount.moc
+ 
+ #>+ 2
+-mocs: gwprotocol.moc
++mocs: gwaccount.moc
+ 
+ #>+ 3
+-gwaccount.moc: $(srcdir)/gwaccount.h
+-	$(MOC) $(srcdir)/gwaccount.h -o gwaccount.moc
++gwprotocol.moc: $(srcdir)/gwprotocol.h
++	$(MOC) $(srcdir)/gwprotocol.h -o gwprotocol.moc
+ 
+ #>+ 2
+-mocs: gwaccount.moc
++mocs: gwprotocol.moc
+ 
+ #>+ 3
+ gwbytestream.moc: $(srcdir)/gwbytestream.h
+@@ -963,18 +966,18 @@
+ mocs: gwconnector.moc
+ 
+ #>+ 3
+-gwmessagemanager.moc: $(srcdir)/gwmessagemanager.h
+-	$(MOC) $(srcdir)/gwmessagemanager.h -o gwmessagemanager.moc
++gwcontact.moc: $(srcdir)/gwcontact.h
++	$(MOC) $(srcdir)/gwcontact.h -o gwcontact.moc
+ 
+ #>+ 2
+-mocs: gwmessagemanager.moc
++mocs: gwcontact.moc
+ 
+ #>+ 3
+-gwcontact.moc: $(srcdir)/gwcontact.h
+-	$(MOC) $(srcdir)/gwcontact.h -o gwcontact.moc
++gwmessagemanager.moc: $(srcdir)/gwmessagemanager.h
++	$(MOC) $(srcdir)/gwmessagemanager.h -o gwmessagemanager.moc
+ 
+ #>+ 2
+-mocs: gwcontact.moc
++mocs: gwmessagemanager.moc
+ 
+ #>+ 3
+ gwcontactlist.moc: $(srcdir)/gwcontactlist.h
+@@ -985,7 +988,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  gwprotocol.moc gwaccount.moc gwbytestream.moc gwconnector.moc gwmessagemanager.moc gwcontact.moc gwcontactlist.moc
++	-rm -f  gwaccount.moc gwprotocol.moc gwbytestream.moc gwconnector.moc gwcontact.moc gwmessagemanager.moc gwcontactlist.moc
+ 
+ #>+ 2
+ KDE_DIST=gwchatui.rc kopete_groupwise.desktop gwaddui.ui Makefile.in Makefile.am 
+@@ -1036,7 +1039,7 @@
+ 
+ 
+ #>+ 11
+-kopete_groupwise_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/gwprotocol.cpp $(srcdir)/gwcontact.cpp $(srcdir)/gwaccount.cpp $(srcdir)/gwbytestream.cpp $(srcdir)/gwconnector.cpp $(srcdir)/gwmessagemanager.cpp $(srcdir)/gwcontactlist.cpp  gwaccount.moc gwprotocol.moc gwbytestream.moc gwconnector.moc gwcontact.moc gwmessagemanager.moc gwcontactlist.moc
++kopete_groupwise_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/gwprotocol.cpp $(srcdir)/gwcontact.cpp $(srcdir)/gwaccount.cpp $(srcdir)/gwbytestream.cpp $(srcdir)/gwconnector.cpp $(srcdir)/gwmessagemanager.cpp $(srcdir)/gwcontactlist.cpp  gwprotocol.moc gwaccount.moc gwbytestream.moc gwconnector.moc gwmessagemanager.moc gwcontact.moc gwcontactlist.moc
+ 	@echo 'creating kopete_groupwise_la.all_cpp.cpp ...'; \
+ 	rm -f kopete_groupwise_la.all_cpp.files kopete_groupwise_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kopete_groupwise_la.all_cpp.final; \
+@@ -1081,8 +1084,8 @@
+ gwbytestream.o: gwbytestream.moc 
+ gwconnector.o: gwconnector.moc 
+ gwaccount.lo: gwaccount.moc 
+-gwprotocol.o: gwprotocol.moc 
+ gwmessagemanager.o: gwmessagemanager.moc 
++gwprotocol.o: gwprotocol.moc 
+ gwbytestream.lo: gwbytestream.moc 
+ nmcheck: 
+ gwcontact.o: gwcontact.moc 
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/groupwise/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/groupwise/ui/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/groupwise/ui/Makefile.in	2005-05-23 12:09:03.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/groupwise/ui/Makefile.in	2005-05-24 13:47:14.000000000 -0400
 @@ -231,6 +231,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -11031,9 +13082,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/irc/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/irc/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/irc/icons/Makefile.in	2005-05-23 18:09:03.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/irc/icons/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/irc/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/irc/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/irc/icons/Makefile.in	2005-05-23 12:09:03.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/irc/icons/Makefile.in	2005-05-24 13:47:14.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -11065,9 +13116,54 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/irc/libkirc/Makefile.in kdenetwork-3.4.1/kopete/protocols/irc/libkirc/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/irc/libkirc/Makefile.in	2005-05-23 18:09:03.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/irc/libkirc/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -571,31 +574,31 @@
+ 
+ #>+ 27
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-irc_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/irc_protocol.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-irc_op.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_op.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-irc_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_away.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-irc_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_connecting.mng
++	$(INSTALL_DATA) $(srcdir)/cr16-action-irc_channel.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_channel.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-irc_voice.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_voice.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-irc_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_online.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-irc_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/irc_protocol.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-irc_op.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_op.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-irc_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/irc_protocol.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-irc_voice.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_voice.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-irc_server.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_server.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-irc_channel.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_channel.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-irc_normal.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_normal.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-irc_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_connecting.mng
++	$(INSTALL_DATA) $(srcdir)/cr16-action-irc_server.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_server.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/irc_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_op.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_away.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_connecting.mng
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_channel.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_voice.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_online.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/irc_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_op.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/irc_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_voice.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_server.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_channel.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_normal.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_connecting.mng
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/irc_server.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/irc/libkirc/Makefile.in kdenetwork-3.4.1/kopete/protocols/irc/libkirc/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/irc/libkirc/Makefile.in	2005-05-23 12:09:03.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/irc/libkirc/Makefile.in	2005-05-24 13:47:14.000000000 -0400
 @@ -227,6 +227,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -11099,9 +13195,43 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/irc/Makefile.in kdenetwork-3.4.1/kopete/protocols/irc/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/irc/Makefile.in	2005-05-23 18:09:03.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/irc/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -759,18 +762,18 @@
+ mocs: kirctransferserver.moc
+ 
+ #>+ 3
+-kircengine.moc: $(srcdir)/kircengine.h
+-	$(MOC) $(srcdir)/kircengine.h -o kircengine.moc
++kirctransferhandler.moc: $(srcdir)/kirctransferhandler.h
++	$(MOC) $(srcdir)/kirctransferhandler.h -o kirctransferhandler.moc
+ 
+ #>+ 2
+-mocs: kircengine.moc
++mocs: kirctransferhandler.moc
+ 
+ #>+ 3
+-kirctransferhandler.moc: $(srcdir)/kirctransferhandler.h
+-	$(MOC) $(srcdir)/kirctransferhandler.h -o kirctransferhandler.moc
++kircengine.moc: $(srcdir)/kircengine.h
++	$(MOC) $(srcdir)/kircengine.h -o kircengine.moc
+ 
+ #>+ 2
+-mocs: kirctransferhandler.moc
++mocs: kircengine.moc
+ 
+ #>+ 3
+ ksslsocket.moc: $(srcdir)/ksslsocket.h
+@@ -781,7 +784,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  kircentity.moc kircmessageredirector.moc kirctransfer.moc kirctransferserver.moc kircengine.moc kirctransferhandler.moc ksslsocket.moc
++	-rm -f  kircentity.moc kircmessageredirector.moc kirctransfer.moc kirctransferserver.moc kirctransferhandler.moc kircengine.moc ksslsocket.moc
+ 
+ #>+ 2
+ KDE_DIST=kirctransferhandler.h kirctransfer.h kircentity.h kircengine.h kircmessageredirector.h ksslsocket.h kirctransferserver.h Makefile.in kircmessage.h Makefile.am 
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/irc/Makefile.in kdenetwork-3.4.1/kopete/protocols/irc/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/irc/Makefile.in	2005-05-23 12:09:03.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/irc/Makefile.in	2005-05-24 13:47:14.000000000 -0400
 @@ -263,6 +263,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -11133,9 +13263,77 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/irc/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/irc/ui/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/irc/ui/Makefile.in	2005-05-23 18:09:03.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/irc/ui/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -979,18 +982,18 @@
+ mocs: ircchannelcontact.moc
+ 
+ #>+ 3
+-irccontactmanager.moc: $(srcdir)/irccontactmanager.h
+-	$(MOC) $(srcdir)/irccontactmanager.h -o irccontactmanager.moc
++ircsignalhandler.moc: $(srcdir)/ircsignalhandler.h
++	$(MOC) $(srcdir)/ircsignalhandler.h -o ircsignalhandler.moc
+ 
+ #>+ 2
+-mocs: irccontactmanager.moc
++mocs: ircsignalhandler.moc
+ 
+ #>+ 3
+-ircsignalhandler.moc: $(srcdir)/ircsignalhandler.h
+-	$(MOC) $(srcdir)/ircsignalhandler.h -o ircsignalhandler.moc
++irccontactmanager.moc: $(srcdir)/irccontactmanager.h
++	$(MOC) $(srcdir)/irccontactmanager.h -o irccontactmanager.moc
+ 
+ #>+ 2
+-mocs: ircsignalhandler.moc
++mocs: irccontactmanager.moc
+ 
+ #>+ 3
+ ircguiclient.moc: $(srcdir)/ircguiclient.h
+@@ -1007,18 +1010,18 @@
+ mocs: irccontact.moc
+ 
+ #>+ 3
+-ircservercontact.moc: $(srcdir)/ircservercontact.h
+-	$(MOC) $(srcdir)/ircservercontact.h -o ircservercontact.moc
++kcodecaction.moc: $(srcdir)/kcodecaction.h
++	$(MOC) $(srcdir)/kcodecaction.h -o kcodecaction.moc
+ 
+ #>+ 2
+-mocs: ircservercontact.moc
++mocs: kcodecaction.moc
+ 
+ #>+ 3
+-kcodecaction.moc: $(srcdir)/kcodecaction.h
+-	$(MOC) $(srcdir)/kcodecaction.h -o kcodecaction.moc
++ircservercontact.moc: $(srcdir)/ircservercontact.h
++	$(MOC) $(srcdir)/ircservercontact.h -o ircservercontact.moc
+ 
+ #>+ 2
+-mocs: kcodecaction.moc
++mocs: ircservercontact.moc
+ 
+ #>+ 3
+ ircusercontact.moc: $(srcdir)/ircusercontact.h
+@@ -1057,7 +1060,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  ircchannelcontact.moc irccontactmanager.moc ircsignalhandler.moc ircguiclient.moc irccontact.moc ircservercontact.moc kcodecaction.moc ircusercontact.moc irctransferhandler.moc ircaccount.moc ircprotocol.moc ircaddcontactpage.moc
++	-rm -f  ircchannelcontact.moc ircsignalhandler.moc irccontactmanager.moc ircguiclient.moc irccontact.moc kcodecaction.moc ircservercontact.moc ircusercontact.moc irctransferhandler.moc ircaccount.moc ircprotocol.moc ircaddcontactpage.moc
+ 
+ #>+ 2
+ KDE_DIST=irc.protocol irctransferhandler.h ircguiclient.h ircsignalhandler.h kopete_irc.desktop ircusercontact.h ircchatui.rc ksparser.h ircchannelcontact.h ircprotocol.h ircnetworks.xml irccontactmanager.h ircaddcontactpage.h Makefile.in kcodecaction.h ircservercontact.h irccontact.h Makefile.am ircaccount.h 
+@@ -1108,7 +1111,7 @@
+ 
+ 
+ #>+ 11
+-kopete_irc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ircaccount.cpp $(srcdir)/ircaddcontactpage.cpp $(srcdir)/ircchannelcontact.cpp $(srcdir)/irccontact.cpp $(srcdir)/ircguiclient.cpp $(srcdir)/ircprotocol.cpp $(srcdir)/ircservercontact.cpp $(srcdir)/ircsignalhandler.cpp $(srcdir)/irctransferhandler.cpp $(srcdir)/ircusercontact.cpp $(srcdir)/irccontactmanager.cpp $(srcdir)/kcodecaction.cpp $(srcdir)/ksparser.cpp  ircchannelcontact.moc ircsignalhandler.moc irccontactmanager.moc irccontact.moc ircguiclient.moc kcodecaction.moc ircservercontact.moc ircusercontact.moc irctransferhandler.moc ircaccount.moc ircprotocol.moc ircaddcontactpage.moc
++kopete_irc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ircaccount.cpp $(srcdir)/ircaddcontactpage.cpp $(srcdir)/ircchannelcontact.cpp $(srcdir)/irccontact.cpp $(srcdir)/ircguiclient.cpp $(srcdir)/ircprotocol.cpp $(srcdir)/ircservercontact.cpp $(srcdir)/ircsignalhandler.cpp $(srcdir)/irctransferhandler.cpp $(srcdir)/ircusercontact.cpp $(srcdir)/irccontactmanager.cpp $(srcdir)/kcodecaction.cpp $(srcdir)/ksparser.cpp  ircchannelcontact.moc irccontactmanager.moc ircsignalhandler.moc irccontact.moc ircguiclient.moc ircservercontact.moc kcodecaction.moc ircusercontact.moc irctransferhandler.moc ircaccount.moc ircprotocol.moc ircaddcontactpage.moc
+ 	@echo 'creating kopete_irc_la.all_cpp.cpp ...'; \
+ 	rm -f kopete_irc_la.all_cpp.files kopete_irc_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kopete_irc_la.all_cpp.final; \
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/irc/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/irc/ui/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/irc/ui/Makefile.in	2005-05-23 12:09:03.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/irc/ui/Makefile.in	2005-05-24 13:47:14.000000000 -0400
 @@ -225,6 +225,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -11167,9 +13365,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/jabber/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/jabber/icons/Makefile.in	2005-05-23 18:09:03.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/jabber/icons/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/jabber/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/jabber/icons/Makefile.in	2005-05-23 12:09:03.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/jabber/icons/Makefile.in	2005-05-24 13:47:14.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -11201,9 +13399,153 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/cutestuff/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/cutestuff/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/cutestuff/Makefile.in	2005-05-23 18:09:03.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/cutestuff/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -564,87 +567,87 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=hi16-action-jabber_original.png hi16-action-jabber_away.png cr16-action-jabber_invisible.png cr48-app-jabber_protocol.png cr16-action-jabber_xa.png cr16-action-jabber_connecting.mng hi16-action-jabber_invisible.png hi16-action-jabber_online.png hi16-action-jabber_xa.png hi16-action-jabber_raw.png cr16-action-jabber_away.png cr16-action-jabber_serv_off.png hi48-app-jabber_protocol.png cr16-action-jabber_offline.png hi16-action-jabber_chatty.png hi16-action-jabber_na.png cr16-action-jabber_raw.png cr16-action-jabber_na.png hi32-app-jabber_protocol.png cr16-action-jabber_online.png cr16-action-jabber_group.png hi16-app-jabber_protocol.png Makefile.in hi16-action-jabber_connecting.mng hi16-action-jabber_serv_on.png cr16-action-jabber_original.png cr16-action-jabber_serv_on.png cr16-action-jabber_chatty.png hi16-action-jabber_group.png cr16-app-jabber_protocol.png hi16-action-jabber_offline.png Makefile.am hi16-action-jabber_serv_off.png cr32-app-jabber_protocol.png 
++KDE_DIST=hi16-action-jabber_original.png hi16-action-jabber_away.png cr16-action-jabber_invisible.png cr48-app-jabber_protocol.png cr16-action-jabber_xa.png cr16-action-jabber_connecting.mng hi16-action-jabber_invisible.png hi16-action-jabber_xa.png hi16-action-jabber_online.png hi16-action-jabber_raw.png cr16-action-jabber_away.png cr16-action-jabber_serv_off.png hi48-app-jabber_protocol.png cr16-action-jabber_offline.png hi16-action-jabber_chatty.png hi16-action-jabber_na.png cr16-action-jabber_raw.png cr16-action-jabber_na.png hi32-app-jabber_protocol.png cr16-action-jabber_online.png cr16-action-jabber_group.png hi16-app-jabber_protocol.png Makefile.in hi16-action-jabber_connecting.mng hi16-action-jabber_serv_on.png cr16-action-jabber_original.png cr16-action-jabber_serv_on.png cr16-action-jabber_chatty.png hi16-action-jabber_group.png cr16-app-jabber_protocol.png hi16-action-jabber_offline.png hi16-action-jabber_serv_off.png Makefile.am cr32-app-jabber_protocol.png 
+ 
+ #>+ 2
+ docs-am:
+ 
+ #>+ 76
+ install-kde-icons:
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
++	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_invisible.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_invisible.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions
+-	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_serv_off.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_serv_off.png
+-	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_xa.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_xa.png
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-jabber_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/jabber_protocol.png
+-	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_serv_on.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_serv_on.png
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/hi48-app-jabber_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/48x48/apps/jabber_protocol.png
+-	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_connecting.mng $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_connecting.mng
+-	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_online.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_online.png
++	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_chatty.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_chatty.png
+ 	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_invisible.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_invisible.png
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_connecting.mng
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_offline.png
+-	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_group.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_group.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_raw.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_raw.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_chatty.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_chatty.png
+-	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_away.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_away.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi32-app-jabber_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/32x32/apps/jabber_protocol.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_chatty.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_chatty.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/cr16-app-jabber_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/jabber_protocol.png
++	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_raw.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_raw.png
++	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_na.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_na.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_na.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_na.png
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/hi16-app-jabber_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/jabber_protocol.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_original.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_original.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_raw.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_raw.png
++	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_away.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_away.png
++	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_online.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_online.png
++	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_xa.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_xa.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_xa.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_xa.png
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-jabber_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/jabber_protocol.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_offline.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_serv_off.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_serv_off.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_serv_on.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_serv_on.png
+-	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_offline.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_offline.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_invisible.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_invisible.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_online.png
+-	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_raw.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_raw.png
+-	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_chatty.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_chatty.png
+-	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_na.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_na.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_group.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_group.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/hi48-app-jabber_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/48x48/apps/jabber_protocol.png
+ 	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_original.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_original.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_away.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_online.png
++	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_offline.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_offline.png
++	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_group.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_group.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_serv_on.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_serv_on.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_connecting.mng
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-jabber_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/jabber_protocol.png
++	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_serv_on.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_serv_on.png
++	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_connecting.mng $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_connecting.mng
++	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_away.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/cr48-app-jabber_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/jabber_protocol.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/hi16-app-jabber_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/jabber_protocol.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_group.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_group.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-jabber_original.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_original.png
++	$(INSTALL_DATA) $(srcdir)/hi16-action-jabber_serv_off.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_serv_off.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_serv_off.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_xa.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/jabber_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_serv_on.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/48x48/apps/jabber_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_connecting.mng
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_online.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_invisible.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_chatty.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_invisible.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_connecting.mng
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_offline.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_group.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_raw.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_chatty.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_away.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/32x32/apps/jabber_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_chatty.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/jabber_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_raw.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_na.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_na.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/jabber_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_original.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_raw.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_away.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_online.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_xa.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_xa.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/jabber_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_offline.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_serv_off.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_serv_on.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_offline.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_invisible.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_online.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_raw.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_chatty.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_na.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_group.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/48x48/apps/jabber_protocol.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_original.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_away.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_online.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_offline.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_group.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_serv_on.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_connecting.mng
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/jabber_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_serv_on.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_connecting.mng
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_away.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/jabber_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/jabber_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_group.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/jabber_original.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/jabber_serv_off.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/cutestuff/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/cutestuff/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/cutestuff/Makefile.in	2005-05-23 12:09:03.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/cutestuff/Makefile.in	2005-05-24 13:47:15.000000000 -0400
 @@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -11235,9 +13577,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in	2005-05-23 18:09:03.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in	2005-05-23 12:09:03.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/cutestuff/network/Makefile.in	2005-05-24 13:47:15.000000000 -0400
 @@ -223,6 +223,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -11269,9 +13611,47 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in	2005-05-23 18:09:03.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -717,18 +720,18 @@
+ mocs: ndns.moc
+ 
+ #>+ 3
+-socks.moc: $(srcdir)/socks.h
+-	$(MOC) $(srcdir)/socks.h -o socks.moc
++httpconnect.moc: $(srcdir)/httpconnect.h
++	$(MOC) $(srcdir)/httpconnect.h -o httpconnect.moc
+ 
+ #>+ 2
+-mocs: socks.moc
++mocs: httpconnect.moc
+ 
+ #>+ 3
+-httpconnect.moc: $(srcdir)/httpconnect.h
+-	$(MOC) $(srcdir)/httpconnect.h -o httpconnect.moc
++socks.moc: $(srcdir)/socks.h
++	$(MOC) $(srcdir)/socks.h -o socks.moc
+ 
+ #>+ 2
+-mocs: httpconnect.moc
++mocs: socks.moc
+ 
+ #>+ 3
+ httppoll.moc: $(srcdir)/httppoll.h
+@@ -753,10 +756,10 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  srvresolver.moc ndns.moc socks.moc httpconnect.moc httppoll.moc servsock.moc bsocket.moc
++	-rm -f  srvresolver.moc ndns.moc httpconnect.moc socks.moc httppoll.moc servsock.moc bsocket.moc
+ 
+ #>+ 2
+-KDE_DIST=bsocket.h ndns.h httppoll.h httpconnect.h socks.h srvresolver.h servsock.h Makefile.in Makefile.am 
++KDE_DIST=bsocket.h ndns.h httpconnect.h httppoll.h socks.h srvresolver.h servsock.h Makefile.in Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in	2005-05-23 12:09:03.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/cutestuff/util/Makefile.in	2005-05-24 13:47:15.000000000 -0400
 @@ -225,6 +225,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -11303,9 +13683,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/include/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/include/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/include/Makefile.in	2005-05-23 18:09:04.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/include/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/include/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/include/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/include/Makefile.in	2005-05-23 12:09:04.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/include/Makefile.in	2005-05-24 13:47:15.000000000 -0400
 @@ -224,6 +224,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -11337,9 +13717,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/jabber/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/jabber/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/jabber/Makefile.in	2005-05-23 18:09:04.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/jabber/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/jabber/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/jabber/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/jabber/Makefile.in	2005-05-23 12:09:04.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/jabber/Makefile.in	2005-05-24 13:47:15.000000000 -0400
 @@ -225,6 +225,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -11371,9 +13751,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/Makefile.in	2005-05-23 18:09:03.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/Makefile.in	2005-05-23 12:09:03.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/Makefile.in	2005-05-24 13:47:15.000000000 -0400
 @@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -11405,9 +13785,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.in	2005-05-23 18:09:04.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.in	2005-05-23 12:09:04.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/xmpp-core/Makefile.in	2005-05-24 13:47:15.000000000 -0400
 @@ -236,6 +236,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -11439,9 +13819,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in	2005-05-23 18:09:04.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in	2005-05-23 12:09:04.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/iris/xmpp-im/Makefile.in	2005-05-24 13:47:15.000000000 -0400
 @@ -222,6 +222,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -11473,9 +13853,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/Makefile.in	2005-05-23 18:09:03.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/Makefile.in	2005-05-23 12:09:03.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/Makefile.in	2005-05-24 13:47:14.000000000 -0400
 @@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -11507,9 +13887,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/qca/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/qca/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/qca/Makefile.in	2005-05-23 18:09:04.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/qca/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/qca/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/qca/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/qca/Makefile.in	2005-05-23 12:09:04.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/qca/Makefile.in	2005-05-24 13:47:15.000000000 -0400
 @@ -205,6 +205,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -11541,9 +13921,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/qca/src/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/qca/src/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/qca/src/Makefile.in	2005-05-23 18:09:04.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/qca/src/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/qca/src/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/libiris/qca/src/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/jabber/libiris/qca/src/Makefile.in	2005-05-23 12:09:04.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/jabber/libiris/qca/src/Makefile.in	2005-05-24 13:47:15.000000000 -0400
 @@ -220,6 +220,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -11575,9 +13955,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/jabber/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/jabber/Makefile.in	2005-05-23 18:09:03.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/jabber/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/jabber/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/jabber/Makefile.in	2005-05-23 12:09:03.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/jabber/Makefile.in	2005-05-24 13:47:14.000000000 -0400
 @@ -272,6 +272,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -11609,9 +13989,62 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/jabber/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/ui/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/jabber/ui/Makefile.in	2005-05-23 18:09:04.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/jabber/ui/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -1006,18 +1009,18 @@
+ mocs: jabbergroupchatmanager.moc
+ 
+ #>+ 3
+-jabbercontact.moc: $(srcdir)/jabbercontact.h
+-	$(MOC) $(srcdir)/jabbercontact.h -o jabbercontact.moc
++jabberformtranslator.moc: $(srcdir)/jabberformtranslator.h
++	$(MOC) $(srcdir)/jabberformtranslator.h -o jabberformtranslator.moc
+ 
+ #>+ 2
+-mocs: jabbercontact.moc
++mocs: jabberformtranslator.moc
+ 
+ #>+ 3
+-jabberformtranslator.moc: $(srcdir)/jabberformtranslator.h
+-	$(MOC) $(srcdir)/jabberformtranslator.h -o jabberformtranslator.moc
++jabbercontact.moc: $(srcdir)/jabbercontact.h
++	$(MOC) $(srcdir)/jabbercontact.h -o jabbercontact.moc
+ 
+ #>+ 2
+-mocs: jabberformtranslator.moc
++mocs: jabbercontact.moc
+ 
+ #>+ 3
+ jabberprotocol.moc: $(srcdir)/jabberprotocol.h
+@@ -1070,7 +1073,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  jabberresource.moc jabbergroupcontact.moc jabberaccount.moc jabberchatsession.moc jabberformlineedit.moc jabberfiletransfer.moc jabbergroupchatmanager.moc jabbercontact.moc jabberformtranslator.moc jabberprotocol.moc jabbercontactpool.moc jabberresourcepool.moc jabberbasecontact.moc jabberbytestream.moc jabberconnector.moc jabbergroupmembercontact.moc
++	-rm -f  jabberresource.moc jabbergroupcontact.moc jabberaccount.moc jabberchatsession.moc jabberformlineedit.moc jabberfiletransfer.moc jabbergroupchatmanager.moc jabberformtranslator.moc jabbercontact.moc jabberprotocol.moc jabbercontactpool.moc jabberresourcepool.moc jabberbasecontact.moc jabberbytestream.moc jabberconnector.moc jabbergroupmembercontact.moc
+ 
+ #>+ 2
+ KDE_DIST=jabberformtranslator.h kopete_jabber.desktop jabberbasecontact.h jabberprotocol.h jabberchatsession.h jabberaccount.h jabberfiletransfer.h jabberresource.h Makefile.in jabberconnector.h jabbercontactpool.h jabbergroupchatmanager.h Makefile.am jabberbytestream.h jabberformlineedit.h jabbergroupmembercontact.h 
+@@ -1121,7 +1124,7 @@
+ 
+ 
+ #>+ 11
+-kopete_jabber_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/jabberprotocol.cpp $(srcdir)/jabberaccount.cpp $(srcdir)/jabberresource.cpp $(srcdir)/jabberresourcepool.cpp $(srcdir)/jabberbasecontact.cpp $(srcdir)/jabbercontact.cpp $(srcdir)/jabbergroupcontact.cpp $(srcdir)/jabbergroupmembercontact.cpp $(srcdir)/jabbercontactpool.cpp $(srcdir)/jabberformtranslator.cpp $(srcdir)/jabberformlineedit.cpp $(srcdir)/jabberchatsession.cpp $(srcdir)/jabbergroupchatmanager.cpp $(srcdir)/jabberfiletransfer.cpp $(srcdir)/jabberbytestream.cpp $(srcdir)/jabberconnector.cpp  jabberresource.moc jabbergroupcontact.moc jabberaccount.moc jabberchatsession.moc jabberformlineedit.moc jabberfiletransfer.moc jabbergroupchatmanager.moc jabberformtranslator.moc jabbercontact.moc jabberprotocol.moc jabbercontactpool.moc jabberresourcepool.moc jabberbasecontact.moc jabberbytestream.moc jabberconnector.moc jabbergroupmembercontact.moc
++kopete_jabber_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/jabberprotocol.cpp $(srcdir)/jabberaccount.cpp $(srcdir)/jabberresource.cpp $(srcdir)/jabberresourcepool.cpp $(srcdir)/jabberbasecontact.cpp $(srcdir)/jabbercontact.cpp $(srcdir)/jabbergroupcontact.cpp $(srcdir)/jabbergroupmembercontact.cpp $(srcdir)/jabbercontactpool.cpp $(srcdir)/jabberformtranslator.cpp $(srcdir)/jabberformlineedit.cpp $(srcdir)/jabberchatsession.cpp $(srcdir)/jabbergroupchatmanager.cpp $(srcdir)/jabberfiletransfer.cpp $(srcdir)/jabberbytestream.cpp $(srcdir)/jabberconnector.cpp  jabberresource.moc jabbergroupcontact.moc jabberaccount.moc jabberchatsession.moc jabberformlineedit.moc jabberfiletransfer.moc jabbergroupchatmanager.moc jabbercontact.moc jabberformtranslator.moc jabberprotocol.moc jabbercontactpool.moc jabberresourcepool.moc jabberbasecontact.moc jabberbytestream.moc jabberconnector.moc jabbergroupmembercontact.moc
+ 	@echo 'creating kopete_jabber_la.all_cpp.cpp ...'; \
+ 	rm -f kopete_jabber_la.all_cpp.files kopete_jabber_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kopete_jabber_la.all_cpp.final; \
+@@ -1173,8 +1176,8 @@
+ jabberformlineedit.o: jabberformlineedit.moc 
+ jabberfiletransfer.o: jabberfiletransfer.moc 
+ nmcheck-am: nmcheck
+-jabberresource.o: jabberresource.moc 
+ jabbercontact.lo: jabbercontact.moc 
++jabberresource.o: jabberresource.moc 
+ jabberresourcepool.o: jabberresourcepool.moc 
+ jabbercontactpool.lo: jabbercontactpool.moc 
+ jabberformtranslator.o: jabberformtranslator.moc 
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/jabber/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/jabber/ui/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/jabber/ui/Makefile.in	2005-05-23 12:09:04.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/jabber/ui/Makefile.in	2005-05-24 13:47:15.000000000 -0400
 @@ -231,6 +231,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -11643,9 +14076,52 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/Makefile.in kdenetwork-3.4.1/kopete/protocols/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/Makefile.in	2005-05-23 18:09:03.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/Makefile.in	2005-05-24 17:07:07.000000000 +0200
+@@ -769,18 +772,18 @@
+ mocs: dlgjabbervcard.moc
+ 
+ #>+ 3
+-dlgjabberbrowse.moc: $(srcdir)/dlgjabberbrowse.h
+-	$(MOC) $(srcdir)/dlgjabberbrowse.h -o dlgjabberbrowse.moc
++dlgjabberregister.moc: $(srcdir)/dlgjabberregister.h
++	$(MOC) $(srcdir)/dlgjabberregister.h -o dlgjabberregister.moc
+ 
+ #>+ 2
+-mocs: dlgjabberbrowse.moc
++mocs: dlgjabberregister.moc
+ 
+ #>+ 3
+-dlgjabberregister.moc: $(srcdir)/dlgjabberregister.h
+-	$(MOC) $(srcdir)/dlgjabberregister.h -o dlgjabberregister.moc
++dlgjabberbrowse.moc: $(srcdir)/dlgjabberbrowse.h
++	$(MOC) $(srcdir)/dlgjabberbrowse.h -o dlgjabberbrowse.moc
+ 
+ #>+ 2
+-mocs: dlgjabberregister.moc
++mocs: dlgjabberbrowse.moc
+ 
+ #>+ 3
+ dlgjabberchatjoin.moc: $(srcdir)/dlgjabberchatjoin.h
+@@ -819,7 +822,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  jabbereditaccountwidget.moc jabberregisteraccount.moc dlgjabbervcard.moc dlgjabberbrowse.moc dlgjabberregister.moc dlgjabberchatjoin.moc jabberaddcontactpage.moc dlgjabberservices.moc jabberchooseserver.moc dlgjabbersendraw.moc
++	-rm -f  jabbereditaccountwidget.moc jabberregisteraccount.moc dlgjabbervcard.moc dlgjabberregister.moc dlgjabberbrowse.moc dlgjabberchatjoin.moc jabberaddcontactpage.moc dlgjabberservices.moc jabberchooseserver.moc dlgjabbersendraw.moc
+ 
+ #>+ 2
+ KDE_DIST=dlgjabberregister.h dlgjabberchatjoin.h dlgjabberchooseserver.ui dlgchatjoin.ui dlgjabberbrowse.h jabberchooseserver.h jabberaddcontactpage.h dlgjabbervcard.h dlgjabbersendraw.h dlgjabberservices.h Makefile.in jabbereditaccountwidget.h dlgjabberregisteraccount.ui Makefile.am jabberregisteraccount.h 
+@@ -880,7 +883,7 @@
+ 
+ 
+ #>+ 11
+-libkopetejabberui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dlgjabbersendraw.cpp $(srcdir)/jabberaddcontactpage.cpp $(srcdir)/dlgjabbervcard.cpp $(srcdir)/dlgjabberservices.cpp $(srcdir)/dlgjabberregister.cpp $(srcdir)/dlgjabberbrowse.cpp $(srcdir)/dlgjabberchatjoin.cpp $(srcdir)/jabbereditaccountwidget.cpp $(srcdir)/jabberregisteraccount.cpp $(srcdir)/jabberchooseserver.cpp $(srcdir)/empty.cpp dlgsendraw.cpp dlgaddcontact.cpp dlgvcard.cpp dlgservices.cpp dlgregister.cpp dlgbrowse.cpp dlgchatjoin.cpp dlgjabbereditaccountwidget.cpp dlgjabberregisteraccount.cpp dlgjabberchooseserver.cpp  dlgchatjoin.moc dlgsendraw.moc dlgaddcontact.moc dlgjabberchooseserver.moc dlgservices.moc dlgjabberregister.moc dlgjabberbrowse.moc dlgregister.moc jabberaddcontactpage.moc dlgbrowse.moc jabberchooseserver.moc dlgjabberregisteraccount.moc jabbereditaccountwidget.moc jabberregisteraccount.moc dlgjabbervcard.moc dlgvcard.moc dlgjabberchatjoin.moc dlgjabberservices.moc dlgjabbersendraw.moc dlgjabbereditaccountwidget.moc
++libkopetejabberui_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/dlgjabbersendraw.cpp $(srcdir)/jabberaddcontactpage.cpp $(srcdir)/dlgjabbervcard.cpp $(srcdir)/dlgjabberservices.cpp $(srcdir)/dlgjabberregister.cpp $(srcdir)/dlgjabberbrowse.cpp $(srcdir)/dlgjabberchatjoin.cpp $(srcdir)/jabbereditaccountwidget.cpp $(srcdir)/jabberregisteraccount.cpp $(srcdir)/jabberchooseserver.cpp $(srcdir)/empty.cpp dlgsendraw.cpp dlgaddcontact.cpp dlgvcard.cpp dlgservices.cpp dlgregister.cpp dlgbrowse.cpp dlgchatjoin.cpp dlgjabbereditaccountwidget.cpp dlgjabberregisteraccount.cpp dlgjabberchooseserver.cpp  dlgchatjoin.moc dlgsendraw.moc dlgaddcontact.moc dlgjabberchooseserver.moc dlgservices.moc dlgjabberbrowse.moc dlgjabberregister.moc dlgregister.moc jabberaddcontactpage.moc dlgbrowse.moc jabberchooseserver.moc dlgjabberregisteraccount.moc jabbereditaccountwidget.moc jabberregisteraccount.moc dlgjabbervcard.moc dlgvcard.moc dlgjabberchatjoin.moc dlgjabberservices.moc dlgjabbersendraw.moc dlgjabbereditaccountwidget.moc
+ 	@echo 'creating libkopetejabberui_la.all_cpp.cpp ...'; \
+ 	rm -f libkopetejabberui_la.all_cpp.files libkopetejabberui_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkopetejabberui_la.all_cpp.final; \
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/Makefile.in kdenetwork-3.4.1/kopete/protocols/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/Makefile.in	2005-05-23 12:09:03.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/Makefile.in	2005-05-24 13:47:13.000000000 -0400
 @@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -11677,9 +14153,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/meanwhile/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/meanwhile/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/meanwhile/icons/Makefile.in	2005-05-23 18:09:04.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/meanwhile/icons/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/meanwhile/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/meanwhile/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/meanwhile/icons/Makefile.in	2005-05-23 12:09:04.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/meanwhile/icons/Makefile.in	2005-05-24 13:47:15.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -11711,9 +14187,59 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/meanwhile/Makefile.in kdenetwork-3.4.1/kopete/protocols/meanwhile/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/meanwhile/Makefile.in	2005-05-23 18:09:04.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/meanwhile/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -573,36 +576,36 @@
+ install-kde-icons:
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-meanwhile_unknown.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_unknown.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/cr128-app-meanwhile_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/meanwhile_protocol.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-meanwhile_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_away.png
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps
+-	$(INSTALL_DATA) $(srcdir)/cr22-app-meanwhile_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps/meanwhile_protocol.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/apps
++	$(INSTALL_DATA) $(srcdir)/crsc-app-meanwhile_protocol.svgz $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/apps/meanwhile_protocol.svgz
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-meanwhile_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/meanwhile_protocol.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-meanwhile_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/meanwhile_protocol.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-meanwhile_dnd.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_dnd.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-meanwhile_idle.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_idle.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps
++	$(INSTALL_DATA) $(srcdir)/cr22-app-meanwhile_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps/meanwhile_protocol.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr64-app-meanwhile_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/meanwhile_protocol.png
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-meanwhile_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/meanwhile_protocol.png
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/apps
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-meanwhile_protocol.svgz $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/apps/meanwhile_protocol.svgz
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-meanwhile_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/meanwhile_protocol.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-meanwhile_idle.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_idle.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-meanwhile_dnd.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_dnd.png
+ 
+ uninstall-kde-icons:
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_unknown.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/meanwhile_protocol.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_away.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps/meanwhile_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/apps/meanwhile_protocol.svgz
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/meanwhile_protocol.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/meanwhile_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_dnd.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_idle.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/22x22/apps/meanwhile_protocol.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/meanwhile_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/meanwhile_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/scalable/apps/meanwhile_protocol.svgz
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/meanwhile_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_idle.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/meanwhile_dnd.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/meanwhile/Makefile.in kdenetwork-3.4.1/kopete/protocols/meanwhile/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/meanwhile/Makefile.in	2005-05-23 12:09:04.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/meanwhile/Makefile.in	2005-05-24 13:47:15.000000000 -0400
 @@ -261,6 +261,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -11745,9 +14271,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/meanwhile/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/meanwhile/ui/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/meanwhile/ui/Makefile.in	2005-05-23 18:09:04.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/meanwhile/ui/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/meanwhile/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/meanwhile/ui/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/meanwhile/ui/Makefile.in	2005-05-23 12:09:04.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/meanwhile/ui/Makefile.in	2005-05-24 13:47:15.000000000 -0400
 @@ -224,6 +224,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -11779,9 +14305,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/msn/config/Makefile.in kdenetwork-3.4.1/kopete/protocols/msn/config/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/msn/config/Makefile.in	2005-05-23 18:09:04.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/msn/config/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/msn/config/Makefile.in kdenetwork-3.4.1/kopete/protocols/msn/config/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/msn/config/Makefile.in	2005-05-23 12:09:04.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/msn/config/Makefile.in	2005-05-24 13:47:16.000000000 -0400
 @@ -237,6 +237,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -11813,9 +14339,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/msn/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/msn/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/msn/icons/Makefile.in	2005-05-23 18:09:04.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/msn/icons/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/msn/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/msn/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/msn/icons/Makefile.in	2005-05-23 12:09:04.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/msn/icons/Makefile.in	2005-05-24 13:47:16.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -11847,9 +14373,86 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/msn/Makefile.in kdenetwork-3.4.1/kopete/protocols/msn/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/msn/Makefile.in	2005-05-23 18:09:04.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/msn/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -572,47 +575,47 @@
+ #>+ 44
+ install-kde-icons:
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_newmsg.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_newmsg.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_na.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_na.png
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-msn_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/msn_protocol.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_away.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_invisible.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_invisible.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_blocked.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_blocked.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_phone.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_phone.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_connecting.mng
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/cr48-app-msn_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/msn_protocol.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-msn_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/msn_protocol.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/cr128-app-msn_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/msn_protocol.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_lunch.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_lunch.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_blocked.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_blocked.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_brb.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_brb.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_busy.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_busy.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_offline.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_invisible.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_invisible.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_na.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_na.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_newmsg.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_newmsg.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr64-app-msn_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/msn_protocol.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_phone.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_phone.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_lunch.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_lunch.png
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-msn_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/msn_protocol.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_offline.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_busy.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_busy.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-msn_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/msn_protocol.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_away.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_online.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-msn_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_connecting.mng
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-msn_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/msn_protocol.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_newmsg.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_na.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/msn_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_away.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_invisible.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_blocked.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/msn_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_brb.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/msn_protocol.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_phone.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_lunch.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_connecting.mng
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/msn_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_offline.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/msn_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/msn_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_lunch.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_blocked.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_brb.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_busy.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_offline.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_invisible.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_na.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_newmsg.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/msn_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/msn_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_away.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_online.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/msn_connecting.mng
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/msn_protocol.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/msn/Makefile.in kdenetwork-3.4.1/kopete/protocols/msn/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/msn/Makefile.in	2005-05-23 12:09:04.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/msn/Makefile.in	2005-05-24 13:47:16.000000000 -0400
 @@ -267,6 +267,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -11881,9 +14484,71 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/msn/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/msn/ui/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/msn/ui/Makefile.in	2005-05-23 18:09:04.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/msn/ui/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -1003,13 +1006,6 @@
+ mocs: msndebugrawcmddlg.moc
+ 
+ #>+ 3
+-msncontact.moc: $(srcdir)/msncontact.h
+-	$(MOC) $(srcdir)/msncontact.h -o msncontact.moc
+-
+-#>+ 2
+-mocs: msncontact.moc
+-
+-#>+ 3
+ msnp2pdisplatcher.moc: $(srcdir)/msnp2pdisplatcher.h
+ 	$(MOC) $(srcdir)/msnp2pdisplatcher.h -o msnp2pdisplatcher.moc
+ 
+@@ -1031,6 +1027,13 @@
+ mocs: msnfiletransfersocket.moc
+ 
+ #>+ 3
++msncontact.moc: $(srcdir)/msncontact.h
++	$(MOC) $(srcdir)/msncontact.h -o msncontact.moc
++
++#>+ 2
++mocs: msncontact.moc
++
++#>+ 3
+ msnprotocol.moc: $(srcdir)/msnprotocol.h
+ 	$(MOC) $(srcdir)/msnprotocol.h -o msnprotocol.moc
+ 
+@@ -1073,18 +1076,18 @@
+ mocs: msnswitchboardsocket.moc
+ 
+ #>+ 3
+-msnp2poutgoing.moc: $(srcdir)/msnp2poutgoing.h
+-	$(MOC) $(srcdir)/msnp2poutgoing.h -o msnp2poutgoing.moc
++msnp2p.moc: $(srcdir)/msnp2p.h
++	$(MOC) $(srcdir)/msnp2p.h -o msnp2p.moc
+ 
+ #>+ 2
+-mocs: msnp2poutgoing.moc
++mocs: msnp2p.moc
+ 
+ #>+ 3
+-msnp2p.moc: $(srcdir)/msnp2p.h
+-	$(MOC) $(srcdir)/msnp2p.h -o msnp2p.moc
++msnp2poutgoing.moc: $(srcdir)/msnp2poutgoing.h
++	$(MOC) $(srcdir)/msnp2poutgoing.h -o msnp2poutgoing.moc
+ 
+ #>+ 2
+-mocs: msnp2p.moc
++mocs: msnp2poutgoing.moc
+ 
+ #>+ 3
+ msnaddcontactpage.moc: $(srcdir)/msnaddcontactpage.h
+@@ -1111,7 +1114,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  msndebugrawcmddlg.moc msncontact.moc msnp2pdisplatcher.moc msnmessagemanager.moc msnfiletransfersocket.moc msnprotocol.moc sslloginhandler.moc msnaccount.moc msnsocket.moc msnnotifysocket.moc msnswitchboardsocket.moc msnp2poutgoing.moc msnp2p.moc msnaddcontactpage.moc msnp2pincoming.moc
++	-rm -f  msndebugrawcmddlg.moc msnp2pdisplatcher.moc msnmessagemanager.moc msnfiletransfersocket.moc msncontact.moc msnprotocol.moc sslloginhandler.moc msnaccount.moc msnsocket.moc msnnotifysocket.moc msnswitchboardsocket.moc msnp2p.moc msnp2poutgoing.moc msnaddcontactpage.moc msnp2pincoming.moc
+ 
+ #>+ 2
+ KDE_DIST=msnp2poutgoing.h kopete_msn.desktop msncontact.h msnp2p.h msnmessagemanager.h msnchatui.rc Changelog msnsocket.h msnp2pincoming.h ReleaseNotes msndebugrawcmddlg.h msnaccount.h msnfiletransfersocket.h sha1.h msnp2pdisplatcher.h sslloginhandler.h msninvitation.h Makefile.in msnswitchboardsocket.h msnprotocol.h msnnotifysocket.h msnaddcontactpage.h Makefile.am 
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/msn/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/msn/ui/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/msn/ui/Makefile.in	2005-05-23 12:09:04.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/msn/ui/Makefile.in	2005-05-24 13:47:16.000000000 -0400
 @@ -223,6 +223,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -11915,9 +14580,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/oscar/aim/Makefile.in kdenetwork-3.4.1/kopete/protocols/oscar/aim/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/oscar/aim/Makefile.in	2005-05-23 18:09:04.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/oscar/aim/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/oscar/aim/Makefile.in kdenetwork-3.4.1/kopete/protocols/oscar/aim/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/oscar/aim/Makefile.in	2005-05-23 12:09:04.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/oscar/aim/Makefile.in	2005-05-24 13:47:17.000000000 -0400
 @@ -253,6 +253,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -11949,9 +14614,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/oscar/aim/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/oscar/aim/ui/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/oscar/aim/ui/Makefile.in	2005-05-23 18:09:04.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/oscar/aim/ui/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/oscar/aim/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/oscar/aim/ui/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/oscar/aim/ui/Makefile.in	2005-05-23 12:09:04.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/oscar/aim/ui/Makefile.in	2005-05-24 13:47:17.000000000 -0400
 @@ -226,6 +226,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -11983,9 +14648,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/oscar/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/oscar/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/oscar/icons/Makefile.in	2005-05-23 18:09:04.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/oscar/icons/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/oscar/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/oscar/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/oscar/icons/Makefile.in	2005-05-23 12:09:04.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/oscar/icons/Makefile.in	2005-05-24 13:47:17.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12017,9 +14682,180 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/oscar/icq/Makefile.in kdenetwork-3.4.1/kopete/protocols/oscar/icq/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/oscar/icq/Makefile.in	2005-05-23 18:09:04.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/oscar/icq/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -564,7 +567,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=cr16-action-aim_online.png hi16-action-icq_away.png hi16-app-icq_protocol.png cr128-app-icq_protocol.png hi16-action-icq_occupied.png hi16-action-aim_offline.png cr16-app-aim_protocol.png cr16-action-aim_away.png cr128-app-aim_protocol.png cr16-action-aim_offline.png hi32-app-aim_protocol.png hi16-action-icq_dnd.png cr16-action-aim_connecting.mng hi16-action-icq_connecting.mng cr64-app-aim_protocol.png cr16-action-icq_ffc.png cr32-app-aim_protocol.png hi16-action-aim_connecting.mng hi32-app-icq_protocol.png hi16-action-icq_ffc.png hi16-action-icq_online.png cr16-action-icq_away.png cr16-action-icq_connecting.mng hi16-action-aim_online.png cr16-action-icq_invisible.png cr16-action-icq_occupied.png hi16-action-aim_away.png cr48-app-aim_protocol.png cr32-app-icq_protocol.png cr16-action-icq_offline.png hi16-action-icq_invisible.png cr64-app-icq_protocol.png cr16-action-icq_online.png Makefile.in cr48-app-icq_protocol.png hi16-action-icq_offline.png cr16-action-icq_na.png cr16-action-icq_dnd.png hi16-action-icq_na.png hi16-app-aim_protocol.png Makefile.am cr16-app-icq_protocol.png 
++KDE_DIST=hi16-action-icq_away.png cr16-action-aim_online.png hi16-app-icq_protocol.png cr128-app-icq_protocol.png hi16-action-icq_occupied.png hi16-action-aim_offline.png cr16-app-aim_protocol.png cr128-app-aim_protocol.png cr16-action-aim_away.png cr16-action-aim_offline.png hi32-app-aim_protocol.png hi16-action-icq_dnd.png cr16-action-aim_connecting.mng hi16-action-icq_connecting.mng cr64-app-aim_protocol.png cr16-action-icq_ffc.png cr32-app-aim_protocol.png hi16-action-aim_connecting.mng hi32-app-icq_protocol.png hi16-action-icq_ffc.png hi16-action-icq_online.png cr16-action-icq_away.png cr16-action-icq_connecting.mng hi16-action-aim_online.png cr16-action-icq_invisible.png cr16-action-icq_occupied.png hi16-action-aim_away.png cr32-app-icq_protocol.png cr48-app-aim_protocol.png cr16-action-icq_offline.png hi16-action-icq_invisible.png cr64-app-icq_protocol.png cr16-action-icq_online.png cr48-app-icq_protocol.png Makefile.in hi16-action-icq_offline.png cr16-action-icq_na.png hi16-action-icq_na.png cr16-action-icq_dnd.png hi16-app-aim_protocol.png Makefile.am cr16-app-icq_protocol.png 
+ 
+ #>+ 2
+ docs-am:
+@@ -572,96 +575,96 @@
+ #>+ 93
+ install-kde-icons:
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions
+-	$(INSTALL_DATA) $(srcdir)/hi16-action-icq_connecting.mng $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_connecting.mng
+-	$(INSTALL_DATA) $(srcdir)/hi16-action-icq_offline.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_offline.png
++	$(INSTALL_DATA) $(srcdir)/hi16-action-aim_away.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_away.png
++	$(INSTALL_DATA) $(srcdir)/hi16-action-icq_invisible.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_invisible.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/cr48-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/aim_protocol.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/hi16-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/aim_protocol.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/cr16-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/aim_protocol.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
++	$(INSTALL_DATA) $(srcdir)/cr16-action-aim_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_away.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-icq_invisible.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_invisible.png
+-	$(INSTALL_DATA) $(srcdir)/hi16-action-icq_online.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_online.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr128-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/aim_protocol.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-aim_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_offline.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-icq_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_connecting.mng
++	$(INSTALL_DATA) $(srcdir)/hi16-action-icq_connecting.mng $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_connecting.mng
+ 	$(INSTALL_DATA) $(srcdir)/hi16-action-icq_occupied.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_occupied.png
+-	$(INSTALL_DATA) $(srcdir)/hi16-action-aim_away.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_away.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-aim_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_connecting.mng
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/icq_protocol.png
+-	$(INSTALL_DATA) $(srcdir)/hi16-action-icq_ffc.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_ffc.png
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/aim_protocol.png
+-	$(INSTALL_DATA) $(srcdir)/hi16-action-icq_away.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_away.png
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/aim_protocol.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-icq_na.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_na.png
+ 	$(INSTALL_DATA) $(srcdir)/hi16-action-icq_dnd.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_dnd.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-icq_dnd.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_dnd.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-aim_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_connecting.mng
++	$(INSTALL_DATA) $(srcdir)/hi16-action-icq_offline.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_offline.png
++	$(INSTALL_DATA) $(srcdir)/hi16-action-aim_online.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_online.png
++	$(INSTALL_DATA) $(srcdir)/hi16-action-aim_connecting.mng $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_connecting.mng
++	$(INSTALL_DATA) $(srcdir)/cr16-action-aim_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_online.png
++	$(INSTALL_DATA) $(srcdir)/hi16-action-icq_away.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_away.png
++	$(INSTALL_DATA) $(srcdir)/hi16-action-icq_na.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_na.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/aim_protocol.png
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/icq_protocol.png
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/aim_protocol.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/icq_protocol.png
+ 	$(INSTALL_DATA) $(srcdir)/cr64-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/icq_protocol.png
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/icq_protocol.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-aim_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_offline.png
+-	$(INSTALL_DATA) $(srcdir)/hi16-action-icq_invisible.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_invisible.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-aim_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_online.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-icq_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_connecting.mng
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-icq_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_offline.png
+-	$(INSTALL_DATA) $(srcdir)/hi16-action-aim_connecting.mng $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_connecting.mng
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-icq_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_online.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/hi32-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/32x32/apps/aim_protocol.png
+-	$(INSTALL_DATA) $(srcdir)/hi16-action-icq_na.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_na.png
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/hi16-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/aim_protocol.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-aim_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_away.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-icq_occupied.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_occupied.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-icq_ffc.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_ffc.png
+ 	$(INSTALL_DATA) $(srcdir)/hi32-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/32x32/apps/icq_protocol.png
+-	$(INSTALL_DATA) $(srcdir)/hi16-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/icq_protocol.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/icq_protocol.png
++	$(INSTALL_DATA) $(srcdir)/hi16-action-icq_ffc.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_ffc.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-icq_ffc.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_ffc.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-icq_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_away.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-icq_dnd.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_dnd.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-icq_occupied.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_occupied.png
++	$(INSTALL_DATA) $(srcdir)/cr64-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/aim_protocol.png
++	$(INSTALL_DATA) $(srcdir)/hi32-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/32x32/apps/aim_protocol.png
++	$(INSTALL_DATA) $(srcdir)/cr32-app-aim_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/aim_protocol.png
+ 	$(INSTALL_DATA) $(srcdir)/hi16-action-aim_offline.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_offline.png
+-	$(INSTALL_DATA) $(srcdir)/hi16-action-aim_online.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_online.png
++	$(INSTALL_DATA) $(srcdir)/hi16-action-icq_online.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_online.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-icq_offline.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_offline.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-icq_online.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_online.png
++	$(INSTALL_DATA) $(srcdir)/cr48-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/icq_protocol.png
++	$(INSTALL_DATA) $(srcdir)/hi16-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/icq_protocol.png
++	$(INSTALL_DATA) $(srcdir)/cr16-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/icq_protocol.png
++	$(INSTALL_DATA) $(srcdir)/cr128-app-icq_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/icq_protocol.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_connecting.mng
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_offline.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_away.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_invisible.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/aim_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/aim_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/aim_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_away.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_invisible.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_online.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/aim_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_offline.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_connecting.mng
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_connecting.mng
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_occupied.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_away.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_connecting.mng
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/icq_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_ffc.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/aim_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_away.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/aim_protocol.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_na.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_dnd.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/aim_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/icq_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/aim_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/icq_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/icq_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/icq_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_offline.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_invisible.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_online.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_connecting.mng
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_offline.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_dnd.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_connecting.mng
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_offline.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_online.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_connecting.mng
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_online.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/32x32/apps/aim_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_online.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_away.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_na.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/aim_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/aim_away.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_occupied.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_ffc.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/icq_protocol.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/32x32/apps/icq_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/icq_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/icq_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_ffc.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_ffc.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_away.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_dnd.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_occupied.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/aim_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/32x32/apps/aim_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/aim_protocol.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_offline.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/aim_online.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/actions/icq_online.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_offline.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/icq_online.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/icq_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/hicolor/16x16/apps/icq_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/icq_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/icq_protocol.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/oscar/icq/Makefile.in kdenetwork-3.4.1/kopete/protocols/oscar/icq/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/oscar/icq/Makefile.in	2005-05-23 12:09:04.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/oscar/icq/Makefile.in	2005-05-24 13:47:17.000000000 -0400
 @@ -254,6 +254,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12051,9 +14887,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/oscar/icq/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/oscar/icq/ui/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/oscar/icq/ui/Makefile.in	2005-05-23 18:09:04.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/oscar/icq/ui/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/oscar/icq/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/oscar/icq/ui/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/oscar/icq/ui/Makefile.in	2005-05-23 12:09:04.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/oscar/icq/ui/Makefile.in	2005-05-24 13:47:17.000000000 -0400
 @@ -236,6 +236,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12085,9 +14921,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/oscar/liboscar/Makefile.in kdenetwork-3.4.1/kopete/protocols/oscar/liboscar/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/oscar/liboscar/Makefile.in	2005-05-23 18:09:04.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/oscar/liboscar/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -760,7 +763,7 @@
+ 	-rm -f  icqaddcontactpage.moc icqsearchdialog.moc icqeditaccountwidget.moc icquserinfowidget.moc icqauthreplydialog.moc
+ 
+ #>+ 2
+-KDE_DIST=icqadd.ui icqaddcontactpage.h icquserinfowidget.h icqauthreplydialog.h icqeditaccountui.ui icqotherinfowidget.ui Makefile.in icqworkinfowidget.ui icqauthreplyui.ui icqeditaccountwidget.h icqsearchbase.ui icqgeneralinfo.ui Makefile.am 
++KDE_DIST=icqadd.ui icqaddcontactpage.h icquserinfowidget.h icqauthreplydialog.h icqeditaccountui.ui icqotherinfowidget.ui Makefile.in icqworkinfowidget.ui icqauthreplyui.ui icqeditaccountwidget.h icqgeneralinfo.ui icqsearchbase.ui Makefile.am 
+ 
+ #>+ 10
+ clean-ui:
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/oscar/liboscar/Makefile.in kdenetwork-3.4.1/kopete/protocols/oscar/liboscar/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/oscar/liboscar/Makefile.in	2005-05-23 12:09:04.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/oscar/liboscar/Makefile.in	2005-05-24 13:47:17.000000000 -0400
 @@ -269,6 +269,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12119,9 +14964,157 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/oscar/liboscar/tests/Makefile.in kdenetwork-3.4.1/kopete/protocols/oscar/liboscar/tests/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/oscar/liboscar/tests/Makefile.in	2005-05-23 18:09:04.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/oscar/liboscar/tests/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -889,18 +892,18 @@
+ mocs: servicesetuptask.moc
+ 
+ #>+ 3
+-ssimanager.moc: $(srcdir)/ssimanager.h
+-	$(MOC) $(srcdir)/ssimanager.h -o ssimanager.moc
++flapprotocol.moc: $(srcdir)/flapprotocol.h
++	$(MOC) $(srcdir)/flapprotocol.h -o flapprotocol.moc
+ 
+ #>+ 2
+-mocs: ssimanager.moc
++mocs: flapprotocol.moc
+ 
+ #>+ 3
+-flapprotocol.moc: $(srcdir)/flapprotocol.h
+-	$(MOC) $(srcdir)/flapprotocol.h -o flapprotocol.moc
++ssimanager.moc: $(srcdir)/ssimanager.h
++	$(MOC) $(srcdir)/ssimanager.h -o ssimanager.moc
+ 
+ #>+ 2
+-mocs: flapprotocol.moc
++mocs: ssimanager.moc
+ 
+ #>+ 3
+ bytestream.moc: $(srcdir)/bytestream.h
+@@ -931,18 +934,18 @@
+ mocs: stream.moc
+ 
+ #>+ 3
+-ssiauthtask.moc: $(srcdir)/ssiauthtask.h
+-	$(MOC) $(srcdir)/ssiauthtask.h -o ssiauthtask.moc
++rateclassmanager.moc: $(srcdir)/rateclassmanager.h
++	$(MOC) $(srcdir)/rateclassmanager.h -o rateclassmanager.moc
+ 
+ #>+ 2
+-mocs: ssiauthtask.moc
++mocs: rateclassmanager.moc
+ 
+ #>+ 3
+-rateclassmanager.moc: $(srcdir)/rateclassmanager.h
+-	$(MOC) $(srcdir)/rateclassmanager.h -o rateclassmanager.moc
++ssiauthtask.moc: $(srcdir)/ssiauthtask.h
++	$(MOC) $(srcdir)/ssiauthtask.h -o ssiauthtask.moc
+ 
+ #>+ 2
+-mocs: rateclassmanager.moc
++mocs: ssiauthtask.moc
+ 
+ #>+ 3
+ usersearchtask.moc: $(srcdir)/usersearchtask.h
+@@ -959,11 +962,11 @@
+ mocs: rateclass.moc
+ 
+ #>+ 3
+-ownuserinfotask.moc: $(srcdir)/ownuserinfotask.h
+-	$(MOC) $(srcdir)/ownuserinfotask.h -o ownuserinfotask.moc
++snacprotocol.moc: $(srcdir)/snacprotocol.h
++	$(MOC) $(srcdir)/snacprotocol.h -o snacprotocol.moc
+ 
+ #>+ 2
+-mocs: ownuserinfotask.moc
++mocs: snacprotocol.moc
+ 
+ #>+ 3
+ rateinfotask.moc: $(srcdir)/rateinfotask.h
+@@ -973,11 +976,11 @@
+ mocs: rateinfotask.moc
+ 
+ #>+ 3
+-snacprotocol.moc: $(srcdir)/snacprotocol.h
+-	$(MOC) $(srcdir)/snacprotocol.h -o snacprotocol.moc
++ownuserinfotask.moc: $(srcdir)/ownuserinfotask.h
++	$(MOC) $(srcdir)/ownuserinfotask.h -o ownuserinfotask.moc
+ 
+ #>+ 2
+-mocs: snacprotocol.moc
++mocs: ownuserinfotask.moc
+ 
+ #>+ 3
+ safedelete.moc: $(srcdir)/safedelete.h
+@@ -1043,18 +1046,18 @@
+ mocs: oscarclientstream.moc
+ 
+ #>+ 3
+-closeconnectiontask.moc: $(srcdir)/closeconnectiontask.h
+-	$(MOC) $(srcdir)/closeconnectiontask.h -o closeconnectiontask.moc
++logintask.moc: $(srcdir)/logintask.h
++	$(MOC) $(srcdir)/logintask.h -o logintask.moc
+ 
+ #>+ 2
+-mocs: closeconnectiontask.moc
++mocs: logintask.moc
+ 
+ #>+ 3
+-logintask.moc: $(srcdir)/logintask.h
+-	$(MOC) $(srcdir)/logintask.h -o logintask.moc
++closeconnectiontask.moc: $(srcdir)/closeconnectiontask.h
++	$(MOC) $(srcdir)/closeconnectiontask.h -o closeconnectiontask.moc
+ 
+ #>+ 2
+-mocs: logintask.moc
++mocs: closeconnectiontask.moc
+ 
+ #>+ 3
+ connector.moc: $(srcdir)/connector.h
+@@ -1106,25 +1109,25 @@
+ mocs: oscarbytestream.moc
+ 
+ #>+ 3
+-inputprotocolbase.moc: $(srcdir)/inputprotocolbase.h
+-	$(MOC) $(srcdir)/inputprotocolbase.h -o inputprotocolbase.moc
++messagereceivertask.moc: $(srcdir)/messagereceivertask.h
++	$(MOC) $(srcdir)/messagereceivertask.h -o messagereceivertask.moc
+ 
+ #>+ 2
+-mocs: inputprotocolbase.moc
++mocs: messagereceivertask.moc
+ 
+ #>+ 3
+-messagereceivertask.moc: $(srcdir)/messagereceivertask.h
+-	$(MOC) $(srcdir)/messagereceivertask.h -o messagereceivertask.moc
++inputprotocolbase.moc: $(srcdir)/inputprotocolbase.h
++	$(MOC) $(srcdir)/inputprotocolbase.h -o inputprotocolbase.moc
+ 
+ #>+ 2
+-mocs: messagereceivertask.moc
++mocs: inputprotocolbase.moc
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  oscarconnector.moc icquserinfotask.moc servicesetuptask.moc ssimanager.moc flapprotocol.moc bytestream.moc icqtask.moc onlinenotifiertask.moc stream.moc ssiauthtask.moc rateclassmanager.moc usersearchtask.moc rateclass.moc ownuserinfotask.moc rateinfotask.moc snacprotocol.moc safedelete.moc icqlogintask.moc userinfotask.moc connection.moc ssilisttask.moc warningtask.moc aimlogintask.moc typingnotifytask.moc oscarclientstream.moc closeconnectiontask.moc logintask.moc connector.moc task.moc serverversionstask.moc client.moc coreprotocol.moc offlinemessagestask.moc oscarbytestream.moc inputprotocolbase.moc messagereceivertask.moc
++	-rm -f  oscarconnector.moc icquserinfotask.moc servicesetuptask.moc flapprotocol.moc ssimanager.moc bytestream.moc icqtask.moc onlinenotifiertask.moc stream.moc rateclassmanager.moc ssiauthtask.moc usersearchtask.moc rateclass.moc snacprotocol.moc rateinfotask.moc ownuserinfotask.moc safedelete.moc icqlogintask.moc userinfotask.moc connection.moc ssilisttask.moc warningtask.moc aimlogintask.moc typingnotifytask.moc oscarclientstream.moc logintask.moc closeconnectiontask.moc connector.moc task.moc serverversionstask.moc client.moc coreprotocol.moc offlinemessagestask.moc oscarbytestream.moc messagereceivertask.moc inputprotocolbase.moc
+ 
+ #>+ 2
+-KDE_DIST=sendidletimetask.h ssilisttask.h errortask.h coreprotocol.h ownuserinfotask.h icqlogintask.h buffer.h connection.h clientreadytask.h HACKING rtf2html.h locationrightstask.h rateinfotask.h senddcinfotask.h stream.h blmlimitstask.h rateclassmanager.h oscarclientstream.h logintask.h safedelete.h task.h oscarutils.h ssiparamstask.h rtf.ll DESIGN oscarbytestream.h oscartypes.h bytestream.h aimlogintask.h oscarconnector.h icbmparamstask.h client.h prmparamstask.h transfer.h closeconnectiontask.h profiletask.h flapprotocol.h ssiactivatetask.h serverversionstask.h Makefile.in md5.h connector.h inputprotocolbase.h onlinenotifiertask.h ssimanager.h snacprotocol.h Makefile.am servicesetuptask.h 
++KDE_DIST=sendidletimetask.h ssilisttask.h errortask.h coreprotocol.h ownuserinfotask.h icqlogintask.h buffer.h connection.h clientreadytask.h HACKING locationrightstask.h rtf2html.h rateinfotask.h senddcinfotask.h stream.h blmlimitstask.h rateclassmanager.h oscarclientstream.h logintask.h safedelete.h task.h oscarutils.h ssiparamstask.h rtf.ll DESIGN oscarbytestream.h bytestream.h oscartypes.h aimlogintask.h oscarconnector.h icbmparamstask.h client.h prmparamstask.h transfer.h closeconnectiontask.h profiletask.h flapprotocol.h ssiactivatetask.h serverversionstask.h Makefile.in md5.h connector.h inputprotocolbase.h onlinenotifiertask.h ssimanager.h snacprotocol.h Makefile.am servicesetuptask.h 
+ 
+ #>+ 3
+ clean-closures:
+@@ -1172,7 +1175,7 @@
+ 
+ 
+ #>+ 11
+-liboscar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/oscarutils.cpp $(srcdir)/client.cpp $(srcdir)/task.cpp $(srcdir)/connector.cpp $(srcdir)/inputprotocolbase.cpp $(srcdir)/coreprotocol.cpp $(srcdir)/flapprotocol.cpp $(srcdir)/snacprotocol.cpp $(srcdir)/transfer.cpp $(srcdir)/bytestream.cpp $(srcdir)/oscarclientstream.cpp $(srcdir)/safedelete.cpp $(srcdir)/stream.cpp $(srcdir)/oscarconnector.cpp $(srcdir)/oscarbytestream.cpp $(srcdir)/buffer.cpp $(srcdir)/logintask.cpp $(srcdir)/aimlogintask.cpp $(srcdir)/icqlogintask.cpp $(srcdir)/closeconnectiontask.cpp $(srcdir)/rateclassmanager.cpp $(srcdir)/serverversionstask.cpp $(srcdir)/rateinfotask.cpp $(srcdir)/errortask.cpp $(srcdir)/locationrightstask.cpp $(srcdir)/profiletask.cpp $(srcdir)/blmlimitstask.cpp $(srcdir)/servicesetuptask.cpp $(srcdir)/icbmparamstask.cpp $(srcdir)/ssimanager.cpp $(srcdir)/rateclass.cpp $(srcdir)/prmparamstask.cpp $(srcdir)/ssiparamstask.cpp $(srcdir)/ssilisttask.cpp $(srcdir)/ssiactivatetask.cpp $(srcdir)/clientreadytask.cpp $(srcdir)/senddcinfotask.cpp $(srcdir)/sendidletimetask.cpp $(srcdir)/ownuserinfotask.cpp $(srcdir)/connection.cpp $(srcdir)/onlinenotifiertask.cpp $(srcdir)/userdetails.cpp $(srcdir)/ssimodifytask.cpp $(srcdir)/oscartypeclasses.cpp $(srcdir)/messagereceivertask.cpp $(srcdir)/sendmessagetask.cpp $(srcdir)/icqtask.cpp $(srcdir)/offlinemessagestask.cpp $(srcdir)/ssiauthtask.cpp $(srcdir)/userinfotask.cpp $(srcdir)/icquserinfo.cpp $(srcdir)/icquserinfotask.cpp $(srcdir)/usersearchtask.cpp $(srcdir)/warningtask.cpp $(srcdir)/changevisibilitytask.cpp $(srcdir)/typingnotifytask.cpp $(srcdir)/oscarsettings.cpp  oscarconnector.moc icquserinfotask.moc servicesetuptask.moc ssimanager.moc flapprotocol.moc bytestream.moc icqtask.moc onlinenotifiertask.moc stream.moc ssiauthtask.moc rateclassmanager.moc usersearchtask.moc rateclass.moc ownuserinfotask.moc rateinfotask.moc snacprotocol.moc safedelete.moc userinfotask.moc icqlogintask.moc connection.moc ssilisttask.moc warningtask.moc aimlogintask.moc typingnotifytask.moc oscarclientstream.moc closeconnectiontask.moc logintask.moc connector.moc task.moc serverversionstask.moc client.moc coreprotocol.moc offlinemessagestask.moc oscarbytestream.moc messagereceivertask.moc inputprotocolbase.moc
++liboscar_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/oscarutils.cpp $(srcdir)/client.cpp $(srcdir)/task.cpp $(srcdir)/connector.cpp $(srcdir)/inputprotocolbase.cpp $(srcdir)/coreprotocol.cpp $(srcdir)/flapprotocol.cpp $(srcdir)/snacprotocol.cpp $(srcdir)/transfer.cpp $(srcdir)/bytestream.cpp $(srcdir)/oscarclientstream.cpp $(srcdir)/safedelete.cpp $(srcdir)/stream.cpp $(srcdir)/oscarconnector.cpp $(srcdir)/oscarbytestream.cpp $(srcdir)/buffer.cpp $(srcdir)/logintask.cpp $(srcdir)/aimlogintask.cpp $(srcdir)/icqlogintask.cpp $(srcdir)/closeconnectiontask.cpp $(srcdir)/rateclassmanager.cpp $(srcdir)/serverversionstask.cpp $(srcdir)/rateinfotask.cpp $(srcdir)/errortask.cpp $(srcdir)/locationrightstask.cpp $(srcdir)/profiletask.cpp $(srcdir)/blmlimitstask.cpp $(srcdir)/servicesetuptask.cpp $(srcdir)/icbmparamstask.cpp $(srcdir)/ssimanager.cpp $(srcdir)/rateclass.cpp $(srcdir)/prmparamstask.cpp $(srcdir)/ssiparamstask.cpp $(srcdir)/ssilisttask.cpp $(srcdir)/ssiactivatetask.cpp $(srcdir)/clientreadytask.cpp $(srcdir)/senddcinfotask.cpp $(srcdir)/sendidletimetask.cpp $(srcdir)/ownuserinfotask.cpp $(srcdir)/connection.cpp $(srcdir)/onlinenotifiertask.cpp $(srcdir)/userdetails.cpp $(srcdir)/ssimodifytask.cpp $(srcdir)/oscartypeclasses.cpp $(srcdir)/messagereceivertask.cpp $(srcdir)/sendmessagetask.cpp $(srcdir)/icqtask.cpp $(srcdir)/offlinemessagestask.cpp $(srcdir)/ssiauthtask.cpp $(srcdir)/userinfotask.cpp $(srcdir)/icquserinfo.cpp $(srcdir)/icquserinfotask.cpp $(srcdir)/usersearchtask.cpp $(srcdir)/warningtask.cpp $(srcdir)/changevisibilitytask.cpp $(srcdir)/typingnotifytask.cpp $(srcdir)/oscarsettings.cpp  oscarconnector.moc icquserinfotask.moc servicesetuptask.moc flapprotocol.moc ssimanager.moc bytestream.moc icqtask.moc onlinenotifiertask.moc stream.moc rateclassmanager.moc ssiauthtask.moc usersearchtask.moc rateclass.moc snacprotocol.moc rateinfotask.moc ownuserinfotask.moc safedelete.moc userinfotask.moc icqlogintask.moc connection.moc ssilisttask.moc warningtask.moc aimlogintask.moc typingnotifytask.moc oscarclientstream.moc logintask.moc closeconnectiontask.moc connector.moc task.moc serverversionstask.moc client.moc coreprotocol.moc offlinemessagestask.moc oscarbytestream.moc inputprotocolbase.moc messagereceivertask.moc
+ 	@echo 'creating liboscar_la.all_cpp.cpp ...'; \
+ 	rm -f liboscar_la.all_cpp.files liboscar_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> liboscar_la.all_cpp.final; \
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/oscar/liboscar/tests/Makefile.in kdenetwork-3.4.1/kopete/protocols/oscar/liboscar/tests/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/oscar/liboscar/tests/Makefile.in	2005-05-23 12:09:04.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/oscar/liboscar/tests/Makefile.in	2005-05-24 13:47:17.000000000 -0400
 @@ -238,6 +238,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12153,9 +15146,52 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstPROGRAMS:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/oscar/Makefile.in kdenetwork-3.4.1/kopete/protocols/oscar/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/oscar/Makefile.in	2005-05-23 18:09:04.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/oscar/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -734,18 +737,18 @@
+ mocs: ssigrouptest.moc
+ 
+ #>+ 3
+-ssitest.moc: $(srcdir)/ssitest.h
+-	$(MOC) $(srcdir)/ssitest.h -o ssitest.moc
++userinfotest.moc: $(srcdir)/userinfotest.h
++	$(MOC) $(srcdir)/userinfotest.h -o userinfotest.moc
+ 
+ #>+ 2
+-mocs: ssitest.moc
++mocs: userinfotest.moc
+ 
+ #>+ 3
+-userinfotest.moc: $(srcdir)/userinfotest.h
+-	$(MOC) $(srcdir)/userinfotest.h -o userinfotest.moc
++ssitest.moc: $(srcdir)/ssitest.h
++	$(MOC) $(srcdir)/ssitest.h -o ssitest.moc
+ 
+ #>+ 2
+-mocs: userinfotest.moc
++mocs: ssitest.moc
+ 
+ #>+ 3
+ clientstream_test.moc: $(srcdir)/clientstream_test.h
+@@ -756,7 +759,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  logintest.moc ssigrouptest.moc ssitest.moc userinfotest.moc clientstream_test.moc
++	-rm -f  logintest.moc ssigrouptest.moc userinfotest.moc ssitest.moc clientstream_test.moc
+ 
+ #>+ 2
+ KDE_DIST=ssitest.h clientstream_test.h logintest.h ssigrouptest.h Makefile.in userinfotest.h Makefile.am 
+@@ -835,7 +838,7 @@
+ logintest.o: logintest.moc 
+ logintest.lo: logintest.moc 
+ ssitest.o: ssitest.moc 
+-ssitest.lo: ssitest.moc 
+ clientstream_test.o: clientstream_test.moc 
++ssitest.lo: ssitest.moc 
+ clientstream_test.lo: clientstream_test.moc 
+ userinfotest.lo: userinfotest.moc 
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/oscar/Makefile.in kdenetwork-3.4.1/kopete/protocols/oscar/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/oscar/Makefile.in	2005-05-23 12:09:04.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/oscar/Makefile.in	2005-05-24 13:47:16.000000000 -0400
 @@ -250,6 +250,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12187,9 +15223,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/sms/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/sms/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/sms/icons/Makefile.in	2005-05-23 18:09:04.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/sms/icons/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/sms/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/sms/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/sms/icons/Makefile.in	2005-05-23 12:09:04.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/sms/icons/Makefile.in	2005-05-24 13:47:17.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12221,9 +15257,37 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/sms/Makefile.in kdenetwork-3.4.1/kopete/protocols/sms/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/sms/Makefile.in	2005-05-23 18:09:04.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/sms/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -573,21 +576,21 @@
+ install-kde-icons:
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr64-app-sms_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/sms_protocol.png
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-sms_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/sms_protocol.png
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-sms_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/sms_protocol.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-sms_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/sms_protocol.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/cr48-app-sms_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/sms_protocol.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-sms_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/sms_protocol.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/cr128-app-sms_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/sms_protocol.png
+ 
+ uninstall-kde-icons:
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/sms_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/sms_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/sms_protocol.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/sms_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/sms_protocol.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/sms_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/sms_protocol.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/sms/Makefile.in kdenetwork-3.4.1/kopete/protocols/sms/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/sms/Makefile.in	2005-05-23 12:09:04.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/sms/Makefile.in	2005-05-24 13:47:17.000000000 -0400
 @@ -256,6 +256,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12255,9 +15319,53 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/sms/services/Makefile.in kdenetwork-3.4.1/kopete/protocols/sms/services/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/sms/services/Makefile.in	2005-05-23 18:09:04.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/sms/services/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -936,11 +939,11 @@
+ mocs: smsaddcontactpage.moc
+ 
+ #>+ 3
+-smsservice.moc: $(srcdir)/smsservice.h
+-	$(MOC) $(srcdir)/smsservice.h -o smsservice.moc
++smseditaccountwidget.moc: $(srcdir)/smseditaccountwidget.h
++	$(MOC) $(srcdir)/smseditaccountwidget.h -o smseditaccountwidget.moc
+ 
+ #>+ 2
+-mocs: smsservice.moc
++mocs: smseditaccountwidget.moc
+ 
+ #>+ 3
+ smscontact.moc: $(srcdir)/smscontact.h
+@@ -950,15 +953,15 @@
+ mocs: smscontact.moc
+ 
+ #>+ 3
+-smseditaccountwidget.moc: $(srcdir)/smseditaccountwidget.h
+-	$(MOC) $(srcdir)/smseditaccountwidget.h -o smseditaccountwidget.moc
++smsservice.moc: $(srcdir)/smsservice.h
++	$(MOC) $(srcdir)/smsservice.h -o smsservice.moc
+ 
+ #>+ 2
+-mocs: smseditaccountwidget.moc
++mocs: smsservice.moc
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  smsaccount.moc smsuserpreferences.moc smsprotocol.moc smsaddcontactpage.moc smsservice.moc smscontact.moc smseditaccountwidget.moc
++	-rm -f  smsaccount.moc smsuserpreferences.moc smsprotocol.moc smsaddcontactpage.moc smseditaccountwidget.moc smscontact.moc smsservice.moc
+ 
+ #>+ 2
+ KDE_DIST=smsuserpreferences.h smscontact.h smsprotocol.h smsaddcontactpage.h serviceloader.h smsservice.h Makefile.in smsaccount.h smseditaccountwidget.h kopete_sms.desktop Makefile.am 
+@@ -1009,7 +1012,7 @@
+ 
+ 
+ #>+ 11
+-kopete_sms_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/smsaddcontactpage.cpp $(srcdir)/smscontact.cpp $(srcdir)/smseditaccountwidget.cpp $(srcdir)/smsprotocol.cpp $(srcdir)/serviceloader.cpp $(srcdir)/smsservice.cpp $(srcdir)/smsuserpreferences.cpp $(srcdir)/smsaccount.cpp  smsaccount.moc smsuserpreferences.moc smsprotocol.moc smseditaccountwidget.moc smscontact.moc smsservice.moc smsaddcontactpage.moc
++kopete_sms_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/smsaddcontactpage.cpp $(srcdir)/smscontact.cpp $(srcdir)/smseditaccountwidget.cpp $(srcdir)/smsprotocol.cpp $(srcdir)/serviceloader.cpp $(srcdir)/smsservice.cpp $(srcdir)/smsuserpreferences.cpp $(srcdir)/smsaccount.cpp  smsaccount.moc smsuserpreferences.moc smsprotocol.moc smsservice.moc smscontact.moc smseditaccountwidget.moc smsaddcontactpage.moc
+ 	@echo 'creating kopete_sms_la.all_cpp.cpp ...'; \
+ 	rm -f kopete_sms_la.all_cpp.files kopete_sms_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kopete_sms_la.all_cpp.final; \
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/sms/services/Makefile.in kdenetwork-3.4.1/kopete/protocols/sms/services/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/sms/services/Makefile.in	2005-05-23 12:09:04.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/sms/services/Makefile.in	2005-05-24 13:47:17.000000000 -0400
 @@ -226,6 +226,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12289,9 +15397,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/sms/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/sms/ui/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/sms/ui/Makefile.in	2005-05-23 18:09:04.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/sms/ui/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/sms/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/sms/ui/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/sms/ui/Makefile.in	2005-05-23 12:09:04.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/sms/ui/Makefile.in	2005-05-24 13:47:17.000000000 -0400
 @@ -223,6 +223,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12323,9 +15431,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/testbed/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/testbed/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/testbed/icons/Makefile.in	2005-05-23 18:09:04.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/testbed/icons/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/testbed/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/testbed/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/testbed/icons/Makefile.in	2005-05-23 12:09:04.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/testbed/icons/Makefile.in	2005-05-24 13:47:17.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12357,9 +15465,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/testbed/Makefile.in kdenetwork-3.4.1/kopete/protocols/testbed/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/testbed/Makefile.in	2005-05-23 18:09:04.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/testbed/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -571,23 +574,23 @@
+ 
+ #>+ 19
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-testbed_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/testbed_protocol.png
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-testbed_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/testbed_protocol.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr64-app-testbed_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/testbed_protocol.png
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-testbed_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/testbed_protocol.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-testbed_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/testbed_protocol.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/cr128-app-testbed_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/testbed_protocol.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-testbed_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/testbed_protocol.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/cr16-app-testbed_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/testbed_protocol.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/testbed_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/testbed_protocol.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/testbed_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/testbed_protocol.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/testbed_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/testbed_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/testbed_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/testbed_protocol.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/testbed/Makefile.in kdenetwork-3.4.1/kopete/protocols/testbed/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/testbed/Makefile.in	2005-05-23 12:09:04.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/testbed/Makefile.in	2005-05-24 13:47:17.000000000 -0400
 @@ -260,6 +260,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12391,9 +15532,53 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/winpopup/config/Makefile.in kdenetwork-3.4.1/kopete/protocols/winpopup/config/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/winpopup/config/Makefile.in	2005-05-23 18:09:04.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/winpopup/config/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -916,18 +919,18 @@
+ mocs: testbedprotocol.moc
+ 
+ #>+ 3
+-testbedfakeserver.moc: $(srcdir)/testbedfakeserver.h
+-	$(MOC) $(srcdir)/testbedfakeserver.h -o testbedfakeserver.moc
++testbedaddcontactpage.moc: $(srcdir)/testbedaddcontactpage.h
++	$(MOC) $(srcdir)/testbedaddcontactpage.h -o testbedaddcontactpage.moc
+ 
+ #>+ 2
+-mocs: testbedfakeserver.moc
++mocs: testbedaddcontactpage.moc
+ 
+ #>+ 3
+-testbedaddcontactpage.moc: $(srcdir)/testbedaddcontactpage.h
+-	$(MOC) $(srcdir)/testbedaddcontactpage.h -o testbedaddcontactpage.moc
++testbedfakeserver.moc: $(srcdir)/testbedfakeserver.h
++	$(MOC) $(srcdir)/testbedfakeserver.h -o testbedfakeserver.moc
+ 
+ #>+ 2
+-mocs: testbedaddcontactpage.moc
++mocs: testbedfakeserver.moc
+ 
+ #>+ 3
+ testbedaccount.moc: $(srcdir)/testbedaccount.h
+@@ -952,7 +955,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  testbededitaccountwidget.moc testbedprotocol.moc testbedfakeserver.moc testbedaddcontactpage.moc testbedaccount.moc testbedcontact.moc testbedincomingmessage.moc
++	-rm -f  testbededitaccountwidget.moc testbedprotocol.moc testbedaddcontactpage.moc testbedfakeserver.moc testbedaccount.moc testbedcontact.moc testbedincomingmessage.moc
+ 
+ #>+ 2
+ KDE_DIST=testbedaddui.ui Makefile.in kopete_testbed.desktop testbedaccountpreferences.ui Makefile.am 
+@@ -1052,8 +1055,8 @@
+ testbedcontact.lo: testbedcontact.moc 
+ $(srcdir)/testbedincomingmessage.cpp: testbedaddui.h testbedaccountpreferences.h 
+ testbedcontact.o: testbedcontact.moc 
+-testbedaddcontactpage.lo: testbedaddcontactpage.moc 
+ testbedfakeserver.o: testbedfakeserver.moc 
++testbedaddcontactpage.lo: testbedaddcontactpage.moc 
+ testbededitaccountwidget.lo: testbededitaccountwidget.moc 
+ nmcheck: 
+ testbedaccount.lo: testbedaccount.moc 
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/winpopup/config/Makefile.in kdenetwork-3.4.1/kopete/protocols/winpopup/config/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/winpopup/config/Makefile.in	2005-05-23 12:09:04.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/winpopup/config/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -237,6 +237,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12425,9 +15610,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/winpopup/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/winpopup/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/winpopup/icons/Makefile.in	2005-05-23 18:09:04.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/winpopup/icons/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/winpopup/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/winpopup/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/winpopup/icons/Makefile.in	2005-05-23 12:09:04.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/winpopup/icons/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12459,9 +15644,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/winpopup/libwinpopup/Makefile.in kdenetwork-3.4.1/kopete/protocols/winpopup/libwinpopup/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/winpopup/libwinpopup/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/winpopup/libwinpopup/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -571,26 +574,26 @@
+ 
+ #>+ 22
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-wp_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/wp_protocol.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-wp_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/wp_protocol.png
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-wp_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/wp_protocol.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr64-app-wp_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/wp_protocol.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/cr16-app-wp_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/wp_protocol.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-wp_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/wp_protocol.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-wp_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/wp_away.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/cr128-app-wp_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/wp_protocol.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/wp_protocol.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/wp_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/wp_protocol.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/wp_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/wp_protocol.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/wp_protocol.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/wp_away.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/wp_protocol.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/winpopup/libwinpopup/Makefile.in kdenetwork-3.4.1/kopete/protocols/winpopup/libwinpopup/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/winpopup/libwinpopup/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/winpopup/libwinpopup/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -220,6 +220,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12493,9 +15711,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/winpopup/Makefile.in kdenetwork-3.4.1/kopete/protocols/winpopup/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/winpopup/Makefile.in	2005-05-23 18:09:04.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/winpopup/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/winpopup/Makefile.in kdenetwork-3.4.1/kopete/protocols/winpopup/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/winpopup/Makefile.in	2005-05-23 12:09:04.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/winpopup/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -257,6 +257,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12527,9 +15745,64 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/winpopup/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/winpopup/ui/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/winpopup/ui/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/winpopup/ui/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -939,13 +942,6 @@
+ mocs: wpaccount.moc
+ 
+ #>+ 3
+-wpcontact.moc: $(srcdir)/wpcontact.h
+-	$(MOC) $(srcdir)/wpcontact.h -o wpcontact.moc
+-
+-#>+ 2
+-mocs: wpcontact.moc
+-
+-#>+ 3
+ wpuserinfo.moc: $(srcdir)/wpuserinfo.h
+ 	$(MOC) $(srcdir)/wpuserinfo.h -o wpuserinfo.moc
+ 
+@@ -953,11 +949,11 @@
+ mocs: wpuserinfo.moc
+ 
+ #>+ 3
+-wpaddcontact.moc: $(srcdir)/wpaddcontact.h
+-	$(MOC) $(srcdir)/wpaddcontact.h -o wpaddcontact.moc
++wpcontact.moc: $(srcdir)/wpcontact.h
++	$(MOC) $(srcdir)/wpcontact.h -o wpcontact.moc
+ 
+ #>+ 2
+-mocs: wpaddcontact.moc
++mocs: wpcontact.moc
+ 
+ #>+ 3
+ wpprotocol.moc: $(srcdir)/wpprotocol.h
+@@ -967,8 +963,15 @@
+ mocs: wpprotocol.moc
+ 
+ #>+ 3
++wpaddcontact.moc: $(srcdir)/wpaddcontact.h
++	$(MOC) $(srcdir)/wpaddcontact.h -o wpaddcontact.moc
++
++#>+ 2
++mocs: wpaddcontact.moc
++
++#>+ 3
+ clean-metasources:
+-	-rm -f  wpeditaccount.moc wpaccount.moc wpcontact.moc wpuserinfo.moc wpaddcontact.moc wpprotocol.moc
++	-rm -f  wpeditaccount.moc wpaccount.moc wpuserinfo.moc wpcontact.moc wpprotocol.moc wpaddcontact.moc
+ 
+ #>+ 2
+ KDE_DIST=wpdebug.h wpuserinfo.h wpeditaccount.h winpopup-send.sh wpaddcontact.h wpprotocol.h wpaccount.h kopete_wp.desktop Makefile.in winpopup-install.sh wpcontact.h Makefile.am 
+@@ -1019,7 +1022,7 @@
+ 
+ 
+ #>+ 11
+-kopete_wp_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/wpprotocol.cpp $(srcdir)/wpcontact.cpp $(srcdir)/wpaddcontact.cpp $(srcdir)/wpeditaccount.cpp $(srcdir)/wpaccount.cpp $(srcdir)/wpuserinfo.cpp  wpeditaccount.moc wpaccount.moc wpuserinfo.moc wpcontact.moc wpprotocol.moc wpaddcontact.moc
++kopete_wp_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/wpprotocol.cpp $(srcdir)/wpcontact.cpp $(srcdir)/wpaddcontact.cpp $(srcdir)/wpeditaccount.cpp $(srcdir)/wpaccount.cpp $(srcdir)/wpuserinfo.cpp  wpeditaccount.moc wpaccount.moc wpcontact.moc wpuserinfo.moc wpaddcontact.moc wpprotocol.moc
+ 	@echo 'creating kopete_wp_la.all_cpp.cpp ...'; \
+ 	rm -f kopete_wp_la.all_cpp.files kopete_wp_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kopete_wp_la.all_cpp.final; \
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/winpopup/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/winpopup/ui/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/winpopup/ui/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/winpopup/ui/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -223,6 +223,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12561,9 +15834,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/yahoo/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/yahoo/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/yahoo/icons/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/yahoo/icons/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/yahoo/icons/Makefile.in kdenetwork-3.4.1/kopete/protocols/yahoo/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/yahoo/icons/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/yahoo/icons/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12595,9 +15868,61 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/yahoo/libyahoo2/Makefile.in kdenetwork-3.4.1/kopete/protocols/yahoo/libyahoo2/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/yahoo/libyahoo2/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/yahoo/libyahoo2/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -572,37 +575,37 @@
+ #>+ 34
+ install-kde-icons:
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions
++	$(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_mobile.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_mobile.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_idle.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_idle.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/cr16-app-yahoo_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/yahoo_protocol.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_connecting.mng $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_connecting.mng
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_tea.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_tea.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-yahoo_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/yahoo_protocol.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_idle.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_idle.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_away.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_busy.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_busy.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_tea.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_tea.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-yahoo_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/yahoo_protocol.png
++	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/cr128-app-yahoo_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/yahoo_protocol.png
+ 	$(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_invisible.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_invisible.png
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-yahoo_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/yahoo_protocol.png
+-	$(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_mobile.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_mobile.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr64-app-yahoo_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/yahoo_protocol.png
+-	$(mkinstalldirs) $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-yahoo_protocol.png $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/yahoo_protocol.png
++	$(INSTALL_DATA) $(srcdir)/cr16-action-yahoo_away.png $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_away.png
+ 
+ uninstall-kde-icons:
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_mobile.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_idle.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/yahoo_protocol.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_connecting.mng
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_tea.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/48x48/apps/yahoo_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_idle.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_away.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_busy.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_tea.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/32x32/apps/yahoo_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/yahoo_protocol.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_invisible.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/apps/yahoo_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_mobile.png
+ 	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/64x64/apps/yahoo_protocol.png
+-	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/128x128/apps/yahoo_protocol.png
++	-rm -f $(DESTDIR)$(kopeteicondir)/crystalsvg/16x16/actions/yahoo_away.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/yahoo/libyahoo2/Makefile.in kdenetwork-3.4.1/kopete/protocols/yahoo/libyahoo2/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/yahoo/libyahoo2/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/yahoo/libyahoo2/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -217,6 +217,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12629,9 +15954,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/yahoo/Makefile.in kdenetwork-3.4.1/kopete/protocols/yahoo/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/yahoo/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/yahoo/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/yahoo/Makefile.in kdenetwork-3.4.1/kopete/protocols/yahoo/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/yahoo/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/yahoo/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -255,6 +255,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12663,9 +15988,52 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kopete/protocols/yahoo/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/yahoo/ui/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/protocols/yahoo/ui/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/protocols/yahoo/ui/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+@@ -910,18 +913,18 @@
+ mocs: yahooprotocol.moc
+ 
+ #>+ 3
+-yahooconferencemessagemanager.moc: $(srcdir)/yahooconferencemessagemanager.h
+-	$(MOC) $(srcdir)/yahooconferencemessagemanager.h -o yahooconferencemessagemanager.moc
++yahooaccount.moc: $(srcdir)/yahooaccount.h
++	$(MOC) $(srcdir)/yahooaccount.h -o yahooaccount.moc
+ 
+ #>+ 2
+-mocs: yahooconferencemessagemanager.moc
++mocs: yahooaccount.moc
+ 
+ #>+ 3
+-yahooaccount.moc: $(srcdir)/yahooaccount.h
+-	$(MOC) $(srcdir)/yahooaccount.h -o yahooaccount.moc
++yahooconferencemessagemanager.moc: $(srcdir)/yahooconferencemessagemanager.h
++	$(MOC) $(srcdir)/yahooconferencemessagemanager.h -o yahooconferencemessagemanager.moc
+ 
+ #>+ 2
+-mocs: yahooaccount.moc
++mocs: yahooconferencemessagemanager.moc
+ 
+ #>+ 3
+ yahooaddcontact.moc: $(srcdir)/yahooaddcontact.h
+@@ -946,7 +949,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  yahooeditaccount.moc yahooprotocol.moc yahooconferencemessagemanager.moc yahooaccount.moc yahooaddcontact.moc yahoocontact.moc kyahoo.moc
++	-rm -f  yahooeditaccount.moc yahooprotocol.moc yahooaccount.moc yahooconferencemessagemanager.moc yahooaddcontact.moc yahoocontact.moc kyahoo.moc
+ 
+ #>+ 2
+ KDE_DIST=yahooconferencemessagemanager.h yahooaccount.h yahooprotocol.h yahoocontact.h yahooaddcontact.h yahooeditaccount.h kopete_yahoo.desktop Makefile.in kyahoo.h Makefile.am 
+@@ -997,7 +1000,7 @@
+ 
+ 
+ #>+ 11
+-kopete_yahoo_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/yahooprotocol.cpp $(srcdir)/kyahoo.cpp $(srcdir)/yahoocontact.cpp $(srcdir)/yahooaddcontact.cpp $(srcdir)/yahooaccount.cpp $(srcdir)/yahooeditaccount.cpp $(srcdir)/yahooconferencemessagemanager.cpp  yahooeditaccount.moc yahooprotocol.moc yahooaccount.moc yahooconferencemessagemanager.moc yahooaddcontact.moc kyahoo.moc yahoocontact.moc
++kopete_yahoo_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/yahooprotocol.cpp $(srcdir)/kyahoo.cpp $(srcdir)/yahoocontact.cpp $(srcdir)/yahooaddcontact.cpp $(srcdir)/yahooaccount.cpp $(srcdir)/yahooeditaccount.cpp $(srcdir)/yahooconferencemessagemanager.cpp  yahooeditaccount.moc yahooprotocol.moc yahooconferencemessagemanager.moc yahooaccount.moc yahooaddcontact.moc kyahoo.moc yahoocontact.moc
+ 	@echo 'creating kopete_yahoo_la.all_cpp.cpp ...'; \
+ 	rm -f kopete_yahoo_la.all_cpp.files kopete_yahoo_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kopete_yahoo_la.all_cpp.final; \
+diff -Nru kdenetwork-3.4.1.orig/kopete/protocols/yahoo/ui/Makefile.in kdenetwork-3.4.1/kopete/protocols/yahoo/ui/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/protocols/yahoo/ui/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/protocols/yahoo/ui/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -223,6 +223,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12697,9 +16065,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/sounds/Makefile.in kdenetwork-3.4.1/kopete/sounds/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/sounds/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/sounds/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/sounds/Makefile.in kdenetwork-3.4.1/kopete/sounds/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/sounds/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/sounds/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12731,9 +16099,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/Adium/Makefile.in kdenetwork-3.4.1/kopete/styles/data/Adium/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/Adium/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/Adium/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/Adium/Makefile.in kdenetwork-3.4.1/kopete/styles/data/Adium/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/Adium/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/Adium/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12765,9 +16133,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/blue/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/blue/From/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/blue/From/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/blue/From/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/blue/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/blue/From/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/blue/From/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/blue/From/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12799,9 +16167,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/blue/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/blue/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/blue/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/blue/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/blue/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/blue/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/blue/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/blue/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12833,9 +16201,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/blue/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/blue/To/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/blue/To/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/blue/To/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/blue/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/blue/To/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/blue/To/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/blue/To/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12867,9 +16235,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/clear/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/clear/From/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/clear/From/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/clear/From/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/clear/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/clear/From/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/clear/From/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/clear/From/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12901,9 +16269,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/clear/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/clear/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/clear/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/clear/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/clear/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/clear/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/clear/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/clear/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12935,9 +16303,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/clear/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/clear/To/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/clear/To/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/clear/To/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/clear/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/clear/To/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/clear/To/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/clear/To/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -12969,9 +16337,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/graphite/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/graphite/From/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/graphite/From/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/graphite/From/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/graphite/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/graphite/From/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/graphite/From/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/graphite/From/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13003,9 +16371,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/graphite/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/graphite/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/graphite/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/graphite/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/graphite/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/graphite/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/graphite/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/graphite/Makefile.in	2005-05-24 13:47:19.000000000 -0400
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13037,9 +16405,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/graphite/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/graphite/To/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/graphite/To/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/graphite/To/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/graphite/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/graphite/To/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/graphite/To/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/graphite/To/Makefile.in	2005-05-24 13:47:19.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13071,9 +16439,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/green/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/green/From/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/green/From/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/green/From/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/green/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/green/From/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/green/From/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/green/From/Makefile.in	2005-05-24 13:47:19.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13105,9 +16473,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/green/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/green/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/green/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/green/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/green/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/green/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/green/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/green/Makefile.in	2005-05-24 13:47:19.000000000 -0400
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13139,9 +16507,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/green/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/green/To/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/green/To/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/green/To/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/green/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/green/To/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/green/To/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/green/To/Makefile.in	2005-05-24 13:47:19.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13173,9 +16541,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13207,9 +16575,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/orange/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/orange/From/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/orange/From/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/orange/From/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/orange/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/orange/From/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/orange/From/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/orange/From/Makefile.in	2005-05-24 13:47:19.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13241,9 +16609,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/orange/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/orange/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/orange/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/orange/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/orange/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/orange/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/orange/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/orange/Makefile.in	2005-05-24 13:47:19.000000000 -0400
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13275,9 +16643,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/orange/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/orange/To/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/orange/To/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/orange/To/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/orange/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/orange/To/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/orange/To/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/orange/To/Makefile.in	2005-05-24 13:47:19.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13309,9 +16677,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/pink/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/pink/From/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/pink/From/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/pink/From/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/pink/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/pink/From/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/pink/From/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/pink/From/Makefile.in	2005-05-24 13:47:19.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13343,9 +16711,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/pink/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/pink/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/pink/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/pink/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/pink/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/pink/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/pink/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/pink/Makefile.in	2005-05-24 13:47:19.000000000 -0400
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13377,9 +16745,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/pink/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/pink/To/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/pink/To/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/pink/To/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/pink/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/pink/To/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/pink/To/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/pink/To/Makefile.in	2005-05-24 13:47:19.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13411,9 +16779,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/purple/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/purple/From/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/purple/From/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/purple/From/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/purple/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/purple/From/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/purple/From/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/purple/From/Makefile.in	2005-05-24 13:47:19.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13445,9 +16813,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/purple/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/purple/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/purple/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/purple/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/purple/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/purple/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/purple/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/purple/Makefile.in	2005-05-24 13:47:19.000000000 -0400
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13479,9 +16847,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/purple/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/purple/To/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/purple/To/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/purple/To/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/purple/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/purple/To/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/purple/To/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/purple/To/Makefile.in	2005-05-24 13:47:19.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13513,9 +16881,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/yellow/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/yellow/From/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/yellow/From/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/yellow/From/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/yellow/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/yellow/From/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/yellow/From/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/yellow/From/Makefile.in	2005-05-24 13:47:19.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13547,9 +16915,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/yellow/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/yellow/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/yellow/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/yellow/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/yellow/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/yellow/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/yellow/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/yellow/Makefile.in	2005-05-24 13:47:19.000000000 -0400
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13581,9 +16949,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat/yellow/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/yellow/To/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/yellow/To/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat/yellow/To/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat/yellow/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat/yellow/To/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat/yellow/To/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat/yellow/To/Makefile.in	2005-05-24 13:47:19.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13615,9 +16983,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/blue/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/blue/From/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/blue/From/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/blue/From/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/blue/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/blue/From/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/blue/From/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/blue/From/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13649,9 +17017,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/blue/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/blue/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/blue/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/blue/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/blue/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/blue/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/blue/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/blue/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13683,9 +17051,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/blue/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/blue/To/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/blue/To/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/blue/To/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/blue/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/blue/To/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/blue/To/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/blue/To/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13717,9 +17085,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/clear/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/clear/From/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/clear/From/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/clear/From/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/clear/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/clear/From/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/clear/From/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/clear/From/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13751,9 +17119,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/clear/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/clear/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/clear/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/clear/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/clear/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/clear/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/clear/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/clear/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13785,9 +17153,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/clear/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/clear/To/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/clear/To/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/clear/To/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/clear/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/clear/To/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/clear/To/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/clear/To/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13819,9 +17187,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/graphite/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/graphite/From/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/graphite/From/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/graphite/From/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/graphite/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/graphite/From/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/graphite/From/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/graphite/From/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13853,9 +17221,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/graphite/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/graphite/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/graphite/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/graphite/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/graphite/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/graphite/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/graphite/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/graphite/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13887,9 +17255,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/graphite/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/graphite/To/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/graphite/To/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/graphite/To/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/graphite/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/graphite/To/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/graphite/To/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/graphite/To/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13921,9 +17289,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/green/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/green/From/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/green/From/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/green/From/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/green/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/green/From/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/green/From/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/green/From/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13955,9 +17323,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/green/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/green/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/green/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/green/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/green/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/green/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/green/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/green/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -13989,9 +17357,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/green/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/green/To/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/green/To/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/green/To/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/green/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/green/To/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/green/To/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/green/To/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -14023,9 +17391,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -14057,9 +17425,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/orange/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/orange/From/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/orange/From/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/orange/From/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/orange/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/orange/From/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/orange/From/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/orange/From/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -14091,9 +17459,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/orange/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/orange/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/orange/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/orange/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/orange/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/orange/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/orange/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/orange/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -14125,9 +17493,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/orange/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/orange/To/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/orange/To/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/orange/To/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/orange/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/orange/To/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/orange/To/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/orange/To/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -14159,9 +17527,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/pink/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/pink/From/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/pink/From/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/pink/From/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/pink/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/pink/From/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/pink/From/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/pink/From/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -14193,9 +17561,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/pink/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/pink/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/pink/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/pink/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/pink/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/pink/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/pink/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/pink/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -14227,9 +17595,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/pink/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/pink/To/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/pink/To/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/pink/To/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/pink/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/pink/To/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/pink/To/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/pink/To/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -14261,9 +17629,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/purple/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/purple/From/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/purple/From/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/purple/From/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/purple/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/purple/From/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/purple/From/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/purple/From/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -14295,9 +17663,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/purple/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/purple/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/purple/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/purple/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/purple/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/purple/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/purple/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/purple/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -14329,9 +17697,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/purple/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/purple/To/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/purple/To/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/purple/To/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/purple/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/purple/To/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/purple/To/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/purple/To/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -14363,9 +17731,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/yellow/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/yellow/From/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/yellow/From/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/yellow/From/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/yellow/From/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/yellow/From/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/yellow/From/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/yellow/From/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -14397,9 +17765,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/yellow/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/yellow/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/yellow/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/yellow/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/yellow/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/yellow/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/yellow/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/yellow/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -14431,9 +17799,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/yellow/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/yellow/To/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/yellow/To/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/yellow/To/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/yellow/To/Makefile.in kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/yellow/To/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/iChat-Trans/yellow/To/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/iChat-Trans/yellow/To/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -14465,9 +17833,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/data/Makefile.in kdenetwork-3.4.1/kopete/styles/data/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/data/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/data/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/data/Makefile.in kdenetwork-3.4.1/kopete/styles/data/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/data/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/data/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -14499,9 +17867,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kopete/styles/Makefile.in kdenetwork-3.4.1/kopete/styles/Makefile.in
---- kdenetwork-3.4.1.orig/kopete/styles/Makefile.in	2005-05-23 18:09:05.000000000 +0200
-+++ kdenetwork-3.4.1/kopete/styles/Makefile.in	2005-05-24 17:07:08.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kopete/styles/Makefile.in kdenetwork-3.4.1/kopete/styles/Makefile.in
+--- kdenetwork-3.4.1.orig/kopete/styles/Makefile.in	2005-05-23 12:09:05.000000000 -0400
++++ kdenetwork-3.4.1/kopete/styles/Makefile.in	2005-05-24 13:47:18.000000000 -0400
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -14533,9 +17901,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kpf/Makefile.in kdenetwork-3.4.1/kpf/Makefile.in
---- kdenetwork-3.4.1.orig/kpf/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kpf/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kpf/Makefile.in kdenetwork-3.4.1/kpf/Makefile.in
+--- kdenetwork-3.4.1.orig/kpf/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kpf/Makefile.in	2005-05-24 13:47:19.000000000 -0400
 @@ -216,6 +216,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -14567,9 +17935,33 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kpf/src/Makefile.in kdenetwork-3.4.1/kpf/src/Makefile.in
---- kdenetwork-3.4.1.orig/kpf/src/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kpf/src/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+@@ -792,17 +795,17 @@
+ 
+ #>+ 13
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kpf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpf.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kpf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpf.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-kpf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpf.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kpf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpf.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kpf.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpf.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpf.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpf.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kpf.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kpf.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kpf.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdenetwork-3.4.1.orig/kpf/src/Makefile.in kdenetwork-3.4.1/kpf/src/Makefile.in
+--- kdenetwork-3.4.1.orig/kpf/src/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kpf/src/Makefile.in	2005-05-24 13:47:19.000000000 -0400
 @@ -263,6 +263,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -14601,9 +17993,182 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Makefile.in kdenetwork-3.4.1/kppp/DB/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/DB/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+@@ -931,13 +934,6 @@
+ 
+ 
+ #>+ 3
+-PropertiesDialogPlugin.moc: $(srcdir)/PropertiesDialogPlugin.h
+-	$(MOC) $(srcdir)/PropertiesDialogPlugin.h -o PropertiesDialogPlugin.moc
+-
+-#>+ 2
+-mocs: PropertiesDialogPlugin.moc
+-
+-#>+ 3
+ Server.moc: $(srcdir)/Server.h
+ 	$(MOC) $(srcdir)/Server.h -o Server.moc
+ 
+@@ -966,81 +962,88 @@
+ mocs: Applet.moc
+ 
+ #>+ 3
+-WebServer.moc: $(srcdir)/WebServer.h
+-	$(MOC) $(srcdir)/WebServer.h -o WebServer.moc
++ActiveMonitorWindow.moc: $(srcdir)/ActiveMonitorWindow.h
++	$(MOC) $(srcdir)/ActiveMonitorWindow.h -o ActiveMonitorWindow.moc
+ 
+ #>+ 2
+-mocs: WebServer.moc
++mocs: ActiveMonitorWindow.moc
+ 
+ #>+ 3
+-ActiveMonitorWindow.moc: $(srcdir)/ActiveMonitorWindow.h
+-	$(MOC) $(srcdir)/ActiveMonitorWindow.h -o ActiveMonitorWindow.moc
++WebServerSocket.moc: $(srcdir)/WebServerSocket.h
++	$(MOC) $(srcdir)/WebServerSocket.h -o WebServerSocket.moc
+ 
+ #>+ 2
+-mocs: ActiveMonitorWindow.moc
++mocs: WebServerSocket.moc
+ 
+ #>+ 3
+-ServerWizard.moc: $(srcdir)/ServerWizard.h
+-	$(MOC) $(srcdir)/ServerWizard.h -o ServerWizard.moc
++StartingKPFDialog.moc: $(srcdir)/StartingKPFDialog.h
++	$(MOC) $(srcdir)/StartingKPFDialog.h -o StartingKPFDialog.moc
+ 
+ #>+ 2
+-mocs: ServerWizard.moc
++mocs: StartingKPFDialog.moc
+ 
+ #>+ 3
+-WebServerSocket.moc: $(srcdir)/WebServerSocket.h
+-	$(MOC) $(srcdir)/WebServerSocket.h -o WebServerSocket.moc
++ConfigDialogPage.moc: $(srcdir)/ConfigDialogPage.h
++	$(MOC) $(srcdir)/ConfigDialogPage.h -o ConfigDialogPage.moc
+ 
+ #>+ 2
+-mocs: WebServerSocket.moc
++mocs: ConfigDialogPage.moc
+ 
+ #>+ 3
+-SingleServerConfigDialog.moc: $(srcdir)/SingleServerConfigDialog.h
+-	$(MOC) $(srcdir)/SingleServerConfigDialog.h -o SingleServerConfigDialog.moc
++BandwidthGraph.moc: $(srcdir)/BandwidthGraph.h
++	$(MOC) $(srcdir)/BandwidthGraph.h -o BandwidthGraph.moc
+ 
+ #>+ 2
+-mocs: SingleServerConfigDialog.moc
++mocs: BandwidthGraph.moc
+ 
+ #>+ 3
+-StartingKPFDialog.moc: $(srcdir)/StartingKPFDialog.h
+-	$(MOC) $(srcdir)/StartingKPFDialog.h -o StartingKPFDialog.moc
++WebServerManager.moc: $(srcdir)/WebServerManager.h
++	$(MOC) $(srcdir)/WebServerManager.h -o WebServerManager.moc
+ 
+ #>+ 2
+-mocs: StartingKPFDialog.moc
++mocs: WebServerManager.moc
+ 
+ #>+ 3
+-AppletItem.moc: $(srcdir)/AppletItem.h
+-	$(MOC) $(srcdir)/AppletItem.h -o AppletItem.moc
++PropertiesDialogPlugin.moc: $(srcdir)/PropertiesDialogPlugin.h
++	$(MOC) $(srcdir)/PropertiesDialogPlugin.h -o PropertiesDialogPlugin.moc
+ 
+ #>+ 2
+-mocs: AppletItem.moc
++mocs: PropertiesDialogPlugin.moc
+ 
+ #>+ 3
+-DirSelectWidget.moc: $(srcdir)/DirSelectWidget.h
+-	$(MOC) $(srcdir)/DirSelectWidget.h -o DirSelectWidget.moc
++WebServer.moc: $(srcdir)/WebServer.h
++	$(MOC) $(srcdir)/WebServer.h -o WebServer.moc
+ 
+ #>+ 2
+-mocs: DirSelectWidget.moc
++mocs: WebServer.moc
+ 
+ #>+ 3
+-ConfigDialogPage.moc: $(srcdir)/ConfigDialogPage.h
+-	$(MOC) $(srcdir)/ConfigDialogPage.h -o ConfigDialogPage.moc
++ServerWizard.moc: $(srcdir)/ServerWizard.h
++	$(MOC) $(srcdir)/ServerWizard.h -o ServerWizard.moc
+ 
+ #>+ 2
+-mocs: ConfigDialogPage.moc
++mocs: ServerWizard.moc
+ 
+ #>+ 3
+-BandwidthGraph.moc: $(srcdir)/BandwidthGraph.h
+-	$(MOC) $(srcdir)/BandwidthGraph.h -o BandwidthGraph.moc
++SingleServerConfigDialog.moc: $(srcdir)/SingleServerConfigDialog.h
++	$(MOC) $(srcdir)/SingleServerConfigDialog.h -o SingleServerConfigDialog.moc
+ 
+ #>+ 2
+-mocs: BandwidthGraph.moc
++mocs: SingleServerConfigDialog.moc
+ 
+ #>+ 3
+-WebServerManager.moc: $(srcdir)/WebServerManager.h
+-	$(MOC) $(srcdir)/WebServerManager.h -o WebServerManager.moc
++AppletItem.moc: $(srcdir)/AppletItem.h
++	$(MOC) $(srcdir)/AppletItem.h -o AppletItem.moc
+ 
+ #>+ 2
+-mocs: WebServerManager.moc
++mocs: AppletItem.moc
++
++#>+ 3
++DirSelectWidget.moc: $(srcdir)/DirSelectWidget.h
++	$(MOC) $(srcdir)/DirSelectWidget.h -o DirSelectWidget.moc
++
++#>+ 2
++mocs: DirSelectWidget.moc
+ 
+ #>+ 3
+ WebServerManager_stub.h: WebServerManager.kidl
+@@ -1057,7 +1060,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  PropertiesDialogPlugin.moc Server.moc ActiveMonitor.moc ErrorMessageConfigDialog.moc Applet.moc WebServer.moc ActiveMonitorWindow.moc ServerWizard.moc WebServerSocket.moc SingleServerConfigDialog.moc StartingKPFDialog.moc AppletItem.moc DirSelectWidget.moc ConfigDialogPage.moc BandwidthGraph.moc WebServerManager.moc
++	-rm -f  Server.moc ActiveMonitor.moc ErrorMessageConfigDialog.moc Applet.moc ActiveMonitorWindow.moc WebServerSocket.moc StartingKPFDialog.moc ConfigDialogPage.moc BandwidthGraph.moc WebServerManager.moc PropertiesDialogPlugin.moc WebServer.moc ServerWizard.moc SingleServerConfigDialog.moc AppletItem.moc DirSelectWidget.moc
+ 
+ #>+ 2
+ KDE_DIST=Defines.h KPFInterface.h System.h Makefile.in KPFInterface.cpp Makefile.am 
+@@ -1117,7 +1120,7 @@
+ 
+ 
+ #>+ 11
+-kpf_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/Utils.cpp $(srcdir)/DirectoryLister.cpp $(srcdir)/ByteRange.cpp $(srcdir)/DirSelectWidget.cpp $(srcdir)/PortValidator.cpp $(srcdir)/Request.cpp $(srcdir)/Response.cpp $(srcdir)/Resource.cpp $(srcdir)/RootValidator.cpp $(srcdir)/Server.cpp $(srcdir)/ServerPrivate.cpp $(srcdir)/ServerSocket.cpp $(srcdir)/WebServer.cpp $(srcdir)/WebServerSocket.cpp $(srcdir)/WebServerManager.cpp $(srcdir)/SingleServerConfigDialog.cpp $(srcdir)/System.cpp $(srcdir)/ConfigDialogPage.cpp $(srcdir)/ErrorMessageConfigDialog.cpp $(srcdir)/ActiveMonitor.cpp $(srcdir)/ActiveMonitorItem.cpp $(srcdir)/ActiveMonitorWindow.cpp $(srcdir)/BandwidthGraph.cpp $(srcdir)/ServerWizard.cpp $(srcdir)/AppletItem.cpp $(srcdir)/Applet.cpp $(srcdir)/Defaults.cpp $(srcdir)/Help.cpp WebServer_skel.cpp WebServer_stub.cpp WebServerManager_skel.cpp  Server.moc ErrorMessageConfigDialog.moc ActiveMonitor.moc Applet.moc ActiveMonitorWindow.moc WebServer.moc ServerWizard.moc SingleServerConfigDialog.moc WebServerSocket.moc AppletItem.moc ConfigDialogPage.moc DirSelectWidget.moc BandwidthGraph.moc WebServerManager.moc
++kpf_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/Utils.cpp $(srcdir)/DirectoryLister.cpp $(srcdir)/ByteRange.cpp $(srcdir)/DirSelectWidget.cpp $(srcdir)/PortValidator.cpp $(srcdir)/Request.cpp $(srcdir)/Response.cpp $(srcdir)/Resource.cpp $(srcdir)/RootValidator.cpp $(srcdir)/Server.cpp $(srcdir)/ServerPrivate.cpp $(srcdir)/ServerSocket.cpp $(srcdir)/WebServer.cpp $(srcdir)/WebServerSocket.cpp $(srcdir)/WebServerManager.cpp $(srcdir)/SingleServerConfigDialog.cpp $(srcdir)/System.cpp $(srcdir)/ConfigDialogPage.cpp $(srcdir)/ErrorMessageConfigDialog.cpp $(srcdir)/ActiveMonitor.cpp $(srcdir)/ActiveMonitorItem.cpp $(srcdir)/ActiveMonitorWindow.cpp $(srcdir)/BandwidthGraph.cpp $(srcdir)/ServerWizard.cpp $(srcdir)/AppletItem.cpp $(srcdir)/Applet.cpp $(srcdir)/Defaults.cpp $(srcdir)/Help.cpp WebServer_skel.cpp WebServer_stub.cpp WebServerManager_skel.cpp  Server.moc ErrorMessageConfigDialog.moc ActiveMonitor.moc Applet.moc ActiveMonitorWindow.moc WebServerSocket.moc ConfigDialogPage.moc BandwidthGraph.moc WebServerManager.moc WebServer.moc ServerWizard.moc SingleServerConfigDialog.moc AppletItem.moc DirSelectWidget.moc
+ 	@echo 'creating kpf_panelapplet_la.all_cpp.cpp ...'; \
+ 	rm -f kpf_panelapplet_la.all_cpp.files kpf_panelapplet_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kpf_panelapplet_la.all_cpp.final; \
+@@ -1129,7 +1132,7 @@
+ 	rm -f kpf_panelapplet_la.all_cpp.final kpf_panelapplet_la.all_cpp.files
+ 
+ #>+ 11
+-kpfpropertiesdialog_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/PropertiesDialogPlugin.cpp $(srcdir)/StartingKPFDialog.cpp $(srcdir)/Defaults.cpp $(srcdir)/Help.cpp WebServer_stub.cpp WebServerManager_stub.cpp  PropertiesDialogPlugin.moc StartingKPFDialog.moc
++kpfpropertiesdialog_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/PropertiesDialogPlugin.cpp $(srcdir)/StartingKPFDialog.cpp $(srcdir)/Defaults.cpp $(srcdir)/Help.cpp WebServer_stub.cpp WebServerManager_stub.cpp  StartingKPFDialog.moc PropertiesDialogPlugin.moc
+ 	@echo 'creating kpfpropertiesdialog_la.all_cpp.cpp ...'; \
+ 	rm -f kpfpropertiesdialog_la.all_cpp.files kpfpropertiesdialog_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kpfpropertiesdialog_la.all_cpp.final; \
+@@ -1177,8 +1180,8 @@
+ $(srcdir)/ActiveMonitorItem.cpp: WebServer_stub.h 
+ ActiveMonitor.o: ActiveMonitor.moc 
+ SingleServerConfigDialog.lo: SingleServerConfigDialog.moc 
+-BandwidthGraph.lo: BandwidthGraph.moc 
+ WebServer.o: WebServer.moc 
++BandwidthGraph.lo: BandwidthGraph.moc 
+ nmcheck-am: nmcheck
+ BandwidthGraph.o: BandwidthGraph.moc 
+ $(srcdir)/PortValidator.cpp: WebServer_stub.h 
+diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Makefile.in kdenetwork-3.4.1/kppp/DB/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/DB/Makefile.in	2005-05-24 13:47:19.000000000 -0400
 @@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -14635,9 +18200,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/Austria/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Austria/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/Austria/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/DB/Provider/Austria/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/Austria/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Austria/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/Austria/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/DB/Provider/Austria/Makefile.in	2005-05-24 13:47:19.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -14669,9 +18234,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/Belarus/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Belarus/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/Belarus/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/DB/Provider/Belarus/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/Belarus/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Belarus/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/Belarus/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/DB/Provider/Belarus/Makefile.in	2005-05-24 13:47:19.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -14703,9 +18268,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/Czech_Republic/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Czech_Republic/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/Czech_Republic/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/DB/Provider/Czech_Republic/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/Czech_Republic/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Czech_Republic/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/Czech_Republic/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/DB/Provider/Czech_Republic/Makefile.in	2005-05-24 13:47:19.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -14737,9 +18302,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/Denmark/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Denmark/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/Denmark/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/DB/Provider/Denmark/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+@@ -605,7 +608,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=HP-NET CITYNET AICOM Econnect SeverNET M-soft ARsystem Brailcom ASYS IQNET Falco_computer Nextra ProfiNet Contactel Volny INTERNET_OnLine BohemiaNet Fortech Makefile.in KPNQuest ApexNet Video_OnLine INTERNEXT Makefile.am ES-servis 
++KDE_DIST=HP-NET CITYNET AICOM Econnect SeverNET M-soft ARsystem Brailcom ASYS IQNET Falco_computer Nextra ProfiNet Contactel Volny INTERNET_OnLine BohemiaNet Fortech Makefile.in KPNQuest ApexNet Video_OnLine INTERNEXT ES-servis Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/Denmark/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Denmark/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/Denmark/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/DB/Provider/Denmark/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -14771,9 +18345,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/France/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/France/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/France/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/DB/Provider/France/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/France/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/France/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/France/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/DB/Provider/France/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -14805,9 +18379,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/Germany/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Germany/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/Germany/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/DB/Provider/Germany/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/Germany/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Germany/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/Germany/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/DB/Provider/Germany/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -14839,9 +18413,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/Ireland/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Ireland/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/Ireland/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/DB/Provider/Ireland/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/Ireland/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Ireland/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/Ireland/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/DB/Provider/Ireland/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -14873,9 +18447,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/DB/Provider/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/DB/Provider/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -14907,9 +18481,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/Netherlands/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Netherlands/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/Netherlands/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/DB/Provider/Netherlands/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/Netherlands/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Netherlands/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/Netherlands/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/DB/Provider/Netherlands/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -14941,9 +18515,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/New_Zealand/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/New_Zealand/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/New_Zealand/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/DB/Provider/New_Zealand/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+@@ -655,7 +658,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=Euronet%032anytime Euronet%032professional IAE Zon%032Gratis Cybercomm Planet%032Internet%032Standaard Interstroom Tiscali%032Compleet Wannadoo%032smartpack Wirehub Zeelandnet Luna HetNet%032Regelmatig%032Surfen Internet%032Acces%032Facilities Zon%032Inclusief Nederland.net Freeler%032basis Kabelfoon Via%032Networks Freeler%032compleet 12Move UwNet Hacom Betuwenet%032BQuality Demon%032Internet Cistron KeyAcces%032met%0323%032cijferig%032kengetal Popin Zon%0322 XS4All Wannadoo%032budget Bart FlakkeeNet Solcon ILimburg InterNLnet Plant%032Acces Internet%032Online Daxis%032Internet Cubic%032Circle Concepts%032ICT PublishNet FreeAcces IntroWeb%032met%0324-cijferig%032kengetal Avades Raketnet HCC%032NET Makefile.in KeyAcces%032met%0324%032cijferig%032kengetal Freeler%032voordelig Planet%032Internet%032Premium Wannadoo%032budget%320plus HetNet%032Basis%032Surfen Tiscali%032Gratis Support%032Net Macom Dataweb Telebyte Interbox HetNet%032Frequent%032Surfen Makefile.am Betuwenet%032BFree Energis-Ision IntroWeb%032met%0323-cijferig%032kengetal 
++KDE_DIST=Euronet%032anytime Euronet%032professional IAE Zon%032Gratis Cybercomm Interstroom Planet%032Internet%032Standaard Tiscali%032Compleet Wannadoo%032smartpack Wirehub Zeelandnet Luna HetNet%032Regelmatig%032Surfen Internet%032Acces%032Facilities Zon%032Inclusief Nederland.net Freeler%032basis Via%032Networks Kabelfoon Freeler%032compleet 12Move UwNet Hacom Betuwenet%032BQuality Demon%032Internet Cistron KeyAcces%032met%0323%032cijferig%032kengetal Popin Zon%0322 XS4All Wannadoo%032budget Bart FlakkeeNet Solcon ILimburg InterNLnet Plant%032Acces Internet%032Online Daxis%032Internet Cubic%032Circle Concepts%032ICT PublishNet FreeAcces IntroWeb%032met%0324-cijferig%032kengetal Raketnet Avades HCC%032NET Makefile.in KeyAcces%032met%0324%032cijferig%032kengetal Freeler%032voordelig Planet%032Internet%032Premium HetNet%032Basis%032Surfen Wannadoo%032budget%320plus Support%032Net Tiscali%032Gratis Dataweb Macom Telebyte Interbox HetNet%032Frequent%032Surfen Makefile.am Betuwenet%032BFree IntroWeb%032met%0323-cijferig%032kengetal Energis-Ision 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/New_Zealand/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/New_Zealand/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/New_Zealand/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/DB/Provider/New_Zealand/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -14975,9 +18558,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/Norway/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Norway/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/Norway/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/DB/Provider/Norway/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+@@ -591,7 +594,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=ihug Voyager Paradise Makefile.in XTRA OrconInternet Makefile.am 
++KDE_DIST=ihug Voyager Paradise Makefile.in OrconInternet XTRA Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/Norway/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Norway/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/Norway/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/DB/Provider/Norway/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15009,9 +18601,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/Portugal/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Portugal/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/Portugal/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/DB/Provider/Portugal/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/Portugal/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Portugal/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/Portugal/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/DB/Provider/Portugal/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15043,9 +18635,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/Slovenia/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Slovenia/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/Slovenia/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/DB/Provider/Slovenia/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/Slovenia/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Slovenia/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/Slovenia/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/DB/Provider/Slovenia/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15077,9 +18669,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/Sweden/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Sweden/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/Sweden/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/DB/Provider/Sweden/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+@@ -591,7 +594,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=MojNet Kiss Volja Makefile.in Arnes SiOL AmisNet Makefile.am 
++KDE_DIST=MojNet Kiss Volja Makefile.in Arnes AmisNet SiOL Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/Sweden/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Sweden/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/Sweden/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/DB/Provider/Sweden/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15111,9 +18712,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/Switzerland/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Switzerland/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/Switzerland/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/DB/Provider/Switzerland/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/Switzerland/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Switzerland/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/Switzerland/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/DB/Provider/Switzerland/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15145,9 +18746,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/Taiwan/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Taiwan/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/Taiwan/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/DB/Provider/Taiwan/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/Taiwan/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Taiwan/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/Taiwan/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/DB/Provider/Taiwan/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15179,9 +18780,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/Ukraine/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Ukraine/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/Ukraine/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/DB/Provider/Ukraine/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/Ukraine/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Ukraine/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/Ukraine/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/DB/Provider/Ukraine/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15213,9 +18814,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/United_Kingdom/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/United_Kingdom/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/United_Kingdom/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/DB/Provider/United_Kingdom/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/United_Kingdom/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/United_Kingdom/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/United_Kingdom/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/DB/Provider/United_Kingdom/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15247,9 +18848,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/DB/Provider/Yugoslavia/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Yugoslavia/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/DB/Provider/Yugoslavia/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/DB/Provider/Yugoslavia/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/DB/Provider/Yugoslavia/Makefile.in kdenetwork-3.4.1/kppp/DB/Provider/Yugoslavia/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/DB/Provider/Yugoslavia/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/DB/Provider/Yugoslavia/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15281,9 +18882,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/icons/Makefile.in kdenetwork-3.4.1/kppp/icons/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/icons/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/icons/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -600,7 +603,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=TippNet CG.BijeloPolje.CG.yu CG.Budva.yu CG.Podgorica.yu CG.yu DrenikNet EUnetPristina CG.Bar.yu EUnetS SuOnline BeoTelNet CG.Berane.yu CG.Ulcinj.yu InfoSKY EUnet@Lite EUnet@Full YUBCnet EUnetKragujevac CG.Cetinje.yu EUnetNoviSad CG.Tivat.yu CG.Kotor.yu EUnetBeograd CG.Niksic.yu VeratNet PTT Makefile.in CG.HercegNovi.yu EUnetSombor 041Net SCnet EUnetSubotica Makefile.am Sezampro EUnetCacak CG.Pljevlja.yu EUnetNis 
++KDE_DIST=TippNet CG.BijeloPolje.CG.yu CG.Budva.yu CG.Podgorica.yu CG.yu DrenikNet EUnetPristina CG.Bar.yu EUnetS SuOnline BeoTelNet CG.Berane.yu CG.Ulcinj.yu InfoSKY EUnet@Lite EUnet@Full YUBCnet EUnetKragujevac CG.Cetinje.yu EUnetNoviSad CG.Tivat.yu CG.Kotor.yu EUnetBeograd VeratNet CG.Niksic.yu PTT Makefile.in CG.HercegNovi.yu 041Net EUnetSombor SCnet EUnetSubotica Sezampro Makefile.am EUnetCacak EUnetNis CG.Pljevlja.yu 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdenetwork-3.4.1.orig/kppp/icons/Makefile.in kdenetwork-3.4.1/kppp/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/icons/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/icons/Makefile.in	2005-05-24 13:47:22.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15315,9 +18925,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/logview/Makefile.in kdenetwork-3.4.1/kppp/logview/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/logview/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/logview/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -570,23 +573,23 @@
+ 
+ #>+ 19
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kppp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kppp.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/cr48-app-kppp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kppp.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-kppp.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kppp.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+-	$(INSTALL_DATA) $(srcdir)/cr64-app-kppp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kppp.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr128-app-kppp.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kppp.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-kppp.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kppp.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
++	$(INSTALL_DATA) $(srcdir)/cr64-app-kppp.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kppp.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kppp.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kppp.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kppp.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kppp.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kppp.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kppp.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kppp.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kppp.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kppp.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kppp.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdenetwork-3.4.1.orig/kppp/logview/Makefile.in kdenetwork-3.4.1/kppp/logview/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/logview/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/logview/Makefile.in	2005-05-24 13:47:22.000000000 -0400
 @@ -254,6 +254,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15349,9 +18992,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Makefile.in kdenetwork-3.4.1/kppp/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Makefile.in kdenetwork-3.4.1/kppp/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -277,6 +277,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15383,9 +19026,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kppp/pixmaps/Makefile.in kdenetwork-3.4.1/kppp/pixmaps/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/pixmaps/Makefile.in	2005-05-23 18:09:07.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/pixmaps/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/pixmaps/Makefile.in kdenetwork-3.4.1/kppp/pixmaps/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/pixmaps/Makefile.in	2005-05-23 12:09:07.000000000 -0400
++++ kdenetwork-3.4.1/kppp/pixmaps/Makefile.in	2005-05-24 13:47:22.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15417,9 +19060,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Argentina/Makefile.in kdenetwork-3.4.1/kppp/Rules/Argentina/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Argentina/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Argentina/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Argentina/Makefile.in kdenetwork-3.4.1/kppp/Rules/Argentina/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Argentina/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Argentina/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15451,9 +19094,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Australia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Australia/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Australia/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Australia/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Australia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Australia/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Australia/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Australia/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15485,9 +19128,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Austria/Business_1/Makefile.in kdenetwork-3.4.1/kppp/Rules/Austria/Business_1/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Austria/Business_1/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Austria/Business_1/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Austria/Business_1/Makefile.in kdenetwork-3.4.1/kppp/Rules/Austria/Business_1/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Austria/Business_1/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Austria/Business_1/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15519,9 +19162,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Austria/Business_2/Makefile.in kdenetwork-3.4.1/kppp/Rules/Austria/Business_2/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Austria/Business_2/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Austria/Business_2/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Austria/Business_2/Makefile.in kdenetwork-3.4.1/kppp/Rules/Austria/Business_2/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Austria/Business_2/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Austria/Business_2/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15553,9 +19196,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Austria/Makefile.in kdenetwork-3.4.1/kppp/Rules/Austria/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Austria/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Austria/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Austria/Makefile.in kdenetwork-3.4.1/kppp/Rules/Austria/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Austria/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Austria/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15587,9 +19230,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Austria/Minimum/Makefile.in kdenetwork-3.4.1/kppp/Rules/Austria/Minimum/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Austria/Minimum/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Austria/Minimum/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Austria/Minimum/Makefile.in kdenetwork-3.4.1/kppp/Rules/Austria/Minimum/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Austria/Minimum/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Austria/Minimum/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15621,9 +19264,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Austria/Standard/Makefile.in kdenetwork-3.4.1/kppp/Rules/Austria/Standard/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Austria/Standard/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Austria/Standard/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Austria/Standard/Makefile.in kdenetwork-3.4.1/kppp/Rules/Austria/Standard/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Austria/Standard/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Austria/Standard/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15655,9 +19298,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Bangladesh/Makefile.in kdenetwork-3.4.1/kppp/Rules/Bangladesh/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Bangladesh/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Bangladesh/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Bangladesh/Makefile.in kdenetwork-3.4.1/kppp/Rules/Bangladesh/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Bangladesh/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Bangladesh/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15689,9 +19332,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Belgium/Makefile.in kdenetwork-3.4.1/kppp/Rules/Belgium/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Belgium/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Belgium/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Belgium/Makefile.in kdenetwork-3.4.1/kppp/Rules/Belgium/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Belgium/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Belgium/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15723,9 +19366,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Bosnia_and_Herzegovina/Makefile.in kdenetwork-3.4.1/kppp/Rules/Bosnia_and_Herzegovina/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Bosnia_and_Herzegovina/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Bosnia_and_Herzegovina/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Bosnia_and_Herzegovina/Makefile.in kdenetwork-3.4.1/kppp/Rules/Bosnia_and_Herzegovina/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Bosnia_and_Herzegovina/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Bosnia_and_Herzegovina/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15757,9 +19400,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Brasil/Makefile.in kdenetwork-3.4.1/kppp/Rules/Brasil/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Brasil/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Brasil/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Brasil/Makefile.in kdenetwork-3.4.1/kppp/Rules/Brasil/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Brasil/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Brasil/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15791,9 +19434,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Croatia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Croatia/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Croatia/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Croatia/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Croatia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Croatia/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Croatia/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Croatia/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15825,9 +19468,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Czechia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Czechia/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Czechia/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Czechia/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Czechia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Czechia/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Czechia/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Czechia/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15859,9 +19502,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Denmark/Makefile.in kdenetwork-3.4.1/kppp/Rules/Denmark/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Denmark/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Denmark/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+@@ -596,7 +599,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=Czech_Telecom_Internet_2004_telefon_a_Internet_90_+_300.rst Czech_Telecom_Internet_2004_telefon_universal.rst Makefile.in Czech_Telecom_Internet_2004_Home_Internet.rst Czech_Telecom_Internet_2004_Business_Internet.rst Czech_Telecom_Internet_2004_telefon_a_Internet_180_+_660.rst Makefile.am 
++KDE_DIST=Czech_Telecom_Internet_2004_telefon_a_Internet_90_+_300.rst Czech_Telecom_Internet_2004_telefon_universal.rst Makefile.in Czech_Telecom_Internet_2004_Home_Internet.rst Czech_Telecom_Internet_2004_Business_Internet.rst Makefile.am Czech_Telecom_Internet_2004_telefon_a_Internet_180_+_660.rst 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Denmark/Makefile.in kdenetwork-3.4.1/kppp/Rules/Denmark/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Denmark/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Denmark/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15893,9 +19545,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Estonia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Estonia/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Estonia/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Estonia/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+@@ -597,7 +600,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=Worldonline-ISDN.rst 12Move_ISDN.rst Get2net_Gratis.rst 12Move_Analog.rst Worldonline-Analog.rst Teledanmark_Basis.rst Cybercity_Friabonnement.rst Mobilix_Wanadoo.rst Makefile.in Teledanmark_Favoritinternet.rst Get2net_Betaling.rst Makefile.am 
++KDE_DIST=Worldonline-ISDN.rst 12Move_ISDN.rst Get2net_Gratis.rst 12Move_Analog.rst Worldonline-Analog.rst Teledanmark_Basis.rst Cybercity_Friabonnement.rst Mobilix_Wanadoo.rst Teledanmark_Favoritinternet.rst Makefile.in Get2net_Betaling.rst Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Estonia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Estonia/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Estonia/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Estonia/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15927,9 +19588,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Finland/Makefile.in kdenetwork-3.4.1/kppp/Rules/Finland/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Finland/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Finland/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Finland/Makefile.in kdenetwork-3.4.1/kppp/Rules/Finland/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Finland/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Finland/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15961,9 +19622,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/France/Makefile.in kdenetwork-3.4.1/kppp/Rules/France/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/France/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/France/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/France/Makefile.in kdenetwork-3.4.1/kppp/Rules/France/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/France/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/France/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -15995,9 +19656,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Germany/Makefile.in kdenetwork-3.4.1/kppp/Rules/Germany/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Germany/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Germany/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Germany/Makefile.in kdenetwork-3.4.1/kppp/Rules/Germany/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Germany/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Germany/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -16029,9 +19690,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Greece/Makefile.in kdenetwork-3.4.1/kppp/Rules/Greece/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Greece/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Greece/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+@@ -620,7 +623,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=Nikoma_Study_and_Surf.rst Nikoma.rst 1und1_InternetZugang.rst Freenet_StandardTarif.rst Freenet_Enterprise.rst Mobilcom_Freenet.rst E-Plus-Online_Jedermann.rst Freenet_special_call_by_call.rst AddCom_by_Call.rst CallOkaynet.rst vossnet_fun_light.rst Puretec.rst Callino_Surf_Basic.rst Freenet_Super_CbC.rst 2.5min.rst vossnet_fun.rst vossnet_kompl.rst talkline_by_call.rst knUUt-by-Call.rst Planet-Interkom_Internet_by_call.rst Callisa_City.rst Netcom_Kassel.rst MSN.rst Nikoma_Internet_by_Call.rst expressnet.rst 2.5s.rst VR-Web.rst Freenet_Sorglos.rst Arcor_Internet_by_Call_easy.rst Addcom.rst Makefile.in NGI_Call_By_Call.rst CompuservePro.rst Cityweb.rst City_Activ_Plus_Option.rst Telekom_City_Select_5_30.rst Easynet_easy-call.rst Makefile.am Callino_Surf_Plus.rst 
++KDE_DIST=Nikoma_Study_and_Surf.rst Nikoma.rst 1und1_InternetZugang.rst Freenet_StandardTarif.rst Freenet_Enterprise.rst Mobilcom_Freenet.rst E-Plus-Online_Jedermann.rst Freenet_special_call_by_call.rst AddCom_by_Call.rst CallOkaynet.rst vossnet_fun_light.rst Puretec.rst Callino_Surf_Basic.rst Freenet_Super_CbC.rst 2.5min.rst vossnet_fun.rst vossnet_kompl.rst talkline_by_call.rst knUUt-by-Call.rst Planet-Interkom_Internet_by_call.rst Netcom_Kassel.rst Callisa_City.rst MSN.rst Nikoma_Internet_by_Call.rst expressnet.rst 2.5s.rst VR-Web.rst Freenet_Sorglos.rst Arcor_Internet_by_Call_easy.rst Addcom.rst Makefile.in NGI_Call_By_Call.rst CompuservePro.rst Cityweb.rst City_Activ_Plus_Option.rst Telekom_City_Select_5_30.rst Easynet_easy-call.rst Makefile.am Callino_Surf_Plus.rst 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Greece/Makefile.in kdenetwork-3.4.1/kppp/Rules/Greece/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Greece/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Greece/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -16063,9 +19733,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/HongKong/Makefile.in kdenetwork-3.4.1/kppp/Rules/HongKong/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/HongKong/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/HongKong/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/HongKong/Makefile.in kdenetwork-3.4.1/kppp/Rules/HongKong/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/HongKong/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/HongKong/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -16097,9 +19767,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Hungary/Makefile.in kdenetwork-3.4.1/kppp/Rules/Hungary/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Hungary/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Hungary/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Hungary/Makefile.in kdenetwork-3.4.1/kppp/Rules/Hungary/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Hungary/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Hungary/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -16131,9 +19801,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Iceland/Makefile.in kdenetwork-3.4.1/kppp/Rules/Iceland/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Iceland/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Iceland/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Iceland/Makefile.in kdenetwork-3.4.1/kppp/Rules/Iceland/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Iceland/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Iceland/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -16165,9 +19835,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/India/Makefile.in kdenetwork-3.4.1/kppp/Rules/India/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/India/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/India/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+@@ -591,7 +594,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=Makefile.in Makefile.am Iceland_general.rst 
++KDE_DIST=Makefile.in Iceland_general.rst Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/India/Makefile.in kdenetwork-3.4.1/kppp/Rules/India/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/India/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/India/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -16199,9 +19878,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Indonesia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Indonesia/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Indonesia/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Indonesia/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Indonesia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Indonesia/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Indonesia/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Indonesia/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -16233,9 +19912,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Ireland/Makefile.in kdenetwork-3.4.1/kppp/Rules/Ireland/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Ireland/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Ireland/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+@@ -594,7 +597,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=Lokal_1_Metropolitan.rst Makefile.in Lokal_2_Metropolitan.rst Makefile.am Lokal_non_metropolitan.rst 
++KDE_DIST=Lokal_1_Metropolitan.rst Makefile.in Lokal_2_Metropolitan.rst Lokal_non_metropolitan.rst Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Ireland/Makefile.in kdenetwork-3.4.1/kppp/Rules/Ireland/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Ireland/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Ireland/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -16267,9 +19955,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Israel/Makefile.in kdenetwork-3.4.1/kppp/Rules/Israel/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Israel/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Israel/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Israel/Makefile.in kdenetwork-3.4.1/kppp/Rules/Israel/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Israel/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Israel/Makefile.in	2005-05-24 13:47:20.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -16301,9 +19989,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Italy/Makefile.in kdenetwork-3.4.1/kppp/Rules/Italy/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Italy/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Italy/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Italy/Makefile.in kdenetwork-3.4.1/kppp/Rules/Italy/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Italy/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Italy/Makefile.in	2005-05-24 13:47:21.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -16335,9 +20023,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Jamaica/Makefile.in kdenetwork-3.4.1/kppp/Rules/Jamaica/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Jamaica/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Jamaica/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+@@ -619,7 +622,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=Wind_Family+SuperLight_Internet_InWind.rst Wind_Family_Interurbane.rst Wind_Family_Internet_AltriISP.rst Wind_Family_Internet_InWind.rst Infostrada_Reg_Naz_Base.rst Wind_Urbana_1088_Light.rst Tele2_Altri_ISP.rst Wind_24ore_Urbane.rst Infostrada_Loc_Reg_Naz_SpZero.rst Tele2_Internet_Tele2.rst Infostrada_Internet_SpZero.rst Wind_Flat_Internet_InWind.rst Wind_24ore_Interurbane.rst Infostrada_Libero1055_Base.rst Telecom_Locali.rst Telecom_Interurbane_Oltre15Km.rst Teleconomy24_Nazionali.rst Wind_Family_Urbane.rst Atlanet.rst Makefile.in Teleconomy_NoStop_Internet.rst Telecom_Interurbane_Fino15Km.rst Teleconomy24_Internet.rst Wind_Family+SuperLight_Urbane_Interurbane.rst Wind_24ore_Internet_AltriISP.rst Tiscali_Urbane.rst Wind_Flat_Internet_AltriISP.rst Infostrada_Locali_Base.rst Wind_24ore_Internet_InWind.rst Makefile.am Infostrada_Libero1055_SpZero.rst 
++KDE_DIST=Wind_Family+SuperLight_Internet_InWind.rst Wind_Family_Internet_AltriISP.rst Wind_Family_Interurbane.rst Wind_Family_Internet_InWind.rst Infostrada_Reg_Naz_Base.rst Wind_Urbana_1088_Light.rst Tele2_Altri_ISP.rst Wind_24ore_Urbane.rst Infostrada_Loc_Reg_Naz_SpZero.rst Tele2_Internet_Tele2.rst Infostrada_Internet_SpZero.rst Wind_Flat_Internet_InWind.rst Wind_24ore_Interurbane.rst Infostrada_Libero1055_Base.rst Telecom_Locali.rst Telecom_Interurbane_Oltre15Km.rst Teleconomy24_Nazionali.rst Wind_Family_Urbane.rst Atlanet.rst Makefile.in Teleconomy_NoStop_Internet.rst Telecom_Interurbane_Fino15Km.rst Teleconomy24_Internet.rst Wind_Family+SuperLight_Urbane_Interurbane.rst Tiscali_Urbane.rst Wind_24ore_Internet_AltriISP.rst Wind_Flat_Internet_AltriISP.rst Infostrada_Locali_Base.rst Wind_24ore_Internet_InWind.rst Makefile.am Infostrada_Libero1055_SpZero.rst 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Jamaica/Makefile.in kdenetwork-3.4.1/kppp/Rules/Jamaica/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Jamaica/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Jamaica/Makefile.in	2005-05-24 13:47:21.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -16369,9 +20066,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Japan/Makefile.in kdenetwork-3.4.1/kppp/Rules/Japan/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Japan/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Japan/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Japan/Makefile.in kdenetwork-3.4.1/kppp/Rules/Japan/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Japan/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Japan/Makefile.in	2005-05-24 13:47:21.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -16403,9 +20100,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Kazakhstan/Makefile.in kdenetwork-3.4.1/kppp/Rules/Kazakhstan/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Kazakhstan/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Kazakhstan/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Kazakhstan/Makefile.in kdenetwork-3.4.1/kppp/Rules/Kazakhstan/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Kazakhstan/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Kazakhstan/Makefile.in	2005-05-24 13:47:21.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -16437,9 +20134,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Luxembourg/Makefile.in kdenetwork-3.4.1/kppp/Rules/Luxembourg/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Luxembourg/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Luxembourg/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Luxembourg/Makefile.in kdenetwork-3.4.1/kppp/Rules/Luxembourg/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Luxembourg/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Luxembourg/Makefile.in	2005-05-24 13:47:21.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -16471,9 +20168,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Macedonia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Macedonia/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Macedonia/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Macedonia/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Macedonia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Macedonia/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Macedonia/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Macedonia/Makefile.in	2005-05-24 13:47:21.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -16505,9 +20202,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Makefile.in kdenetwork-3.4.1/kppp/Rules/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Makefile.in kdenetwork-3.4.1/kppp/Rules/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Makefile.in	2005-05-24 13:47:21.000000000 -0400
 @@ -217,6 +217,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -16518,6 +20215,15 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
+@@ -405,7 +408,7 @@
+ xdg_menudir = @xdg_menudir@
+ #>- SUBDIRS = $(AUTODIRS)
+ #>+ 1
+-SUBDIRS =. Macedonia Slovenia SouthAfrika Denmark Italy Croatia Yugoslavia India Jamaica Australia Sweden Bangladesh Portugal France Ukraine Bosnia_and_Herzegovina Kazakhstan Iceland Malaysia Germany Switzerland Austria Spain Finland Brasil Hungary Poland Norway Israel Turkey Belgium Romania Singapore Luxembourg Japan Greece United_Kingdom Uruguay Estonia Czechia Russia Netherlands Argentina SouthAfrica Indonesia Slovakia HongKong Ireland
++SUBDIRS =. Luxembourg Brasil Uruguay Malaysia France Iceland Greece Belgium Japan India Italy Portugal Spain Israel Switzerland HongKong Austria Norway Hungary Poland Jamaica Netherlands Russia Sweden Turkey Bangladesh Ireland Australia Indonesia Denmark Slovakia Slovenia Croatia Singapore Bosnia_and_Herzegovina Czechia Macedonia Romania Argentina Yugoslavia United_Kingdom Estonia Finland Germany SouthAfrica SouthAfrika Kazakhstan Ukraine
+ pkg_DATA = TEMPLATE
+ pkg_SCRIPTS = checkrules
+ pkgdir = $(kde_datadir)/kppp/Rules
 @@ -415,7 +418,7 @@
  all: docs-am  all-recursive
  
@@ -16539,9 +20245,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-pkgSCRIPTS: $(pkg_SCRIPTS)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Malaysia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Malaysia/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Malaysia/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Malaysia/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Malaysia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Malaysia/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Malaysia/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Malaysia/Makefile.in	2005-05-24 13:47:21.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -16573,9 +20279,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Netherlands/Makefile.in kdenetwork-3.4.1/kppp/Rules/Netherlands/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Netherlands/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Netherlands/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Netherlands/Makefile.in kdenetwork-3.4.1/kppp/Rules/Netherlands/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Netherlands/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Netherlands/Makefile.in	2005-05-24 13:47:21.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -16607,9 +20313,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Norway/Makefile.in kdenetwork-3.4.1/kppp/Rules/Norway/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Norway/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Norway/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+@@ -620,7 +623,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=Freeler_Basis.rst Tele2_Preselect_Regio.rst Tele2_Toets_1609_Buiten_Regio.rst Tele2_Extra_Regio.rst Wannadoo_Budget_Plus Planet_Internet.rst BelPlus_Regio.rst BelBasis_Regio_Nummervoordeel.rst BelBudget_Regio.rst 12Move.rst BelPlus_Regio_Nummervoordeel.rst Cistron BelBasis_Buiten_Regio_Nummervoordeel.rst BelPlus_Buiten_Regio_Nummervoordeel.rst BelBasis_Regio.rst OneTel_Spaarstand_Regio.rst OneTel_Toets_1658_Regio.rst Tele2_Preselect_Buiten_Regio.rst InterNLnet.rst Priority_Telecom_Regionaal.rst BelPlus_Buiten_Regio.rst Freeler_Voordelig.rst Tele2_Toets_1609_Regio.rst Priority_Telecom_Nationaal.rst OneTel_Spaarstand_Buiten_Regio.rst BelBudget_Buiten_Regio.rst BelBasis_Buiten_Regio.rst OneTel_Toets_1658_Buiten_Regio.rst Makefile.in Tele2_Extra_Buiten_Regio.rst HetNet_Regelmatig_Surfen.rst Makefile.am 
++KDE_DIST=Freeler_Basis.rst Tele2_Preselect_Regio.rst Tele2_Toets_1609_Buiten_Regio.rst Tele2_Extra_Regio.rst Wannadoo_Budget_Plus Planet_Internet.rst BelPlus_Regio.rst BelBasis_Regio_Nummervoordeel.rst BelBudget_Regio.rst 12Move.rst BelPlus_Regio_Nummervoordeel.rst Cistron BelBasis_Regio.rst BelBasis_Buiten_Regio_Nummervoordeel.rst BelPlus_Buiten_Regio_Nummervoordeel.rst OneTel_Spaarstand_Regio.rst OneTel_Toets_1658_Regio.rst Tele2_Preselect_Buiten_Regio.rst InterNLnet.rst Priority_Telecom_Regionaal.rst BelPlus_Buiten_Regio.rst Freeler_Voordelig.rst Tele2_Toets_1609_Regio.rst Priority_Telecom_Nationaal.rst OneTel_Spaarstand_Buiten_Regio.rst BelBudget_Buiten_Regio.rst BelBasis_Buiten_Regio.rst OneTel_Toets_1658_Buiten_Regio.rst Makefile.in Tele2_Extra_Buiten_Regio.rst HetNet_Regelmatig_Surfen.rst Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Norway/Makefile.in kdenetwork-3.4.1/kppp/Rules/Norway/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Norway/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Norway/Makefile.in	2005-05-24 13:47:21.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -16641,9 +20356,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Poland/Makefile.in kdenetwork-3.4.1/kppp/Rules/Poland/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Poland/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Poland/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Poland/Makefile.in kdenetwork-3.4.1/kppp/Rules/Poland/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Poland/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Poland/Makefile.in	2005-05-24 13:47:21.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -16675,9 +20390,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Portugal/Makefile.in kdenetwork-3.4.1/kppp/Rules/Portugal/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Portugal/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Portugal/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Portugal/Makefile.in kdenetwork-3.4.1/kppp/Rules/Portugal/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Portugal/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Portugal/Makefile.in	2005-05-24 13:47:21.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -16709,9 +20424,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Romania/Makefile.in kdenetwork-3.4.1/kppp/Rules/Romania/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Romania/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Romania/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Romania/Makefile.in kdenetwork-3.4.1/kppp/Rules/Romania/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Romania/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Romania/Makefile.in	2005-05-24 13:47:21.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -16743,9 +20458,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Russia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Russia/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Russia/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Russia/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+@@ -596,7 +599,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=Romtelecom_Interjudetean.rst Easynet.rst Romtelecom_Local.rst ClickNet.rst RomTelecom_GSM.rst Romtelecom_Acces_Special_Internet.rst Zapp-Mobile.rst Makefile.in Makefile.am 
++KDE_DIST=Romtelecom_Interjudetean.rst Easynet.rst ClickNet.rst Romtelecom_Local.rst RomTelecom_GSM.rst Romtelecom_Acces_Special_Internet.rst Zapp-Mobile.rst Makefile.in Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Russia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Russia/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Russia/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Russia/Makefile.in	2005-05-24 13:47:21.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -16777,9 +20501,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Singapore/Makefile.in kdenetwork-3.4.1/kppp/Rules/Singapore/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Singapore/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Singapore/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Singapore/Makefile.in kdenetwork-3.4.1/kppp/Rules/Singapore/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Singapore/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Singapore/Makefile.in	2005-05-24 13:47:21.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -16811,9 +20535,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Slovakia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Slovakia/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Slovakia/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Slovakia/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Slovakia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Slovakia/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Slovakia/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Slovakia/Makefile.in	2005-05-24 13:47:21.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -16845,9 +20569,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Slovenia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Slovenia/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Slovenia/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Slovenia/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Slovenia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Slovenia/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Slovenia/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Slovenia/Makefile.in	2005-05-24 13:47:21.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -16879,9 +20603,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/SouthAfrica/Makefile.in kdenetwork-3.4.1/kppp/Rules/SouthAfrica/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/SouthAfrica/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/SouthAfrica/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/SouthAfrica/Makefile.in kdenetwork-3.4.1/kppp/Rules/SouthAfrica/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/SouthAfrica/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/SouthAfrica/Makefile.in	2005-05-24 13:47:21.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -16913,9 +20637,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/SouthAfrika/Makefile.in kdenetwork-3.4.1/kppp/Rules/SouthAfrika/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/SouthAfrika/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/SouthAfrika/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/SouthAfrika/Makefile.in kdenetwork-3.4.1/kppp/Rules/SouthAfrika/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/SouthAfrika/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/SouthAfrika/Makefile.in	2005-05-24 13:47:21.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -16947,9 +20671,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Spain/Makefile.in kdenetwork-3.4.1/kppp/Rules/Spain/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Spain/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Spain/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Spain/Makefile.in kdenetwork-3.4.1/kppp/Rules/Spain/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Spain/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Spain/Makefile.in	2005-05-24 13:47:21.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -16981,9 +20705,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Sweden/Makefile.in kdenetwork-3.4.1/kppp/Rules/Sweden/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Sweden/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Sweden/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+@@ -596,7 +599,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=Infovia.rst Telefonica_Metropolitana_IVA.rst Telefonica_Interprovincial_IVA.rst Telefonica_Local.rst Telefonica_Provincial.rst Telefonica_Nacional.rst Telefonica_Interprovincial.rst Infovia_IVA.rst Makefile.in Telefonica_Metropolitana.rst Telefonica_Provincial_IVA.rst Makefile.am 
++KDE_DIST=Infovia.rst Telefonica_Metropolitana_IVA.rst Telefonica_Local.rst Telefonica_Interprovincial_IVA.rst Telefonica_Provincial.rst Telefonica_Nacional.rst Telefonica_Interprovincial.rst Infovia_IVA.rst Makefile.in Telefonica_Metropolitana.rst Telefonica_Provincial_IVA.rst Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Sweden/Makefile.in kdenetwork-3.4.1/kppp/Rules/Sweden/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Sweden/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Sweden/Makefile.in	2005-05-24 13:47:21.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -17015,9 +20748,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Switzerland/Makefile.in kdenetwork-3.4.1/kppp/Rules/Switzerland/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Switzerland/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Switzerland/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+@@ -599,7 +602,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=RSLCom.rst Vattenfall.rst Tele8.rst Telitel.rst Glocalnet.rst ACN.rst Telia.rst Telenordia.rst Tele1_Europe.rst Crossnet-Affinity.rst Gts.rst Tiscali.rst Utfors.rst Nemtel.rst Supertel.rst Rix_Telecom.rst Telerian.rst Telia_Telebonus1.rst Transnet.rst CNEAB-Route66.rst Svensk_Telekom.rst Abonnera_com.rst Makefile.in Plusenergi.rst Home_se.rst Teleman.rst Universal_Telecom.rst Makefile.am Telia_Telebonus2.rst Tele2.rst 
++KDE_DIST=RSLCom.rst Vattenfall.rst Tele8.rst Telitel.rst Glocalnet.rst ACN.rst Telia.rst Telenordia.rst Tele1_Europe.rst Crossnet-Affinity.rst Gts.rst Tiscali.rst Utfors.rst Nemtel.rst Supertel.rst Rix_Telecom.rst Telerian.rst Telia_Telebonus1.rst Transnet.rst CNEAB-Route66.rst Svensk_Telekom.rst Abonnera_com.rst Makefile.in Plusenergi.rst Home_se.rst Teleman.rst Universal_Telecom.rst Telia_Telebonus2.rst Makefile.am Tele2.rst 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Switzerland/Makefile.in kdenetwork-3.4.1/kppp/Rules/Switzerland/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Switzerland/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Switzerland/Makefile.in	2005-05-24 13:47:21.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -17049,9 +20791,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Turkey/Makefile.in kdenetwork-3.4.1/kppp/Rules/Turkey/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Turkey/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Turkey/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Turkey/Makefile.in kdenetwork-3.4.1/kppp/Rules/Turkey/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Turkey/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Turkey/Makefile.in	2005-05-24 13:47:21.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -17083,9 +20825,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Ukraine/Makefile.in kdenetwork-3.4.1/kppp/Rules/Ukraine/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Ukraine/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Ukraine/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Ukraine/Makefile.in kdenetwork-3.4.1/kppp/Rules/Ukraine/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Ukraine/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Ukraine/Makefile.in	2005-05-24 13:47:21.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -17117,9 +20859,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/United_Kingdom/Makefile.in kdenetwork-3.4.1/kppp/Rules/United_Kingdom/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/United_Kingdom/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/United_Kingdom/Makefile.in	2005-05-24 17:07:09.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/United_Kingdom/Makefile.in kdenetwork-3.4.1/kppp/Rules/United_Kingdom/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/United_Kingdom/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/United_Kingdom/Makefile.in	2005-05-24 13:47:21.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -17151,9 +20893,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Uruguay/Makefile.in kdenetwork-3.4.1/kppp/Rules/Uruguay/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Uruguay/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Uruguay/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Uruguay/Makefile.in kdenetwork-3.4.1/kppp/Rules/Uruguay/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Uruguay/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Uruguay/Makefile.in	2005-05-24 13:47:21.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -17185,9 +20927,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/kppp/Rules/Yugoslavia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Yugoslavia/Makefile.in
---- kdenetwork-3.4.1.orig/kppp/Rules/Yugoslavia/Makefile.in	2005-05-23 18:09:06.000000000 +0200
-+++ kdenetwork-3.4.1/kppp/Rules/Yugoslavia/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/kppp/Rules/Yugoslavia/Makefile.in kdenetwork-3.4.1/kppp/Rules/Yugoslavia/Makefile.in
+--- kdenetwork-3.4.1.orig/kppp/Rules/Yugoslavia/Makefile.in	2005-05-23 12:09:06.000000000 -0400
++++ kdenetwork-3.4.1/kppp/Rules/Yugoslavia/Makefile.in	2005-05-24 13:47:22.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -17219,9 +20961,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/krdc/Makefile.in kdenetwork-3.4.1/krdc/Makefile.in
---- kdenetwork-3.4.1.orig/krdc/Makefile.in	2005-05-23 18:09:07.000000000 +0200
-+++ kdenetwork-3.4.1/krdc/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -595,7 +598,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=041_1xx_xxx.rst I_zona-ista_mreza.rst 041_9xx_xxx.rst Lokalni_poziv.rst 041_2xx_xxx.rst 041_5xx_xxx.rst III_zona-preko_200km.rst II_zona-do_200km.rst Makefile.in 041_3xx_xxx.rst 041_4xx_xxx.rst Makefile.am 
++KDE_DIST=041_1xx_xxx.rst I_zona-ista_mreza.rst Lokalni_poziv.rst 041_9xx_xxx.rst 041_2xx_xxx.rst 041_5xx_xxx.rst III_zona-preko_200km.rst II_zona-do_200km.rst Makefile.in 041_3xx_xxx.rst 041_4xx_xxx.rst Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdenetwork-3.4.1.orig/krdc/Makefile.in kdenetwork-3.4.1/krdc/Makefile.in
+--- kdenetwork-3.4.1.orig/krdc/Makefile.in	2005-05-23 12:09:07.000000000 -0400
++++ kdenetwork-3.4.1/krdc/Makefile.in	2005-05-24 13:47:22.000000000 -0400
 @@ -273,6 +273,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -17253,9 +21004,79 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/krdc/rdp/Makefile.in kdenetwork-3.4.1/krdc/rdp/Makefile.in
---- kdenetwork-3.4.1.orig/krdc/rdp/Makefile.in	2005-05-23 18:09:07.000000000 +0200
-+++ kdenetwork-3.4.1/krdc/rdp/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -1046,11 +1049,11 @@
+ mocs: kfullscreenpanel.moc
+ 
+ #>+ 3
+-kremoteview.moc: $(srcdir)/kremoteview.h
+-	$(MOC) $(srcdir)/kremoteview.h -o kremoteview.moc
++preferencesdialog.moc: $(srcdir)/preferencesdialog.h
++	$(MOC) $(srcdir)/preferencesdialog.h -o preferencesdialog.moc
+ 
+ #>+ 2
+-mocs: kremoteview.moc
++mocs: preferencesdialog.moc
+ 
+ #>+ 3
+ keycapturedialog.moc: $(srcdir)/keycapturedialog.h
+@@ -1060,11 +1063,11 @@
+ mocs: keycapturedialog.moc
+ 
+ #>+ 3
+-preferencesdialog.moc: $(srcdir)/preferencesdialog.h
+-	$(MOC) $(srcdir)/preferencesdialog.h -o preferencesdialog.moc
++kremoteview.moc: $(srcdir)/kremoteview.h
++	$(MOC) $(srcdir)/kremoteview.h -o kremoteview.moc
+ 
+ #>+ 2
+-mocs: preferencesdialog.moc
++mocs: kremoteview.moc
+ 
+ #>+ 3
+ maindialog.moc: $(srcdir)/maindialog.h
+@@ -1075,10 +1078,10 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  maindialogwidget.moc kservicelocator.moc krdc.moc main.moc kfullscreenpanel.moc kremoteview.moc keycapturedialog.moc preferencesdialog.moc maindialog.moc
++	-rm -f  maindialogwidget.moc kservicelocator.moc krdc.moc main.moc kfullscreenpanel.moc preferencesdialog.moc keycapturedialog.moc kremoteview.moc maindialog.moc
+ 
+ #>+ 2
+-KDE_DIST=keycapturewidget.ui _rfb._tcp pindown.png maindialogwidget.h hostprofiles.ui pointcursor.png rdp.protocol hostprofiles.ui.h maindialog.h vnc.protocol cr48-app-krdc.png configure.in.in iconify.png Makefile.in smb2rdc.desktop pinup.png pointcursormask.png maindialogbase.ui cr32-app-krdc.png krdc.desktop Makefile.am close.png 
++KDE_DIST=keycapturewidget.ui _rfb._tcp pindown.png maindialogwidget.h hostprofiles.ui pointcursor.png rdp.protocol hostprofiles.ui.h maindialog.h vnc.protocol cr48-app-krdc.png configure.in.in iconify.png Makefile.in smb2rdc.desktop pointcursormask.png pinup.png maindialogbase.ui cr32-app-krdc.png krdc.desktop Makefile.am close.png 
+ 
+ #>+ 6
+ clean-ui:
+@@ -1092,14 +1095,14 @@
+ 
+ #>+ 10
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-krdc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/krdc.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-krdc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/krdc.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-krdc.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/krdc.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/krdc.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/krdc.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/krdc.png
+ 
+ #>+ 15
+ force-reedit:
+@@ -1140,7 +1143,7 @@
+ 
+ 
+ #>+ 11
+-krdc.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/krdc.cpp $(srcdir)/vidmode.cpp $(srcdir)/kfullscreenpanel.cpp $(srcdir)/kservicelocator.cpp $(srcdir)/keycapturedialog.cpp $(srcdir)/kremoteview.cpp $(srcdir)/smartptr.cpp $(srcdir)/hostpreferences.cpp $(srcdir)/preferencesdialog.cpp $(srcdir)/maindialogwidget.cpp $(srcdir)/maindialog.cpp hostprofiles.cpp maindialogbase.cpp keycapturewidget.cpp  maindialogwidget.moc maindialogbase.moc kservicelocator.moc keycapturewidget.moc krdc.moc main.moc kfullscreenpanel.moc preferencesdialog.moc keycapturedialog.moc kremoteview.moc maindialog.moc hostprofiles.moc
++krdc.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/krdc.cpp $(srcdir)/vidmode.cpp $(srcdir)/kfullscreenpanel.cpp $(srcdir)/kservicelocator.cpp $(srcdir)/keycapturedialog.cpp $(srcdir)/kremoteview.cpp $(srcdir)/smartptr.cpp $(srcdir)/hostpreferences.cpp $(srcdir)/preferencesdialog.cpp $(srcdir)/maindialogwidget.cpp $(srcdir)/maindialog.cpp hostprofiles.cpp maindialogbase.cpp keycapturewidget.cpp  maindialogwidget.moc maindialogbase.moc kservicelocator.moc keycapturewidget.moc krdc.moc main.moc kfullscreenpanel.moc kremoteview.moc keycapturedialog.moc preferencesdialog.moc maindialog.moc hostprofiles.moc
+ 	@echo 'creating krdc.all_cpp.cpp ...'; \
+ 	rm -f krdc.all_cpp.files krdc.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> krdc.all_cpp.final; \
+diff -Nru kdenetwork-3.4.1.orig/krdc/rdp/Makefile.in kdenetwork-3.4.1/krdc/rdp/Makefile.in
+--- kdenetwork-3.4.1.orig/krdc/rdp/Makefile.in	2005-05-23 12:09:07.000000000 -0400
++++ kdenetwork-3.4.1/krdc/rdp/Makefile.in	2005-05-24 13:47:22.000000000 -0400
 @@ -227,6 +227,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -17287,9 +21108,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/krdc/vnc/Makefile.in kdenetwork-3.4.1/krdc/vnc/Makefile.in
---- kdenetwork-3.4.1.orig/krdc/vnc/Makefile.in	2005-05-23 18:09:07.000000000 +0200
-+++ kdenetwork-3.4.1/krdc/vnc/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/krdc/vnc/Makefile.in kdenetwork-3.4.1/krdc/vnc/Makefile.in
+--- kdenetwork-3.4.1.orig/krdc/vnc/Makefile.in	2005-05-23 12:09:07.000000000 -0400
++++ kdenetwork-3.4.1/krdc/vnc/Makefile.in	2005-05-24 13:47:22.000000000 -0400
 @@ -237,6 +237,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -17321,9 +21142,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/krfb/kcm_krfb/Makefile.in kdenetwork-3.4.1/krfb/kcm_krfb/Makefile.in
---- kdenetwork-3.4.1.orig/krfb/kcm_krfb/Makefile.in	2005-05-23 18:09:07.000000000 +0200
-+++ kdenetwork-3.4.1/krfb/kcm_krfb/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/krfb/kcm_krfb/Makefile.in kdenetwork-3.4.1/krfb/kcm_krfb/Makefile.in
+--- kdenetwork-3.4.1.orig/krfb/kcm_krfb/Makefile.in	2005-05-23 12:09:07.000000000 -0400
++++ kdenetwork-3.4.1/krfb/kcm_krfb/Makefile.in	2005-05-24 13:47:22.000000000 -0400
 @@ -237,6 +237,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -17355,9 +21176,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/krfb/kinetd/Makefile.in kdenetwork-3.4.1/krfb/kinetd/Makefile.in
---- kdenetwork-3.4.1.orig/krfb/kinetd/Makefile.in	2005-05-23 18:09:07.000000000 +0200
-+++ kdenetwork-3.4.1/krfb/kinetd/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -787,7 +790,7 @@
+ 	-rm -f  kcm_krfb.moc
+ 
+ #>+ 2
+-KDE_DIST=configurationwidget.ui kcm_krfb.h kcmkrfb.desktop Makefile.in Makefile.am 
++KDE_DIST=configurationwidget.ui kcmkrfb.desktop kcm_krfb.h Makefile.in Makefile.am 
+ 
+ #>+ 4
+ clean-ui:
+diff -Nru kdenetwork-3.4.1.orig/krfb/kinetd/Makefile.in kdenetwork-3.4.1/krfb/kinetd/Makefile.in
+--- kdenetwork-3.4.1.orig/krfb/kinetd/Makefile.in	2005-05-23 12:09:07.000000000 -0400
++++ kdenetwork-3.4.1/krfb/kinetd/Makefile.in	2005-05-24 13:47:22.000000000 -0400
 @@ -238,6 +238,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -17389,9 +21219,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/krfb/krfb/Makefile.in kdenetwork-3.4.1/krfb/krfb/Makefile.in
---- kdenetwork-3.4.1.orig/krfb/krfb/Makefile.in	2005-05-23 18:09:07.000000000 +0200
-+++ kdenetwork-3.4.1/krfb/krfb/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/krfb/krfb/Makefile.in kdenetwork-3.4.1/krfb/krfb/Makefile.in
+--- kdenetwork-3.4.1.orig/krfb/krfb/Makefile.in	2005-05-23 12:09:07.000000000 -0400
++++ kdenetwork-3.4.1/krfb/krfb/Makefile.in	2005-05-24 13:47:22.000000000 -0400
 @@ -261,6 +261,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -17423,9 +21253,40 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/krfb/krfb_httpd/Makefile.in kdenetwork-3.4.1/krfb/krfb_httpd/Makefile.in
---- kdenetwork-3.4.1.orig/krfb/krfb_httpd/Makefile.in	2005-05-23 18:09:07.000000000 +0200
-+++ kdenetwork-3.4.1/krfb/krfb_httpd/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -961,7 +964,7 @@
+ 	-rm -f  invitedialog.moc trayicon.moc krfbifaceimpl.moc configuration.moc rfbcontroller.moc connectiondialog.moc
+ 
+ #>+ 2
+-KDE_DIST=krfbiface.h invitation.h manageinvitations.ui.h eventsrc personalinvitewidget.ui personalinvitedialog.h trayicon.h eyes-open.png invitewidget.ui manageinvitations.ui lo32-app-krfb.png connectiondialog.h cr32-app-krfb.png lo16-app-krfb.png cr48-app-krfb.png krfbifaceimpl.h connectionwidget.ui connection-side-image.png configuration.h xupdatescanner.h invitedialog.h Makefile.in krfb.desktop eyes-open24.png kinetd_krfb.desktop Makefile.am eyes-closed24.png rfbcontroller.h 
++KDE_DIST=krfbiface.h invitation.h manageinvitations.ui.h eventsrc personalinvitedialog.h personalinvitewidget.ui eyes-open.png trayicon.h invitewidget.ui manageinvitations.ui lo32-app-krfb.png connectiondialog.h cr32-app-krfb.png lo16-app-krfb.png cr48-app-krfb.png krfbifaceimpl.h connectionwidget.ui connection-side-image.png configuration.h invitedialog.h xupdatescanner.h Makefile.in krfb.desktop eyes-open24.png kinetd_krfb.desktop Makefile.am rfbcontroller.h eyes-closed24.png 
+ 
+ #>+ 5
+ clean-idl:
+@@ -984,18 +987,18 @@
+ install-kde-icons:
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/lo32-app-krfb.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/krfb.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/cr48-app-krfb.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/krfb.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/lo16-app-krfb.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/krfb.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-krfb.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/krfb.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-krfb.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/krfb.png
+ 
+ uninstall-kde-icons:
+ 	-rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/krfb.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/krfb.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/krfb.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/krfb.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/krfb.png
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdenetwork-3.4.1.orig/krfb/krfb_httpd/Makefile.in kdenetwork-3.4.1/krfb/krfb_httpd/Makefile.in
+--- kdenetwork-3.4.1.orig/krfb/krfb_httpd/Makefile.in	2005-05-23 12:09:07.000000000 -0400
++++ kdenetwork-3.4.1/krfb/krfb_httpd/Makefile.in	2005-05-24 13:47:22.000000000 -0400
 @@ -201,6 +201,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -17457,9 +21318,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binSCRIPTS: $(bin_SCRIPTS)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/krfb/libvncserver/Makefile.in kdenetwork-3.4.1/krfb/libvncserver/Makefile.in
---- kdenetwork-3.4.1.orig/krfb/libvncserver/Makefile.in	2005-05-23 18:09:07.000000000 +0200
-+++ kdenetwork-3.4.1/krfb/libvncserver/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/krfb/libvncserver/Makefile.in kdenetwork-3.4.1/krfb/libvncserver/Makefile.in
+--- kdenetwork-3.4.1.orig/krfb/libvncserver/Makefile.in	2005-05-23 12:09:07.000000000 -0400
++++ kdenetwork-3.4.1/krfb/libvncserver/Makefile.in	2005-05-24 13:47:22.000000000 -0400
 @@ -220,6 +220,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -17491,9 +21352,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/krfb/Makefile.in kdenetwork-3.4.1/krfb/Makefile.in
---- kdenetwork-3.4.1.orig/krfb/Makefile.in	2005-05-23 18:09:07.000000000 +0200
-+++ kdenetwork-3.4.1/krfb/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/krfb/Makefile.in kdenetwork-3.4.1/krfb/Makefile.in
+--- kdenetwork-3.4.1.orig/krfb/Makefile.in	2005-05-23 12:09:07.000000000 -0400
++++ kdenetwork-3.4.1/krfb/Makefile.in	2005-05-24 13:47:22.000000000 -0400
 @@ -205,6 +205,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -17525,9 +21386,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/krfb/srvloc/Makefile.in kdenetwork-3.4.1/krfb/srvloc/Makefile.in
---- kdenetwork-3.4.1.orig/krfb/srvloc/Makefile.in	2005-05-23 18:09:07.000000000 +0200
-+++ kdenetwork-3.4.1/krfb/srvloc/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/krfb/srvloc/Makefile.in kdenetwork-3.4.1/krfb/srvloc/Makefile.in
+--- kdenetwork-3.4.1.orig/krfb/srvloc/Makefile.in	2005-05-23 12:09:07.000000000 -0400
++++ kdenetwork-3.4.1/krfb/srvloc/Makefile.in	2005-05-24 13:47:22.000000000 -0400
 @@ -230,6 +230,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -17559,9 +21420,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/ksirc/icons/Makefile.in kdenetwork-3.4.1/ksirc/icons/Makefile.in
---- kdenetwork-3.4.1.orig/ksirc/icons/Makefile.in	2005-05-23 18:09:08.000000000 +0200
-+++ kdenetwork-3.4.1/ksirc/icons/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/ksirc/icons/Makefile.in kdenetwork-3.4.1/ksirc/icons/Makefile.in
+--- kdenetwork-3.4.1.orig/ksirc/icons/Makefile.in	2005-05-23 12:09:08.000000000 -0400
++++ kdenetwork-3.4.1/ksirc/icons/Makefile.in	2005-05-24 13:47:23.000000000 -0400
 @@ -188,6 +188,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -17593,9 +21454,42 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/ksirc/img/emoticons/Makefile.in kdenetwork-3.4.1/ksirc/img/emoticons/Makefile.in
---- kdenetwork-3.4.1.orig/ksirc/img/emoticons/Makefile.in	2005-05-23 18:09:08.000000000 +0200
-+++ kdenetwork-3.4.1/ksirc/img/emoticons/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -574,15 +577,15 @@
+ 
+ #>+ 33
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(ksircicondir)/crystalsvg/22x22/actions
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-info.png $(DESTDIR)$(ksircicondir)/crystalsvg/22x22/actions/info.png
+ 	$(mkinstalldirs) $(DESTDIR)$(ksircicondir)/crystalsvg/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-ksirc.png $(DESTDIR)$(ksircicondir)/crystalsvg/32x32/apps/ksirc.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-ksirc_dock.png $(DESTDIR)$(ksircicondir)/crystalsvg/22x22/actions/ksirc_dock.png
+ 	$(mkinstalldirs) $(DESTDIR)$(ksircicondir)/crystalsvg/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr16-app-ksirc.png $(DESTDIR)$(ksircicondir)/crystalsvg/16x16/apps/ksirc.png
++	$(mkinstalldirs) $(DESTDIR)$(ksircicondir)/crystalsvg/22x22/actions
++	$(INSTALL_DATA) $(srcdir)/cr22-action-ksirc_dock.png $(DESTDIR)$(ksircicondir)/crystalsvg/22x22/actions/ksirc_dock.png
+ 	$(mkinstalldirs) $(DESTDIR)$(ksircicondir)/crystalsvg/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr64-app-ksirc.png $(DESTDIR)$(ksircicondir)/crystalsvg/64x64/apps/ksirc.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-info.png $(DESTDIR)$(ksircicondir)/crystalsvg/22x22/actions/info.png
+ 	$(mkinstalldirs) $(DESTDIR)$(ksircicondir)/crystalsvg/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-ksirc.png $(DESTDIR)$(ksircicondir)/crystalsvg/48x48/apps/ksirc.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+@@ -595,11 +598,11 @@
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-ksirc.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksirc.png
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(ksircicondir)/crystalsvg/22x22/actions/info.png
+ 	-rm -f $(DESTDIR)$(ksircicondir)/crystalsvg/32x32/apps/ksirc.png
+-	-rm -f $(DESTDIR)$(ksircicondir)/crystalsvg/22x22/actions/ksirc_dock.png
+ 	-rm -f $(DESTDIR)$(ksircicondir)/crystalsvg/16x16/apps/ksirc.png
++	-rm -f $(DESTDIR)$(ksircicondir)/crystalsvg/22x22/actions/ksirc_dock.png
+ 	-rm -f $(DESTDIR)$(ksircicondir)/crystalsvg/64x64/apps/ksirc.png
++	-rm -f $(DESTDIR)$(ksircicondir)/crystalsvg/22x22/actions/info.png
+ 	-rm -f $(DESTDIR)$(ksircicondir)/crystalsvg/48x48/apps/ksirc.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksirc.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksirc.png
+diff -Nru kdenetwork-3.4.1.orig/ksirc/img/emoticons/Makefile.in kdenetwork-3.4.1/ksirc/img/emoticons/Makefile.in
+--- kdenetwork-3.4.1.orig/ksirc/img/emoticons/Makefile.in	2005-05-23 12:09:08.000000000 -0400
++++ kdenetwork-3.4.1/ksirc/img/emoticons/Makefile.in	2005-05-24 13:47:23.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -17627,9 +21521,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/ksirc/img/Makefile.in kdenetwork-3.4.1/ksirc/img/Makefile.in
---- kdenetwork-3.4.1.orig/ksirc/img/Makefile.in	2005-05-23 18:09:08.000000000 +0200
-+++ kdenetwork-3.4.1/ksirc/img/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/ksirc/img/Makefile.in kdenetwork-3.4.1/ksirc/img/Makefile.in
+--- kdenetwork-3.4.1.orig/ksirc/img/Makefile.in	2005-05-23 12:09:08.000000000 -0400
++++ kdenetwork-3.4.1/ksirc/img/Makefile.in	2005-05-24 13:47:23.000000000 -0400
 @@ -214,6 +214,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -17661,9 +21555,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/ksirc/KSOpenkSirc/Makefile.in kdenetwork-3.4.1/ksirc/KSOpenkSirc/Makefile.in
---- kdenetwork-3.4.1.orig/ksirc/KSOpenkSirc/Makefile.in	2005-05-23 18:09:07.000000000 +0200
-+++ kdenetwork-3.4.1/ksirc/KSOpenkSirc/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -771,7 +774,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=misc8.png action.png misc1.png mode.png bminus.png channel.xpm ominus.png servinfo.png ksirc_dock.png ppl.png misc2.png bluepin.png madsmiley.png dccget.png part.png misc3.png greenpin.png smiley.png ksirc_a.xpm sdi.png dcc.png topic.png sadsmiley.png oplus.png ksirc.png misc4.png ksirc_dock.xpm dccsend.png join.png ksirc_b.xpm misc5.png minus.png server.xpm info.png error.png tile.xpm channels.xpm miscA.png star.png ctcpping.png misc6.png info1.png mini-run.png notice.png kick.png Makefile.in start.xpm arrow.png stop.xpm misc7.png blueball.png X.png mdi.png plus.png bplus.png quit.png misc9.png Makefile.am elipsis.png 
++KDE_DIST=misc8.png action.png misc1.png mode.png bminus.png channel.xpm ominus.png servinfo.png ksirc_dock.png ppl.png misc2.png bluepin.png madsmiley.png dccget.png part.png misc3.png greenpin.png smiley.png ksirc_a.xpm sdi.png dcc.png topic.png sadsmiley.png oplus.png ksirc.png misc4.png ksirc_dock.xpm join.png dccsend.png ksirc_b.xpm misc5.png minus.png server.xpm error.png tile.xpm info.png channels.xpm miscA.png star.png ctcpping.png misc6.png info1.png mini-run.png kick.png notice.png Makefile.in start.xpm stop.xpm arrow.png misc7.png blueball.png X.png mdi.png plus.png quit.png bplus.png misc9.png Makefile.am elipsis.png 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdenetwork-3.4.1.orig/ksirc/KSOpenkSirc/Makefile.in kdenetwork-3.4.1/ksirc/KSOpenkSirc/Makefile.in
+--- kdenetwork-3.4.1.orig/ksirc/KSOpenkSirc/Makefile.in	2005-05-23 12:09:07.000000000 -0400
++++ kdenetwork-3.4.1/ksirc/KSOpenkSirc/Makefile.in	2005-05-24 13:47:22.000000000 -0400
 @@ -238,6 +238,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -17695,9 +21598,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/ksirc/KSPrefs/Makefile.in kdenetwork-3.4.1/ksirc/KSPrefs/Makefile.in
---- kdenetwork-3.4.1.orig/ksirc/KSPrefs/Makefile.in	2005-05-23 18:09:07.000000000 +0200
-+++ kdenetwork-3.4.1/ksirc/KSPrefs/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/ksirc/KSPrefs/Makefile.in kdenetwork-3.4.1/ksirc/KSPrefs/Makefile.in
+--- kdenetwork-3.4.1.orig/ksirc/KSPrefs/Makefile.in	2005-05-23 12:09:07.000000000 -0400
++++ kdenetwork-3.4.1/ksirc/KSPrefs/Makefile.in	2005-05-24 13:47:23.000000000 -0400
 @@ -232,6 +232,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -17729,9 +21632,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/ksirc/KSProgress/Makefile.in kdenetwork-3.4.1/ksirc/KSProgress/Makefile.in
---- kdenetwork-3.4.1.orig/ksirc/KSProgress/Makefile.in	2005-05-23 18:09:07.000000000 +0200
-+++ kdenetwork-3.4.1/ksirc/KSProgress/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/ksirc/KSProgress/Makefile.in kdenetwork-3.4.1/ksirc/KSProgress/Makefile.in
+--- kdenetwork-3.4.1.orig/ksirc/KSProgress/Makefile.in	2005-05-23 12:09:07.000000000 -0400
++++ kdenetwork-3.4.1/ksirc/KSProgress/Makefile.in	2005-05-24 13:47:23.000000000 -0400
 @@ -226,6 +226,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -17763,9 +21666,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/ksirc/KSTicker/Makefile.in kdenetwork-3.4.1/ksirc/KSTicker/Makefile.in
---- kdenetwork-3.4.1.orig/ksirc/KSTicker/Makefile.in	2005-05-23 18:09:08.000000000 +0200
-+++ kdenetwork-3.4.1/ksirc/KSTicker/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/ksirc/KSTicker/Makefile.in kdenetwork-3.4.1/ksirc/KSTicker/Makefile.in
+--- kdenetwork-3.4.1.orig/ksirc/KSTicker/Makefile.in	2005-05-23 12:09:08.000000000 -0400
++++ kdenetwork-3.4.1/ksirc/KSTicker/Makefile.in	2005-05-24 13:47:23.000000000 -0400
 @@ -236,6 +236,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -17797,9 +21700,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/ksirc/Makefile.in kdenetwork-3.4.1/ksirc/Makefile.in
---- kdenetwork-3.4.1.orig/ksirc/Makefile.in	2005-05-23 18:09:08.000000000 +0200
-+++ kdenetwork-3.4.1/ksirc/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/ksirc/Makefile.in kdenetwork-3.4.1/ksirc/Makefile.in
+--- kdenetwork-3.4.1.orig/ksirc/Makefile.in	2005-05-23 12:09:08.000000000 -0400
++++ kdenetwork-3.4.1/ksirc/Makefile.in	2005-05-24 13:47:23.000000000 -0400
 @@ -316,6 +316,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -17831,9 +21734,158 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/ksirc/puke/Makefile.in kdenetwork-3.4.1/ksirc/puke/Makefile.in
---- kdenetwork-3.4.1.orig/ksirc/puke/Makefile.in	2005-05-23 18:09:08.000000000 +0200
-+++ kdenetwork-3.4.1/ksirc/puke/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -1343,18 +1346,18 @@
+ ksirc_DEPENDENCIES = libkdeinit_ksirc.la
+ 
+ #>+ 3
+-servercontroller.moc: $(srcdir)/servercontroller.h
+-	$(MOC) $(srcdir)/servercontroller.h -o servercontroller.moc
++ksircprocess.moc: $(srcdir)/ksircprocess.h
++	$(MOC) $(srcdir)/ksircprocess.h -o ksircprocess.moc
+ 
+ #>+ 2
+-mocs: servercontroller.moc
++mocs: ksircprocess.moc
+ 
+ #>+ 3
+-ksircprocess.moc: $(srcdir)/ksircprocess.h
+-	$(MOC) $(srcdir)/ksircprocess.h -o ksircprocess.moc
++servercontroller.moc: $(srcdir)/servercontroller.h
++	$(MOC) $(srcdir)/servercontroller.h -o servercontroller.moc
+ 
+ #>+ 2
+-mocs: ksircprocess.moc
++mocs: servercontroller.moc
+ 
+ #>+ 3
+ ioDCC.moc: $(srcdir)/ioDCC.h
+@@ -1371,13 +1374,6 @@
+ mocs: ssfeprompt.moc
+ 
+ #>+ 3
+-chanButtons.moc: $(srcdir)/chanButtons.h
+-	$(MOC) $(srcdir)/chanButtons.h -o chanButtons.moc
+-
+-#>+ 2
+-mocs: chanButtons.moc
+-
+-#>+ 3
+ FilterRuleEditor.moc: $(srcdir)/FilterRuleEditor.h
+ 	$(MOC) $(srcdir)/FilterRuleEditor.h -o FilterRuleEditor.moc
+ 
+@@ -1392,6 +1388,13 @@
+ mocs: ahistlineedit.moc
+ 
+ #>+ 3
++chanButtons.moc: $(srcdir)/chanButtons.h
++	$(MOC) $(srcdir)/chanButtons.h -o chanButtons.moc
++
++#>+ 2
++mocs: chanButtons.moc
++
++#>+ 3
+ alistbox.moc: $(srcdir)/alistbox.h
+ 	$(MOC) $(srcdir)/alistbox.h -o alistbox.moc
+ 
+@@ -1420,13 +1423,6 @@
+ mocs: ksview.moc
+ 
+ #>+ 3
+-dccNew.moc: $(srcdir)/dccNew.h
+-	$(MOC) $(srcdir)/dccNew.h -o dccNew.moc
+-
+-#>+ 2
+-mocs: dccNew.moc
+-
+-#>+ 3
+ ioLAG.moc: $(srcdir)/ioLAG.h
+ 	$(MOC) $(srcdir)/ioLAG.h -o ioLAG.moc
+ 
+@@ -1434,18 +1430,18 @@
+ mocs: ioLAG.moc
+ 
+ #>+ 3
+-mditoplevel.moc: $(srcdir)/mditoplevel.h
+-	$(MOC) $(srcdir)/mditoplevel.h -o mditoplevel.moc
++dccNew.moc: $(srcdir)/dccNew.h
++	$(MOC) $(srcdir)/dccNew.h -o dccNew.moc
+ 
+ #>+ 2
+-mocs: mditoplevel.moc
++mocs: dccNew.moc
+ 
+ #>+ 3
+-topic.moc: $(srcdir)/topic.h
+-	$(MOC) $(srcdir)/topic.h -o topic.moc
++mditoplevel.moc: $(srcdir)/mditoplevel.h
++	$(MOC) $(srcdir)/mditoplevel.h -o mditoplevel.moc
+ 
+ #>+ 2
+-mocs: topic.moc
++mocs: mditoplevel.moc
+ 
+ #>+ 3
+ colorpicker.moc: $(srcdir)/colorpicker.h
+@@ -1462,6 +1458,13 @@
+ mocs: objFinder.moc
+ 
+ #>+ 3
++topic.moc: $(srcdir)/topic.h
++	$(MOC) $(srcdir)/topic.h -o topic.moc
++
++#>+ 2
++mocs: topic.moc
++
++#>+ 3
+ displayMgrMDI.moc: $(srcdir)/displayMgrMDI.h
+ 	$(MOC) $(srcdir)/displayMgrMDI.h -o displayMgrMDI.moc
+ 
+@@ -1490,18 +1493,18 @@
+ mocs: dccToplevel.moc
+ 
+ #>+ 3
+-toplevel.moc: $(srcdir)/toplevel.h
+-	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
++NewWindowDialog.moc: $(srcdir)/NewWindowDialog.h
++	$(MOC) $(srcdir)/NewWindowDialog.h -o NewWindowDialog.moc
+ 
+ #>+ 2
+-mocs: toplevel.moc
++mocs: NewWindowDialog.moc
+ 
+ #>+ 3
+-NewWindowDialog.moc: $(srcdir)/NewWindowDialog.h
+-	$(MOC) $(srcdir)/NewWindowDialog.h -o NewWindowDialog.moc
++toplevel.moc: $(srcdir)/toplevel.h
++	$(MOC) $(srcdir)/toplevel.h -o toplevel.moc
+ 
+ #>+ 2
+-mocs: NewWindowDialog.moc
++mocs: toplevel.moc
+ 
+ #>+ 3
+ dockservercontroller.moc: $(srcdir)/dockservercontroller.h
+@@ -1526,7 +1529,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  servercontroller.moc ksircprocess.moc ioDCC.moc ssfeprompt.moc chanButtons.moc FilterRuleEditor.moc ahistlineedit.moc alistbox.moc iocontroller.moc dccManager.moc ksview.moc dccNew.moc ioLAG.moc mditoplevel.moc topic.moc colorpicker.moc objFinder.moc displayMgrMDI.moc ssfepromptdata.moc charSelector.moc dccToplevel.moc toplevel.moc NewWindowDialog.moc dockservercontroller.moc kstextview.moc ioNotify.moc
++	-rm -f  ksircprocess.moc servercontroller.moc ioDCC.moc ssfeprompt.moc FilterRuleEditor.moc ahistlineedit.moc chanButtons.moc alistbox.moc iocontroller.moc dccManager.moc ksview.moc ioLAG.moc dccNew.moc mditoplevel.moc colorpicker.moc objFinder.moc topic.moc displayMgrMDI.moc ssfepromptdata.moc charSelector.moc dccToplevel.moc NewWindowDialog.moc toplevel.moc dockservercontroller.moc kstextview.moc ioNotify.moc
+ 
+ #>+ 2
+ KDE_DIST=chanButtons.h topic.h advfollow.pl sirc.help.gz nickColourMaker.h ksircrc eventsrc displayMgrMDI.h ksircserver.h ksirc.pl Artistic stringparserstate.h FilterRuleEditor.dlg ksirc.desktop default.pl dccNewbase.ui kstextview.h charSelector.h ksircchannel.h FAQ relnotes filters.pl logfile.h colorpicker.h openksircproc.dlg FilterRuleWidget.ui servercontroller.dlg Makefile.in dsirc mditoplevel.h autodcc.pl version.h Makefile.am dccManagerbase.ui 
+@@ -1580,7 +1583,7 @@
+ 
+ 
+ #>+ 11
+-libkdeinit_ksirc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/toplevel.cpp $(srcdir)/charSelector.cpp $(srcdir)/chanButtons.cpp $(srcdir)/ksirc.cpp $(srcdir)/alistbox.cpp $(srcdir)/ahistlineedit.cpp $(srcdir)/iocontroller.cpp $(srcdir)/NewWindowDialog.cpp $(srcdir)/messageReceiver.cpp $(srcdir)/ioBroadcast.cpp $(srcdir)/ksircprocess.cpp $(srcdir)/servercontroller.cpp $(srcdir)/FilterRuleEditor.cpp $(srcdir)/ioDiscard.cpp $(srcdir)/ioDCC.cpp $(srcdir)/ioLAG.cpp $(srcdir)/ioNotify.cpp $(srcdir)/ssfeprompt.cpp $(srcdir)/ssfepromptdata.cpp $(srcdir)/usercontrolmenu.cpp $(srcdir)/baserules.cpp $(srcdir)/chanparser.cpp $(srcdir)/objFinder.cpp $(srcdir)/displayMgrSDI.cpp $(srcdir)/displayMgrMDI.cpp $(srcdir)/mditoplevel.cpp $(srcdir)/ksopts.cpp $(srcdir)/topic.cpp $(srcdir)/ksview.cpp $(srcdir)/logfile.cpp $(srcdir)/kstextview.cpp $(srcdir)/colorpicker.cpp $(srcdir)/ksparser.cpp $(srcdir)/dccManager.cpp $(srcdir)/dccToplevel.cpp $(srcdir)/dockservercontroller.cpp $(srcdir)/nickColourMaker.cpp $(srcdir)/dccNew.cpp FilterRuleWidget.cpp dccManagerbase.cpp dccNewbase.cpp  ksircprocess.moc servercontroller.moc ssfeprompt.moc ioDCC.moc ahistlineedit.moc FilterRuleEditor.moc chanButtons.moc alistbox.moc iocontroller.moc dccManager.moc ksview.moc ioLAG.moc dccNew.moc mditoplevel.moc objFinder.moc colorpicker.moc topic.moc dccNewbase.moc displayMgrMDI.moc ssfepromptdata.moc charSelector.moc dccToplevel.moc NewWindowDialog.moc toplevel.moc dockservercontroller.moc FilterRuleWidget.moc kstextview.moc ioNotify.moc dccManagerbase.moc
++libkdeinit_ksirc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/toplevel.cpp $(srcdir)/charSelector.cpp $(srcdir)/chanButtons.cpp $(srcdir)/ksirc.cpp $(srcdir)/alistbox.cpp $(srcdir)/ahistlineedit.cpp $(srcdir)/iocontroller.cpp $(srcdir)/NewWindowDialog.cpp $(srcdir)/messageReceiver.cpp $(srcdir)/ioBroadcast.cpp $(srcdir)/ksircprocess.cpp $(srcdir)/servercontroller.cpp $(srcdir)/FilterRuleEditor.cpp $(srcdir)/ioDiscard.cpp $(srcdir)/ioDCC.cpp $(srcdir)/ioLAG.cpp $(srcdir)/ioNotify.cpp $(srcdir)/ssfeprompt.cpp $(srcdir)/ssfepromptdata.cpp $(srcdir)/usercontrolmenu.cpp $(srcdir)/baserules.cpp $(srcdir)/chanparser.cpp $(srcdir)/objFinder.cpp $(srcdir)/displayMgrSDI.cpp $(srcdir)/displayMgrMDI.cpp $(srcdir)/mditoplevel.cpp $(srcdir)/ksopts.cpp $(srcdir)/topic.cpp $(srcdir)/ksview.cpp $(srcdir)/logfile.cpp $(srcdir)/kstextview.cpp $(srcdir)/colorpicker.cpp $(srcdir)/ksparser.cpp $(srcdir)/dccManager.cpp $(srcdir)/dccToplevel.cpp $(srcdir)/dockservercontroller.cpp $(srcdir)/nickColourMaker.cpp $(srcdir)/dccNew.cpp FilterRuleWidget.cpp dccManagerbase.cpp dccNewbase.cpp  servercontroller.moc ksircprocess.moc ssfeprompt.moc ioDCC.moc chanButtons.moc ahistlineedit.moc FilterRuleEditor.moc alistbox.moc iocontroller.moc dccManager.moc ksview.moc dccNew.moc ioLAG.moc mditoplevel.moc topic.moc objFinder.moc colorpicker.moc dccNewbase.moc displayMgrMDI.moc ssfepromptdata.moc charSelector.moc dccToplevel.moc toplevel.moc NewWindowDialog.moc dockservercontroller.moc FilterRuleWidget.moc kstextview.moc ioNotify.moc dccManagerbase.moc
+ 	@echo 'creating libkdeinit_ksirc_la.all_cpp.cpp ...'; \
+ 	rm -f libkdeinit_ksirc_la.all_cpp.files libkdeinit_ksirc_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libkdeinit_ksirc_la.all_cpp.final; \
+diff -Nru kdenetwork-3.4.1.orig/ksirc/puke/Makefile.in kdenetwork-3.4.1/ksirc/puke/Makefile.in
+--- kdenetwork-3.4.1.orig/ksirc/puke/Makefile.in	2005-05-23 12:09:08.000000000 -0400
++++ kdenetwork-3.4.1/ksirc/puke/Makefile.in	2005-05-24 13:47:23.000000000 -0400
 @@ -242,6 +242,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -17865,9 +21917,56 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLTLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/ktalkd/kcmktalkd/Makefile.in kdenetwork-3.4.1/ktalkd/kcmktalkd/Makefile.in
---- kdenetwork-3.4.1.orig/ktalkd/kcmktalkd/Makefile.in	2005-05-23 18:09:08.000000000 +0200
-+++ kdenetwork-3.4.1/ktalkd/kcmktalkd/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -885,18 +888,18 @@
+ mocs: ptablevw.moc
+ 
+ #>+ 3
+-pmenudta.moc: $(srcdir)/pmenudta.h
+-	$(MOC) $(srcdir)/pmenudta.h -o pmenudta.moc
++ppopmenu.moc: $(srcdir)/ppopmenu.h
++	$(MOC) $(srcdir)/ppopmenu.h -o ppopmenu.moc
+ 
+ #>+ 2
+-mocs: pmenudta.moc
++mocs: ppopmenu.moc
+ 
+ #>+ 3
+-ppopmenu.moc: $(srcdir)/ppopmenu.h
+-	$(MOC) $(srcdir)/ppopmenu.h -o ppopmenu.moc
++pmenudta.moc: $(srcdir)/pmenudta.h
++	$(MOC) $(srcdir)/pmenudta.h -o pmenudta.moc
+ 
+ #>+ 2
+-mocs: ppopmenu.moc
++mocs: pmenudta.moc
+ 
+ #>+ 3
+ pkfiledialog.moc: $(srcdir)/pkfiledialog.h
+@@ -907,10 +910,10 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  pframe.moc ptabdialog.moc plabel.moc playout.moc plined.moc pobject.moc pprogress.moc controller.moc pobjfinder.moc ppushbt.moc plistbox.moc pwidget.moc pbutton.moc palistbox.moc ptablevw.moc pmenudta.moc ppopmenu.moc pkfiledialog.moc
++	-rm -f  pframe.moc ptabdialog.moc plabel.moc playout.moc plined.moc pobject.moc pprogress.moc controller.moc pobjfinder.moc ppushbt.moc plistbox.moc pwidget.moc pbutton.moc palistbox.moc ptablevw.moc ppopmenu.moc pmenudta.moc pkfiledialog.moc
+ 
+ #>+ 2
+-KDE_DIST=pobjfinder.h load_all.pm plistbox.pm pmenudta.pm pkfiledialog.pm dcc_progress.pm palistbox.pm ptablevw.pm plabel.pm small.pl ppopmenu.pm pprogress.pm pkfiledialog-cmd.h ppushbt.pm pobjfinder-cmd.h pkfiledialog.h dcc_status.pm ptabdialog.pm Makefile.in user_monitor.ks pobjfinder.pm pbutton.pm Makefile.am 
++KDE_DIST=pobjfinder.h load_all.pm plistbox.pm pmenudta.pm pkfiledialog.pm palistbox.pm dcc_progress.pm ptablevw.pm plabel.pm small.pl ppopmenu.pm pprogress.pm pkfiledialog-cmd.h ppushbt.pm pobjfinder-cmd.h pkfiledialog.h dcc_status.pm ptabdialog.pm Makefile.in user_monitor.ks pobjfinder.pm pbutton.pm Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+@@ -954,7 +957,7 @@
+ 
+ 
+ #>+ 11
+-libpuke_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pwidget.cpp $(srcdir)/pobject.cpp $(srcdir)/playout.cpp $(srcdir)/controller.cpp $(srcdir)/pframe.cpp $(srcdir)/plined.cpp $(srcdir)/pbutton.cpp $(srcdir)/ppushbt.cpp $(srcdir)/pprogress.cpp $(srcdir)/ptablevw.cpp $(srcdir)/plistbox.cpp $(srcdir)/plabel.cpp $(srcdir)/pmenudta.cpp $(srcdir)/ppopmenu.cpp $(srcdir)/palistbox.cpp $(srcdir)/ptabdialog.cpp $(srcdir)/pkfiledialog.cpp $(srcdir)/pobjfinder.cpp  pframe.moc ptabdialog.moc playout.moc plabel.moc pobject.moc plined.moc pprogress.moc controller.moc pobjfinder.moc ppushbt.moc plistbox.moc pwidget.moc pbutton.moc palistbox.moc ptablevw.moc ppopmenu.moc pmenudta.moc pkfiledialog.moc
++libpuke_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/pwidget.cpp $(srcdir)/pobject.cpp $(srcdir)/playout.cpp $(srcdir)/controller.cpp $(srcdir)/pframe.cpp $(srcdir)/plined.cpp $(srcdir)/pbutton.cpp $(srcdir)/ppushbt.cpp $(srcdir)/pprogress.cpp $(srcdir)/ptablevw.cpp $(srcdir)/plistbox.cpp $(srcdir)/plabel.cpp $(srcdir)/pmenudta.cpp $(srcdir)/ppopmenu.cpp $(srcdir)/palistbox.cpp $(srcdir)/ptabdialog.cpp $(srcdir)/pkfiledialog.cpp $(srcdir)/pobjfinder.cpp  pframe.moc ptabdialog.moc playout.moc plabel.moc pobject.moc plined.moc pprogress.moc controller.moc pobjfinder.moc ppushbt.moc plistbox.moc pwidget.moc pbutton.moc palistbox.moc ptablevw.moc pmenudta.moc ppopmenu.moc pkfiledialog.moc
+ 	@echo 'creating libpuke_la.all_cpp.cpp ...'; \
+ 	rm -f libpuke_la.all_cpp.files libpuke_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> libpuke_la.all_cpp.final; \
+diff -Nru kdenetwork-3.4.1.orig/ktalkd/kcmktalkd/Makefile.in kdenetwork-3.4.1/ktalkd/kcmktalkd/Makefile.in
+--- kdenetwork-3.4.1.orig/ktalkd/kcmktalkd/Makefile.in	2005-05-23 12:09:08.000000000 -0400
++++ kdenetwork-3.4.1/ktalkd/kcmktalkd/Makefile.in	2005-05-24 13:47:23.000000000 -0400
 @@ -239,6 +239,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -17899,9 +21998,83 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/ktalkd/ktalkd/machines/Makefile.in kdenetwork-3.4.1/ktalkd/ktalkd/machines/Makefile.in
---- kdenetwork-3.4.1.orig/ktalkd/ktalkd/machines/Makefile.in	2005-05-23 18:09:08.000000000 +0200
-+++ kdenetwork-3.4.1/ktalkd/ktalkd/machines/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -786,18 +789,18 @@
+ mocs: answmachpage.moc
+ 
+ #>+ 3
+-soundpage.moc: $(srcdir)/soundpage.h
+-	$(MOC) $(srcdir)/soundpage.h -o soundpage.moc
++main.moc: $(srcdir)/main.h
++	$(MOC) $(srcdir)/main.h -o main.moc
+ 
+ #>+ 2
+-mocs: soundpage.moc
++mocs: main.moc
+ 
+ #>+ 3
+-main.moc: $(srcdir)/main.h
+-	$(MOC) $(srcdir)/main.h -o main.moc
++soundpage.moc: $(srcdir)/soundpage.h
++	$(MOC) $(srcdir)/soundpage.h -o soundpage.moc
+ 
+ #>+ 2
+-mocs: main.moc
++mocs: soundpage.moc
+ 
+ #>+ 3
+ forwmachpage.moc: $(srcdir)/forwmachpage.h
+@@ -808,10 +811,10 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  answmachpage.moc soundpage.moc main.moc forwmachpage.moc
++	-rm -f  answmachpage.moc main.moc soundpage.moc forwmachpage.moc
+ 
+ #>+ 2
+-KDE_DIST=cr48-app-ktalkd.png forwmachpage.h cr128-app-ktalkd.png main.h cr32-app-ktalkd.png soundpage.h cr16-app-ktalkd.png Makefile.in kcmktalkd.desktop answmachpage.h Makefile.am 
++KDE_DIST=forwmachpage.h cr48-app-ktalkd.png cr128-app-ktalkd.png main.h cr32-app-ktalkd.png soundpage.h cr16-app-ktalkd.png Makefile.in kcmktalkd.desktop answmachpage.h Makefile.am 
+ 
+ #>+ 3
+ clean-closures:
+@@ -822,20 +825,20 @@
+ 
+ #>+ 16
+ install-kde-icons:
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
++	$(INSTALL_DATA) $(srcdir)/cr48-app-ktalkd.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ktalkd.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr32-app-ktalkd.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ktalkd.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-ktalkd.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ktalkd.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr128-app-ktalkd.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ktalkd.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+-	$(INSTALL_DATA) $(srcdir)/cr48-app-ktalkd.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ktalkd.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/cr16-app-ktalkd.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ktalkd.png
+ 
+ uninstall-kde-icons:
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ktalkd.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ktalkd.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ktalkd.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/ktalkd.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ktalkd.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ktalkd.png
+ 
+ #>+ 15
+ force-reedit:
+@@ -876,7 +879,7 @@
+ 
+ 
+ #>+ 11
+-kcm_ktalkd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/soundpage.cpp $(srcdir)/answmachpage.cpp $(srcdir)/forwmachpage.cpp  answmachpage.moc forwmachpage.moc main.moc soundpage.moc
++kcm_ktalkd_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/soundpage.cpp $(srcdir)/answmachpage.cpp $(srcdir)/forwmachpage.cpp  answmachpage.moc forwmachpage.moc soundpage.moc main.moc
+ 	@echo 'creating kcm_ktalkd_la.all_cpp.cpp ...'; \
+ 	rm -f kcm_ktalkd_la.all_cpp.files kcm_ktalkd_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kcm_ktalkd_la.all_cpp.final; \
+diff -Nru kdenetwork-3.4.1.orig/ktalkd/ktalkd/machines/Makefile.in kdenetwork-3.4.1/ktalkd/ktalkd/machines/Makefile.in
+--- kdenetwork-3.4.1.orig/ktalkd/ktalkd/machines/Makefile.in	2005-05-23 12:09:08.000000000 -0400
++++ kdenetwork-3.4.1/ktalkd/ktalkd/machines/Makefile.in	2005-05-24 13:47:23.000000000 -0400
 @@ -235,6 +235,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -17933,9 +22106,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  clean-noinstLIBRARIES:
-diff -Nrua kdenetwork-3.4.1.orig/ktalkd/ktalkd/Makefile.in kdenetwork-3.4.1/ktalkd/ktalkd/Makefile.in
---- kdenetwork-3.4.1.orig/ktalkd/ktalkd/Makefile.in	2005-05-23 18:09:08.000000000 +0200
-+++ kdenetwork-3.4.1/ktalkd/ktalkd/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/ktalkd/ktalkd/Makefile.in kdenetwork-3.4.1/ktalkd/ktalkd/Makefile.in
+--- kdenetwork-3.4.1.orig/ktalkd/ktalkd/Makefile.in	2005-05-23 12:09:08.000000000 -0400
++++ kdenetwork-3.4.1/ktalkd/ktalkd/Makefile.in	2005-05-24 13:47:23.000000000 -0400
 @@ -258,6 +258,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -17967,9 +22140,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/ktalkd/ktalkdlg/Makefile.in kdenetwork-3.4.1/ktalkd/ktalkdlg/Makefile.in
---- kdenetwork-3.4.1.orig/ktalkd/ktalkdlg/Makefile.in	2005-05-23 18:09:08.000000000 +0200
-+++ kdenetwork-3.4.1/ktalkd/ktalkdlg/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -911,7 +914,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=table.h announce.h readconf.h proto.h defs.h includ.h options.h ktalkd.wav process.h find_user.h unixsock.h prot_talkd.h otalkd.h threads.h readconf.cpp Makefile.in Makefile.am 
++KDE_DIST=table.h announce.h proto.h readconf.h defs.h includ.h options.h ktalkd.wav process.h find_user.h unixsock.h prot_talkd.h otalkd.h threads.h readconf.cpp Makefile.in Makefile.am 
+ 
+ #>+ 2
+ docs-am:
+diff -Nru kdenetwork-3.4.1.orig/ktalkd/ktalkdlg/Makefile.in kdenetwork-3.4.1/ktalkd/ktalkdlg/Makefile.in
+--- kdenetwork-3.4.1.orig/ktalkd/ktalkdlg/Makefile.in	2005-05-23 12:09:08.000000000 -0400
++++ kdenetwork-3.4.1/ktalkd/ktalkdlg/Makefile.in	2005-05-24 13:47:23.000000000 -0400
 @@ -226,6 +226,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -18001,9 +22183,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/ktalkd/mail.local/Makefile.in kdenetwork-3.4.1/ktalkd/mail.local/Makefile.in
---- kdenetwork-3.4.1.orig/ktalkd/mail.local/Makefile.in	2005-05-23 18:09:08.000000000 +0200
-+++ kdenetwork-3.4.1/ktalkd/mail.local/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/ktalkd/mail.local/Makefile.in kdenetwork-3.4.1/ktalkd/mail.local/Makefile.in
+--- kdenetwork-3.4.1.orig/ktalkd/mail.local/Makefile.in	2005-05-23 12:09:08.000000000 -0400
++++ kdenetwork-3.4.1/ktalkd/mail.local/Makefile.in	2005-05-24 13:47:23.000000000 -0400
 @@ -220,6 +220,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -18035,9 +22217,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/ktalkd/Makefile.in kdenetwork-3.4.1/ktalkd/Makefile.in
---- kdenetwork-3.4.1.orig/ktalkd/Makefile.in	2005-05-23 18:09:08.000000000 +0200
-+++ kdenetwork-3.4.1/ktalkd/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/ktalkd/Makefile.in kdenetwork-3.4.1/ktalkd/Makefile.in
+--- kdenetwork-3.4.1.orig/ktalkd/Makefile.in	2005-05-23 12:09:08.000000000 -0400
++++ kdenetwork-3.4.1/ktalkd/Makefile.in	2005-05-24 13:47:23.000000000 -0400
 @@ -207,6 +207,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -18069,9 +22251,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/lanbrowsing/kcmlisa/Makefile.in kdenetwork-3.4.1/lanbrowsing/kcmlisa/Makefile.in
---- kdenetwork-3.4.1.orig/lanbrowsing/kcmlisa/Makefile.in	2005-05-23 18:09:08.000000000 +0200
-+++ kdenetwork-3.4.1/lanbrowsing/kcmlisa/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/lanbrowsing/kcmlisa/Makefile.in kdenetwork-3.4.1/lanbrowsing/kcmlisa/Makefile.in
+--- kdenetwork-3.4.1.orig/lanbrowsing/kcmlisa/Makefile.in	2005-05-23 12:09:08.000000000 -0400
++++ kdenetwork-3.4.1/lanbrowsing/kcmlisa/Makefile.in	2005-05-24 13:47:23.000000000 -0400
 @@ -250,6 +250,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -18103,9 +22285,52 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/lanbrowsing/kio_lan/Makefile.in kdenetwork-3.4.1/lanbrowsing/kio_lan/Makefile.in
---- kdenetwork-3.4.1.orig/lanbrowsing/kio_lan/Makefile.in	2005-05-23 18:09:08.000000000 +0200
-+++ kdenetwork-3.4.1/lanbrowsing/kio_lan/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -890,18 +893,18 @@
+ 
+ 
+ #>+ 3
+-kcmreslisa.moc: $(srcdir)/kcmreslisa.h
+-	$(MOC) $(srcdir)/kcmreslisa.h -o kcmreslisa.moc
++portsettingsbar.moc: $(srcdir)/portsettingsbar.h
++	$(MOC) $(srcdir)/portsettingsbar.h -o portsettingsbar.moc
+ 
+ #>+ 2
+-mocs: kcmreslisa.moc
++mocs: portsettingsbar.moc
+ 
+ #>+ 3
+-portsettingsbar.moc: $(srcdir)/portsettingsbar.h
+-	$(MOC) $(srcdir)/portsettingsbar.h -o portsettingsbar.moc
++kcmreslisa.moc: $(srcdir)/kcmreslisa.h
++	$(MOC) $(srcdir)/kcmreslisa.h -o kcmreslisa.moc
+ 
+ #>+ 2
+-mocs: portsettingsbar.moc
++mocs: kcmreslisa.moc
+ 
+ #>+ 3
+ kcmkiolan.moc: $(srcdir)/kcmkiolan.h
+@@ -926,7 +929,7 @@
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  kcmreslisa.moc portsettingsbar.moc kcmkiolan.moc kcmlisa.moc setupwizard.moc
++	-rm -f  portsettingsbar.moc kcmreslisa.moc kcmkiolan.moc kcmlisa.moc setupwizard.moc
+ 
+ #>+ 2
+ KDE_DIST=kcmreslisa.desktop findnic.h kcmreslisa.h kcmlisa.desktop kcmkiolan.desktop portsettingsbar.h configure.in.in kcmlisa.h Makefile.in kcmkiolan.h setupwizard.h Makefile.am 
+@@ -977,7 +980,7 @@
+ 
+ 
+ #>+ 11
+-kcm_lanbrowser_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/setupwizard.cpp $(srcdir)/kcmlisa.cpp $(srcdir)/kcmreslisa.cpp $(srcdir)/kcmkiolan.cpp $(srcdir)/portsettingsbar.cpp $(srcdir)/findnic.cpp  portsettingsbar.moc kcmreslisa.moc kcmkiolan.moc setupwizard.moc kcmlisa.moc
++kcm_lanbrowser_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/setupwizard.cpp $(srcdir)/kcmlisa.cpp $(srcdir)/kcmreslisa.cpp $(srcdir)/kcmkiolan.cpp $(srcdir)/portsettingsbar.cpp $(srcdir)/findnic.cpp  kcmreslisa.moc portsettingsbar.moc kcmkiolan.moc setupwizard.moc kcmlisa.moc
+ 	@echo 'creating kcm_lanbrowser_la.all_cpp.cpp ...'; \
+ 	rm -f kcm_lanbrowser_la.all_cpp.files kcm_lanbrowser_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kcm_lanbrowser_la.all_cpp.final; \
+diff -Nru kdenetwork-3.4.1.orig/lanbrowsing/kio_lan/Makefile.in kdenetwork-3.4.1/lanbrowsing/kio_lan/Makefile.in
+--- kdenetwork-3.4.1.orig/lanbrowsing/kio_lan/Makefile.in	2005-05-23 12:09:08.000000000 -0400
++++ kdenetwork-3.4.1/lanbrowsing/kio_lan/Makefile.in	2005-05-24 13:47:23.000000000 -0400
 @@ -241,6 +241,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -18137,9 +22362,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/lanbrowsing/lisa/Makefile.in kdenetwork-3.4.1/lanbrowsing/lisa/Makefile.in
---- kdenetwork-3.4.1.orig/lanbrowsing/lisa/Makefile.in	2005-05-23 18:09:08.000000000 +0200
-+++ kdenetwork-3.4.1/lanbrowsing/lisa/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/lanbrowsing/lisa/Makefile.in kdenetwork-3.4.1/lanbrowsing/lisa/Makefile.in
+--- kdenetwork-3.4.1.orig/lanbrowsing/lisa/Makefile.in	2005-05-23 12:09:08.000000000 -0400
++++ kdenetwork-3.4.1/lanbrowsing/lisa/Makefile.in	2005-05-24 13:47:23.000000000 -0400
 @@ -253,6 +253,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -18171,9 +22396,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/lanbrowsing/Makefile.in kdenetwork-3.4.1/lanbrowsing/Makefile.in
---- kdenetwork-3.4.1.orig/lanbrowsing/Makefile.in	2005-05-23 18:09:08.000000000 +0200
-+++ kdenetwork-3.4.1/lanbrowsing/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/lanbrowsing/Makefile.in kdenetwork-3.4.1/lanbrowsing/Makefile.in
+--- kdenetwork-3.4.1.orig/lanbrowsing/Makefile.in	2005-05-23 12:09:08.000000000 -0400
++++ kdenetwork-3.4.1/lanbrowsing/Makefile.in	2005-05-24 13:47:23.000000000 -0400
 @@ -204,6 +204,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -18205,9 +22430,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/librss/Makefile.in kdenetwork-3.4.1/librss/Makefile.in
---- kdenetwork-3.4.1.orig/librss/Makefile.in	2005-05-23 18:09:08.000000000 +0200
-+++ kdenetwork-3.4.1/librss/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/librss/Makefile.in kdenetwork-3.4.1/librss/Makefile.in
+--- kdenetwork-3.4.1.orig/librss/Makefile.in	2005-05-23 12:09:08.000000000 -0400
++++ kdenetwork-3.4.1/librss/Makefile.in	2005-05-24 13:47:24.000000000 -0400
 @@ -245,6 +245,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -18239,9 +22464,18 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/Makefile.in kdenetwork-3.4.1/Makefile.in
---- kdenetwork-3.4.1.orig/Makefile.in	2005-05-23 18:09:01.000000000 +0200
-+++ kdenetwork-3.4.1/Makefile.in	2005-05-24 17:07:05.000000000 +0200
+@@ -818,7 +821,7 @@
+ 	-rm -f  loader.moc image.moc testlibrss.moc
+ 
+ #>+ 2
+-KDE_DIST=tools_p.h librss.doxyfile rss-faq.html testlibrss.h Makefile.in Makefile.am 
++KDE_DIST=librss.doxyfile tools_p.h rss-faq.html testlibrss.h Makefile.in Makefile.am 
+ 
+ #>+ 3
+ clean-closures:
+diff -Nru kdenetwork-3.4.1.orig/Makefile.in kdenetwork-3.4.1/Makefile.in
+--- kdenetwork-3.4.1.orig/Makefile.in	2005-05-23 12:09:01.000000000 -0400
++++ kdenetwork-3.4.1/Makefile.in	2005-05-24 13:47:07.000000000 -0400
 @@ -221,6 +221,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -18290,13 +22524,13 @@
  
  #>+ 2
 -KDE_DIST=subdirs Makefile.in configure.in.bot configure.files config.h.in kdenetwork.lsm configure.in aclocal.m4 configure.in.in acinclude.m4 Makefile.am Makefile.am.in 
-+KDE_DIST=stamp-h.in subdirs Makefile.in configure.in.bot configure.files config.h.in kdenetwork.lsm configure.in aclocal.m4 configure.in.in configure acinclude.m4 Makefile.am Makefile.am.in 
++KDE_DIST=stamp-h.in subdirs Makefile.in configure.in.bot configure.files config.h.in kdenetwork.lsm configure.in aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in 
  
  #>+ 2
  docs-am:
-diff -Nrua kdenetwork-3.4.1.orig/wifi/kcmwifi/Makefile.in kdenetwork-3.4.1/wifi/kcmwifi/Makefile.in
---- kdenetwork-3.4.1.orig/wifi/kcmwifi/Makefile.in	2005-05-23 18:09:08.000000000 +0200
-+++ kdenetwork-3.4.1/wifi/kcmwifi/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/wifi/kcmwifi/Makefile.in kdenetwork-3.4.1/wifi/kcmwifi/Makefile.in
+--- kdenetwork-3.4.1.orig/wifi/kcmwifi/Makefile.in	2005-05-23 12:09:08.000000000 -0400
++++ kdenetwork-3.4.1/wifi/kcmwifi/Makefile.in	2005-05-24 13:47:24.000000000 -0400
 @@ -241,6 +241,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -18328,9 +22562,48 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/wifi/kwireless/Makefile.in kdenetwork-3.4.1/wifi/kwireless/Makefile.in
---- kdenetwork-3.4.1.orig/wifi/kwireless/Makefile.in	2005-05-23 18:09:08.000000000 +0200
-+++ kdenetwork-3.4.1/wifi/kwireless/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -789,22 +792,22 @@
+ mocs: mainconfig.moc
+ 
+ #>+ 3
+-ifconfigpage.moc: $(srcdir)/ifconfigpage.h
+-	$(MOC) $(srcdir)/ifconfigpage.h -o ifconfigpage.moc
++kcmwifi.moc: $(srcdir)/kcmwifi.h
++	$(MOC) $(srcdir)/kcmwifi.h -o kcmwifi.moc
+ 
+ #>+ 2
+-mocs: ifconfigpage.moc
++mocs: kcmwifi.moc
+ 
+ #>+ 3
+-kcmwifi.moc: $(srcdir)/kcmwifi.h
+-	$(MOC) $(srcdir)/kcmwifi.h -o kcmwifi.moc
++ifconfigpage.moc: $(srcdir)/ifconfigpage.h
++	$(MOC) $(srcdir)/ifconfigpage.h -o ifconfigpage.moc
+ 
+ #>+ 2
+-mocs: kcmwifi.moc
++mocs: ifconfigpage.moc
+ 
+ #>+ 3
+ clean-metasources:
+-	-rm -f  mainconfig.moc ifconfigpage.moc kcmwifi.moc
++	-rm -f  mainconfig.moc kcmwifi.moc ifconfigpage.moc
+ 
+ #>+ 2
+ KDE_DIST=mainconfigbase.ui mainconfig.h ifconfigpagebase.ui kcmwifi.desktop wificonfig.h configadvanced.ui configcrypto.ui configcrypto.ui.h configpower.ui configpower.ui.h kcmwifi.h Makefile.in ifconfigpage.h Makefile.am 
+@@ -863,7 +866,7 @@
+ 
+ 
+ #>+ 11
+-kcm_wifi_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/wificonfig.cpp $(srcdir)/kcmwifi.cpp $(srcdir)/mainconfig.cpp $(srcdir)/ifconfigpage.cpp configcrypto.cpp ifconfigpagebase.cpp configpower.cpp mainconfigbase.cpp  mainconfig.moc mainconfigbase.moc kcmwifi.moc ifconfigpage.moc configpower.moc ifconfigpagebase.moc configcrypto.moc
++kcm_wifi_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/wificonfig.cpp $(srcdir)/kcmwifi.cpp $(srcdir)/mainconfig.cpp $(srcdir)/ifconfigpage.cpp configcrypto.cpp ifconfigpagebase.cpp configpower.cpp mainconfigbase.cpp  mainconfig.moc mainconfigbase.moc ifconfigpage.moc kcmwifi.moc configpower.moc ifconfigpagebase.moc configcrypto.moc
+ 	@echo 'creating kcm_wifi_la.all_cpp.cpp ...'; \
+ 	rm -f kcm_wifi_la.all_cpp.files kcm_wifi_la.all_cpp.final; \
+ 	echo "#define KDE_USE_FINAL 1" >> kcm_wifi_la.all_cpp.final; \
+diff -Nru kdenetwork-3.4.1.orig/wifi/kwireless/Makefile.in kdenetwork-3.4.1/wifi/kwireless/Makefile.in
+--- kdenetwork-3.4.1.orig/wifi/kwireless/Makefile.in	2005-05-23 12:09:08.000000000 -0400
++++ kdenetwork-3.4.1/wifi/kwireless/Makefile.in	2005-05-24 13:47:24.000000000 -0400
 @@ -237,6 +237,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -18362,9 +22635,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/wifi/locations/Makefile.in kdenetwork-3.4.1/wifi/locations/Makefile.in
---- kdenetwork-3.4.1.orig/wifi/locations/Makefile.in	2005-05-23 18:09:08.000000000 +0200
-+++ kdenetwork-3.4.1/wifi/locations/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/wifi/locations/Makefile.in kdenetwork-3.4.1/wifi/locations/Makefile.in
+--- kdenetwork-3.4.1.orig/wifi/locations/Makefile.in	2005-05-23 12:09:08.000000000 -0400
++++ kdenetwork-3.4.1/wifi/locations/Makefile.in	2005-05-24 13:47:24.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -18396,9 +22669,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-diff -Nrua kdenetwork-3.4.1.orig/wifi/Makefile.in kdenetwork-3.4.1/wifi/Makefile.in
---- kdenetwork-3.4.1.orig/wifi/Makefile.in	2005-05-23 18:09:08.000000000 +0200
-+++ kdenetwork-3.4.1/wifi/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+diff -Nru kdenetwork-3.4.1.orig/wifi/Makefile.in kdenetwork-3.4.1/wifi/Makefile.in
+--- kdenetwork-3.4.1.orig/wifi/Makefile.in	2005-05-23 12:09:08.000000000 -0400
++++ kdenetwork-3.4.1/wifi/Makefile.in	2005-05-24 13:47:24.000000000 -0400
 @@ -266,6 +266,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -18430,9 +22703,51 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-diff -Nrua kdenetwork-3.4.1.orig/wifi/pixmaps/Makefile.in kdenetwork-3.4.1/wifi/pixmaps/Makefile.in
---- kdenetwork-3.4.1.orig/wifi/pixmaps/Makefile.in	2005-05-23 18:09:08.000000000 +0200
-+++ kdenetwork-3.4.1/wifi/pixmaps/Makefile.in	2005-05-24 17:07:10.000000000 +0200
+@@ -1006,29 +1009,29 @@
+ 
+ #>+ 25
+ install-kde-icons:
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
+-	$(INSTALL_DATA) $(srcdir)/cr128-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kwifimanager.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
+-	$(INSTALL_DATA) $(srcdir)/crsc-app-kwifimanager.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kwifimanager.svgz
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr22-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kwifimanager.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/cr32-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwifimanager.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/cr16-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwifimanager.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr64-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kwifimanager.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/cr32-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwifimanager.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/cr48-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwifimanager.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/cr16-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwifimanager.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
++	$(INSTALL_DATA) $(srcdir)/cr128-app-kwifimanager.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kwifimanager.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
++	$(INSTALL_DATA) $(srcdir)/crsc-app-kwifimanager.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kwifimanager.svgz
+ 
+ uninstall-kde-icons:
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kwifimanager.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kwifimanager.svgz
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kwifimanager.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwifimanager.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwifimanager.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/kwifimanager.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kwifimanager.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/kwifimanager.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kwifimanager.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/kwifimanager.png
++	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/kwifimanager.svgz
+ 
+ #>+ 15
+ force-reedit:
+diff -Nru kdenetwork-3.4.1.orig/wifi/pixmaps/Makefile.in kdenetwork-3.4.1/wifi/pixmaps/Makefile.in
+--- kdenetwork-3.4.1.orig/wifi/pixmaps/Makefile.in	2005-05-23 12:09:08.000000000 -0400
++++ kdenetwork-3.4.1/wifi/pixmaps/Makefile.in	2005-05-24 13:47:24.000000000 -0400
 @@ -198,6 +198,9 @@
  LIB_XSS = @LIB_XSS@
  LN_S = @LN_S@
@@ -18464,3 +22779,12 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+@@ -601,7 +604,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=good.png no_card.png offline.png oor_minimum.png ad_hoc.svg marginal.png ap_connect.png no_card.svg ap_connect.svg Makefile.in all_alone.svg all_alone.png oor_down.png excellent.png ad_hoc.png Makefile.am 
++KDE_DIST=good.png no_card.png offline.png ad_hoc.svg oor_minimum.png marginal.png ap_connect.png no_card.svg ap_connect.svg Makefile.in all_alone.svg all_alone.png oor_down.png excellent.png ad_hoc.png Makefile.am 
+ 
+ #>+ 2
+ docs-am: