Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs

7 files changed, 186 insertions, 186 deletions

diff --git a/dcop/KDE-ICE/Xtrans.c b/dcop/KDE-ICE/Xtrans.c
index 371752919..b954d4b3b 100644
--- a/dcop/KDE-ICE/Xtrans.c
+++ b/dcop/KDE-ICE/Xtrans.c
@@ -144,7 +144,7 @@ void
 TRANS(FreeConnInfo) (XtransConnInfo ciptr)
 
 {
-    PRMSG (3,"FreeConnInfo(%x)\n", ciptr, 0, 0);
+    PRMSG (3,"[Xtrans] FreeConnInfo(%x)\n", ciptr, 0, 0);
 
     if (ciptr->addr)
 	xfree (ciptr->addr);
@@ -168,7 +168,7 @@ TRANS(SelectTransport) (char *protocol)
     char 	protobuf[PROTOBUFSIZE];
     int		i;
 
-    PRMSG (3,"SelectTransport(%s)\n", protocol, 0, 0);
+    PRMSG (3,"[Xtrans] SelectTransport(%s)\n", protocol, 0, 0);
 
     /*
      * Force Protocol to be lowercase as a way of doing
@@ -217,7 +217,7 @@ TRANS(ParseAddress) (char *address, char **protocol, char **host, char **port)
     char	*_protocol, *_host, *_port;
     char	hostnamebuf[256];
 
-    PRMSG (3,"ParseAddress(%s)\n", address, 0, 0);
+    PRMSG (3,"[Xtrans] ParseAddress(%s)\n", address, 0, 0);
 
     /* Copy the string so it can be changed */
 
@@ -383,12 +383,12 @@ TRANS(Open) (int type, char *address)
     XtransConnInfo	ciptr = NULL;
     Xtransport		*thistrans;
 
-    PRMSG (2,"Open(%d,%s)\n", type, address, 0);
+    PRMSG (2,"[Xtrans] Open(%d,%s)\n", type, address, 0);
 
 #if defined(_WIN32) && (defined(TCPCONN) || defined(DNETCONN))
     if (TRANS(WSAStartup)())
     {
-	PRMSG (1,"Open: WSAStartup failed\n", 0, 0, 0);
+	PRMSG (1,"[Xtrans] Open: WSAStartup failed\n", 0, 0, 0);
 	return NULL;
     }
 #endif
@@ -397,7 +397,7 @@ TRANS(Open) (int type, char *address)
 
     if (TRANS(ParseAddress) (address, &protocol, &host, &port) == 0)
     {
-	PRMSG (1,"Open: Unable to Parse address %s\n", address, 0, 0);
+	PRMSG (1,"[Xtrans] Open: Unable to Parse address %s\n", address, 0, 0);
 	return NULL;
     }
 
@@ -405,7 +405,7 @@ TRANS(Open) (int type, char *address)
 
     if ((thistrans = TRANS(SelectTransport) (protocol)) == NULL)
     {
-	PRMSG (1,"Open: Unable to find transport for %s\n",
+	PRMSG (1,"[Xtrans] Open: Unable to find transport for %s\n",
 	       protocol, 0, 0);
 
 	xfree (protocol);
@@ -439,14 +439,14 @@ TRANS(Open) (int type, char *address)
 #endif /* TRANS_SERVER */
 	break;
     default:
-	PRMSG (1,"Open: Unknown Open type %d\n", type, 0, 0);
+	PRMSG (1,"[Xtrans] Open: Unknown Open type %d\n", type, 0, 0);
     }
 
     if (ciptr == NULL)
     {
 	if (!(thistrans->flags & TRANS_DISABLED))
 	{
-	    PRMSG (1,"Open: transport open failed for %s/%s:%s\n",
+	    PRMSG (1,"[Xtrans] Open: transport open failed for %s/%s:%s\n",
 	           protocol, host, port);
 	}
 	xfree (protocol);
@@ -482,7 +482,7 @@ TRANS(Reopen) (int type, int trans_id, int fd, char *port)
     char		*save_port;
     int			i;
 
-    PRMSG (2,"Reopen(%d,%d,%s)\n", trans_id, fd, port);
+    PRMSG (2,"[Xtrans] Reopen(%d,%d,%s)\n", trans_id, fd, port);
 
     /* Determine the transport type */
 
@@ -495,7 +495,7 @@ TRANS(Reopen) (int type, int trans_id, int fd, char *port)
 
     if (thistrans == NULL)
     {
-	PRMSG (1,"Reopen: Unable to find transport id %d\n",
+	PRMSG (1,"[Xtrans] Reopen: Unable to find transport id %d\n",
 	       trans_id, 0, 0);
 
 	return NULL;
@@ -503,7 +503,7 @@ TRANS(Reopen) (int type, int trans_id, int fd, char *port)
 
     if ((save_port = (char *) xalloc (strlen (port) + 1)) == NULL)
     {
-	PRMSG (1,"Reopen: Unable to malloc port string\n", 0, 0, 0);
+	PRMSG (1,"[Xtrans] Reopen: Unable to malloc port string\n", 0, 0, 0);
 
 	return NULL;
     }
@@ -521,12 +521,12 @@ TRANS(Reopen) (int type, int trans_id, int fd, char *port)
 	ciptr = thistrans->ReopenCLTSServer(thistrans, fd, port);
 	break;
     default:
-	PRMSG (1,"Reopen: Bad Open type %d\n", type, 0, 0);
+	PRMSG (1,"[Xtrans] Reopen: Bad Open type %d\n", type, 0, 0);
     }
 
     if (ciptr == NULL)
     {
-	PRMSG (1,"Reopen: transport open failed\n", 0, 0, 0);
+	PRMSG (1,"[Xtrans] Reopen: transport open failed\n", 0, 0, 0);
 	return NULL;
     }
 
@@ -552,7 +552,7 @@ XtransConnInfo
 TRANS(OpenCOTSClient) (char *address)
 
 {
-    PRMSG (2,"OpenCOTSClient(%s)\n", address, 0, 0);
+    PRMSG (2,"[Xtrans] OpenCOTSClient(%s)\n", address, 0, 0);
     return TRANS(Open) (XTRANS_OPEN_COTS_CLIENT, address);
 }
 
@@ -565,7 +565,7 @@ XtransConnInfo
 TRANS(OpenCOTSServer) (char *address)
 
 {
-    PRMSG (2,"OpenCOTSServer(%s)\n", address, 0, 0);
+    PRMSG (2,"[Xtrans] OpenCOTSServer(%s)\n", address, 0, 0);
     return TRANS(Open) (XTRANS_OPEN_COTS_SERVER, address);
 }
 
@@ -578,7 +578,7 @@ XtransConnInfo
 TRANS(OpenCLTSClient) (char *address)
 
 {
-    PRMSG (2,"OpenCLTSClient(%s)\n", address, 0, 0);
+    PRMSG (2,"[Xtrans] OpenCLTSClient(%s)\n", address, 0, 0);
     return TRANS(Open) (XTRANS_OPEN_CLTS_CLIENT, address);
 }
 
@@ -591,7 +591,7 @@ XtransConnInfo
 TRANS(OpenCLTSServer) (char *address)
 
 {
-    PRMSG (2,"OpenCLTSServer(%s)\n", address, 0, 0);
+    PRMSG (2,"[Xtrans] OpenCLTSServer(%s)\n", address, 0, 0);
     return TRANS(Open) (XTRANS_OPEN_CLTS_SERVER, address);
 }
 
@@ -604,7 +604,7 @@ XtransConnInfo
 TRANS(ReopenCOTSServer) (int trans_id, int fd, char *port)
 
 {
-    PRMSG (2,"ReopenCOTSServer(%d, %d, %s)\n", trans_id, fd, port);
+    PRMSG (2,"[Xtrans] ReopenCOTSServer(%d, %d, %s)\n", trans_id, fd, port);
     return TRANS(Reopen) (XTRANS_OPEN_COTS_SERVER, trans_id, fd, port);
 }
 
@@ -612,7 +612,7 @@ XtransConnInfo
 TRANS(ReopenCLTSServer) (int trans_id, int fd, char *port)
 
 {
-    PRMSG (2,"ReopenCLTSServer(%d, %d, %s)\n", trans_id, fd, port);
+    PRMSG (2,"[Xtrans] ReopenCLTSServer(%d, %d, %s)\n", trans_id, fd, port);
     return TRANS(Reopen) (XTRANS_OPEN_CLTS_SERVER, trans_id, fd, port);
 }
 
@@ -652,7 +652,7 @@ TRANS(SetOption) (XtransConnInfo ciptr, int option, int arg)
     int	fd = ciptr->fd;
     int	ret = 0;
 
-    PRMSG (2,"SetOption(%d,%d,%d)\n", fd, option, arg);
+    PRMSG (2,"[Xtrans] SetOption(%d,%d,%d)\n", fd, option, arg);
 
     /*
      * For now, all transport type use the same stuff for setting options.
@@ -750,7 +750,7 @@ TRANS(NoListen) (char * protocol)
 
    if ((trans = TRANS(SelectTransport)(protocol)) == NULL)
    {
-	PRMSG (1,"TRANS(TransNoListen): unable to find transport: %s\n",
+	PRMSG (1,"[Xtrans] TRANS(TransNoListen): unable to find transport: %s\n",
 	       protocol, 0, 0);
 
 	return -1;
@@ -777,7 +777,7 @@ TRANS(Accept) (XtransConnInfo ciptr, int *status)
 {
     XtransConnInfo	newciptr;
 
-    PRMSG (2,"Accept(%d)\n", ciptr->fd, 0, 0);
+    PRMSG (2,"[Xtrans] Accept(%d)\n", ciptr->fd, 0, 0);
 
     newciptr = ciptr->transptr->Accept (ciptr, status);
 
@@ -801,18 +801,18 @@ TRANS(Connect) (XtransConnInfo ciptr, char *address)
     char	*port;
     int		ret;
 
-    PRMSG (2,"Connect(%d,%s)\n", ciptr->fd, address, 0);
+    PRMSG (2,"[Xtrans] Connect(%d,%s)\n", ciptr->fd, address, 0);
 
     if (TRANS(ParseAddress) (address, &protocol, &host, &port) == 0)
     {
-	PRMSG (1,"Connect: Unable to Parse address %s\n",
+	PRMSG (1,"[Xtrans] Connect: Unable to Parse address %s\n",
 	       address, 0, 0);
 	return -1;
     }
 
     if (!port || !*port)
     {
-	PRMSG (1,"Connect: Missing port specification in %s\n",
+	PRMSG (1,"[Xtrans] Connect: Missing port specification in %s\n",
 	      address, 0, 0);
 	if (protocol) xfree (protocol);
 	if (host) xfree (host);
@@ -879,7 +879,7 @@ TRANS(Close) (XtransConnInfo ciptr)
 {
     int ret;
 
-    PRMSG (2,"Close(%d)\n", ciptr->fd, 0, 0);
+    PRMSG (2,"[Xtrans] Close(%d)\n", ciptr->fd, 0, 0);
 
     ret = ciptr->transptr->Close (ciptr);
 
@@ -894,7 +894,7 @@ TRANS(CloseForCloning) (XtransConnInfo ciptr)
 {
     int ret;
 
-    PRMSG (2,"CloseForCloning(%d)\n", ciptr->fd, 0, 0);
+    PRMSG (2,"[Xtrans] CloseForCloning(%d)\n", ciptr->fd, 0, 0);
 
     ret = ciptr->transptr->CloseForCloning (ciptr);
 
@@ -916,14 +916,14 @@ TRANS(GetMyAddr) (XtransConnInfo ciptr, int *familyp, int *addrlenp,
 		  Xtransaddr **addrp)
 
 {
-    PRMSG (2,"GetMyAddr(%d)\n", ciptr->fd, 0, 0);
+    PRMSG (2,"[Xtrans] GetMyAddr(%d)\n", ciptr->fd, 0, 0);
 
     *familyp = ciptr->family;
     *addrlenp = ciptr->addrlen;
 
     if ((*addrp = (Xtransaddr *) xalloc (ciptr->addrlen)) == NULL)
     {
-	PRMSG (1,"GetMyAddr: malloc failed\n", 0, 0, 0);
+	PRMSG (1,"[Xtrans] GetMyAddr: malloc failed\n", 0, 0, 0);
 	return -1;
     }
     memcpy(*addrp, ciptr->addr, ciptr->addrlen);
@@ -936,14 +936,14 @@ TRANS(GetPeerAddr) (XtransConnInfo ciptr, int *familyp, int *addrlenp,
 		    Xtransaddr **addrp)
 
 {
-    PRMSG (2,"GetPeerAddr(%d)\n", ciptr->fd, 0, 0);
+    PRMSG (2,"[Xtrans] GetPeerAddr(%d)\n", ciptr->fd, 0, 0);
 
     *familyp = ciptr->family;
     *addrlenp = ciptr->peeraddrlen;
 
     if ((*addrp = (Xtransaddr *) xalloc (ciptr->peeraddrlen)) == NULL)
     {
-	PRMSG (1,"GetPeerAddr: malloc failed\n", 0, 0, 0);
+	PRMSG (1,"[Xtrans] GetPeerAddr: malloc failed\n", 0, 0, 0);
 	return -1;
     }
     memcpy(*addrp, ciptr->peeraddr, ciptr->peeraddrlen);
@@ -1006,7 +1006,7 @@ TRANS(MakeAllCOTSServerListeners) (char *port, int *partial, int *count_ret,
     XtransConnInfo	ciptr, temp_ciptrs[NUMTRANS];
     int			status, i, j;
 
-    PRMSG (2,"MakeAllCOTSServerListeners(%s,%x)\n",
+    PRMSG (2,"[Xtrans] MakeAllCOTSServerListeners(%s,%x)\n",
 	   port ? port : "NULL", ciptrs_ret, 0);
 
     *count_ret = 0;
@@ -1020,7 +1020,7 @@ TRANS(MakeAllCOTSServerListeners) (char *port, int *partial, int *count_ret,
 
 	snprintf(buffer, sizeof(buffer), "%s/:%s", trans->TransName, port ? port : "");
 
-	PRMSG (5,"MakeAllCOTSServerListeners: opening %s\n",
+	PRMSG (5,"[Xtrans] MakeAllCOTSServerListeners: opening %s\n",
 	       buffer, 0, 0);
 
 	if ((ciptr = TRANS(OpenCOTSServer(buffer))) == NULL)
@@ -1029,7 +1029,7 @@ TRANS(MakeAllCOTSServerListeners) (char *port, int *partial, int *count_ret,
 		continue;
 
 	    PRMSG (1,
-	  "MakeAllCOTSServerListeners: failed to open listener for %s\n",
+	  "[Xtrans] MakeAllCOTSServerListeners: failed to open listener for %s\n",
 		  trans->TransName, 0, 0);
 	    continue;
 	}
@@ -1045,7 +1045,7 @@ TRANS(MakeAllCOTSServerListeners) (char *port, int *partial, int *count_ret,
 		 */
 
 		PRMSG (1,
-		"MakeAllCOTSServerListeners: server already running\n",
+		"[Xtrans] MakeAllCOTSServerListeners: server already running\n",
 		  0, 0, 0);
 
 		for (j = 0; j < *count_ret; j++)
@@ -1059,7 +1059,7 @@ TRANS(MakeAllCOTSServerListeners) (char *port, int *partial, int *count_ret,
 	    else
 	    {
 		PRMSG (1,
-	"MakeAllCOTSServerListeners: failed to create listener for %s\n",
+	"[Xtrans] MakeAllCOTSServerListeners: failed to create listener for %s\n",
 		  trans->TransName, 0, 0);
 
 		continue;
@@ -1067,7 +1067,7 @@ TRANS(MakeAllCOTSServerListeners) (char *port, int *partial, int *count_ret,
 	}
 
 	PRMSG (5,
-	      "MakeAllCOTSServerListeners: opened listener for %s, %d\n",
+	      "[Xtrans] MakeAllCOTSServerListeners: opened listener for %s, %d\n",
 	      trans->TransName, ciptr->fd, 0);
 
 	temp_ciptrs[*count_ret] = ciptr;
@@ -1077,7 +1077,7 @@ TRANS(MakeAllCOTSServerListeners) (char *port, int *partial, int *count_ret,
     *partial = (*count_ret < complete_network_count());
 
     PRMSG (5,
-     "MakeAllCLTSServerListeners: partial=%d, actual=%d, complete=%d \n",
+     "[Xtrans] MakeAllCLTSServerListeners: partial=%d, actual=%d, complete=%d \n",
 	*partial, *count_ret, complete_network_count());
 
     if (*count_ret > 0)
@@ -1108,7 +1108,7 @@ TRANS(MakeAllCLTSServerListeners) (char *port, int *partial, int *count_ret,
     XtransConnInfo	ciptr, temp_ciptrs[NUMTRANS];
     int			status, i, j;
 
-    PRMSG (2,"MakeAllCLTSServerListeners(%s,%x)\n",
+    PRMSG (2,"[Xtrans] MakeAllCLTSServerListeners(%s,%x)\n",
 	port ? port : "NULL", ciptrs_ret, 0);
 
     *count_ret = 0;
@@ -1122,13 +1122,13 @@ TRANS(MakeAllCLTSServerListeners) (char *port, int *partial, int *count_ret,
 
 	snprintf(buffer, sizeof(buffer), "%s/:%s", trans->TransName, port ? port : "");
 
-	PRMSG (5,"MakeAllCLTSServerListeners: opening %s\n",
+	PRMSG (5,"[Xtrans] MakeAllCLTSServerListeners: opening %s\n",
 	    buffer, 0, 0);
 
 	if ((ciptr = TRANS(OpenCLTSServer (buffer))) == NULL)
 	{
 	    PRMSG (1,
-	"MakeAllCLTSServerListeners: failed to open listener for %s\n",
+	"[Xtrans] MakeAllCLTSServerListeners: failed to open listener for %s\n",
 		  trans->TransName, 0, 0);
 	    continue;
 	}
@@ -1144,7 +1144,7 @@ TRANS(MakeAllCLTSServerListeners) (char *port, int *partial, int *count_ret,
 		 */
 
 		PRMSG (1,
-		"MakeAllCLTSServerListeners: server already running\n",
+		"[Xtrans] MakeAllCLTSServerListeners: server already running\n",
 		  0, 0, 0);
 
 		for (j = 0; j < *count_ret; j++)
@@ -1158,7 +1158,7 @@ TRANS(MakeAllCLTSServerListeners) (char *port, int *partial, int *count_ret,
 	    else
 	    {
 		PRMSG (1,
-	"MakeAllCLTSServerListeners: failed to create listener for %s\n",
+	"[Xtrans] MakeAllCLTSServerListeners: failed to create listener for %s\n",
 		  trans->TransName, 0, 0);
 
 		continue;
@@ -1166,7 +1166,7 @@ TRANS(MakeAllCLTSServerListeners) (char *port, int *partial, int *count_ret,
 	}
 
 	PRMSG (5,
-	"MakeAllCLTSServerListeners: opened listener for %s, %d\n",
+	"[Xtrans] MakeAllCLTSServerListeners: opened listener for %s, %d\n",
 	      trans->TransName, ciptr->fd, 0);
 	temp_ciptrs[*count_ret] = ciptr;
 	(*count_ret)++;
@@ -1175,7 +1175,7 @@ TRANS(MakeAllCLTSServerListeners) (char *port, int *partial, int *count_ret,
     *partial = (*count_ret < complete_network_count());
 
     PRMSG (5,
-     "MakeAllCLTSServerListeners: partial=%d, actual=%d, complete=%d \n",
+     "[Xtrans] MakeAllCLTSServerListeners: partial=%d, actual=%d, complete=%d \n",
 	*partial, *count_ret, complete_network_count());
 
     if (*count_ret > 0)
diff --git a/dcop/KDE-ICE/Xtranssock.c b/dcop/KDE-ICE/Xtranssock.c
index 7b14ca9ab..bb6d122bc 100644
--- a/dcop/KDE-ICE/Xtranssock.c
+++ b/dcop/KDE-ICE/Xtranssock.c
@@ -279,7 +279,7 @@ TRANS(SocketSelectFamily) (char *family)
 {
     int     i;
 
-    PRMSG (3,(const char*)"SocketSelectFamily(%s)\n", family, 0, 0);
+    PRMSG (3,(const char*)"[Xtranssock] SocketSelectFamily(%s)\n", family, 0, 0);
 
     for (i = 0; i < (int) NUMSOCKETFAMILIES;i++)
     {
@@ -307,11 +307,11 @@ TRANS(SocketINETGetAddr) (XtransConnInfo ciptr)
     int namelen = sizeof sockname;
 #endif
 
-    PRMSG (3,"SocketINETGetAddr(%x)\n", ciptr, 0, 0);
+    PRMSG (3,"[Xtranssock] SocketINETGetAddr(%x)\n", ciptr, 0, 0);
 
     if (getsockname (ciptr->fd,(struct sockaddr *) &sockname, &namelen) < 0)
     {
-	PRMSG (1,"SocketINETGetAddr: getsockname() failed: %d\n",
+	PRMSG (1,"[Xtranssock] SocketINETGetAddr: getsockname() failed: %d\n",
 	    EGET(),0, 0);
 	return -1;
     }
@@ -323,7 +323,7 @@ TRANS(SocketINETGetAddr) (XtransConnInfo ciptr)
     if ((ciptr->addr = (char *) xalloc (namelen)) == NULL)
     {
         PRMSG (1,
-	    "SocketINETGetAddr: Can't allocate space for the addr\n",
+	    "[Xtranssock] SocketINETGetAddr: Can't allocate space for the addr\n",
 	    0, 0, 0);
         return -1;
     }
@@ -352,11 +352,11 @@ TRANS(SocketINETGetPeerAddr) (XtransConnInfo ciptr)
     int namelen = sizeof sockname;
 #endif
 
-    PRMSG (3,"SocketINETGetPeerAddr(%x)\n", ciptr, 0, 0);
+    PRMSG (3,"[Xtranssock] SocketINETGetPeerAddr(%x)\n", ciptr, 0, 0);
 
     if (getpeername (ciptr->fd, (struct sockaddr *) &sockname, &namelen) < 0)
     {
-	PRMSG (1,"SocketINETGetPeerAddr: getpeername() failed: %d\n",
+	PRMSG (1,"[Xtranssock] SocketINETGetPeerAddr: getpeername() failed: %d\n",
 	    EGET(), 0, 0);
 	return -1;
     }
@@ -368,7 +368,7 @@ TRANS(SocketINETGetPeerAddr) (XtransConnInfo ciptr)
     if ((ciptr->peeraddr = (char *) xalloc (namelen)) == NULL)
     {
         PRMSG (1,
-	   "SocketINETGetPeerAddr: Can't allocate space for the addr\n",
+	   "[Xtranssock] SocketINETGetPeerAddr: Can't allocate space for the addr\n",
 	   0, 0, 0);
         return -1;
     }
@@ -386,19 +386,19 @@ TRANS(SocketOpen) (int i, int type)
 {
     XtransConnInfo	ciptr;
 
-    PRMSG (3,"SocketOpen(%d,%d)\n", i, type, 0);
+    PRMSG (3,"[Xtranssock] SocketOpen(%d,%d)\n", i, type, 0);
 
     if ((ciptr = (XtransConnInfo) xcalloc (
 	1, sizeof(struct _XtransConnInfo))) == NULL)
     {
-	PRMSG (1, "SocketOpen: malloc failed\n", 0, 0, 0);
+	PRMSG (1, "[Xtranssock] SocketOpen: malloc failed\n", 0, 0, 0);
 	return NULL;
     }
 
     if ((ciptr->fd = socket(Sockettrans2devtab[i].family, type,
 	Sockettrans2devtab[i].protocol)) < 0
       ) {
-	PRMSG (1, "SocketOpen: socket() failed for %s\n",
+	PRMSG (1, "[Xtranssock] SocketOpen: socket() failed for %s\n",
 	    Sockettrans2devtab[i].transname, 0, 0);
 
 	xfree ((char *) ciptr);
@@ -430,12 +430,12 @@ TRANS(SocketReopen) (int i, int type, int fd, char *port)
 {
     XtransConnInfo	ciptr;
 
-    PRMSG (3,"SocketReopen(%d,%d,%s)\n", type, fd, port);
+    PRMSG (3,"[Xtranssock] SocketReopen(%d,%d,%s)\n", type, fd, port);
 
     if ((ciptr = (XtransConnInfo) xcalloc (
 	1, sizeof(struct _XtransConnInfo))) == NULL)
     {
-	PRMSG (1, "SocketReopen: malloc failed\n", 0, 0, 0);
+	PRMSG (1, "[Xtranssock] SocketReopen: malloc failed\n", 0, 0, 0);
 	return NULL;
     }
 
@@ -461,7 +461,7 @@ TRANS(SocketOpenCOTSClient) (Xtransport *thistrans, char *protocol,
     XtransConnInfo	ciptr;
     int			i;
 
-    PRMSG (2, "SocketOpenCOTSClient(%s,%s,%s)\n",
+    PRMSG (2, "[Xtranssock] SocketOpenCOTSClient(%s,%s,%s)\n",
 	protocol, host, port);
 
     SocketInitOnce();
@@ -469,7 +469,7 @@ TRANS(SocketOpenCOTSClient) (Xtransport *thistrans, char *protocol,
     if ((i = TRANS(SocketSelectFamily) (thistrans->TransName)) < 0)
     {
 	PRMSG (1,
-       "SocketOpenCOTSClient: Unable to determine socket type for %s\n",
+       "[Xtranssock] SocketOpenCOTSClient: Unable to determine socket type for %s\n",
 	    thistrans->TransName, 0, 0);
 	return NULL;
     }
@@ -477,7 +477,7 @@ TRANS(SocketOpenCOTSClient) (Xtransport *thistrans, char *protocol,
     if ((ciptr = TRANS(SocketOpen) (
 	i, Sockettrans2devtab[i].devcotsname)) == NULL)
     {
-	PRMSG (1,"SocketOpenCOTSClient: Unable to open socket for %s\n",
+	PRMSG (1,"[Xtranssock] SocketOpenCOTSClient: Unable to open socket for %s\n",
 	    thistrans->TransName, 0, 0);
 	return NULL;
     }
@@ -502,14 +502,14 @@ TRANS(SocketOpenCOTSServer) (Xtransport *thistrans, char *protocol,
     XtransConnInfo	ciptr;
     int	i;
 
-    PRMSG (2,"SocketOpenCOTSServer(%s,%s,%s)\n", protocol, host, port);
+    PRMSG (2,"[Xtranssock] SocketOpenCOTSServer(%s,%s,%s)\n", protocol, host, port);
 
     SocketInitOnce();
 
     if ((i = TRANS(SocketSelectFamily) (thistrans->TransName)) < 0)
     {
 	PRMSG (1,
-       "SocketOpenCOTSServer: Unable to determine socket type for %s\n",
+       "[Xtranssock] SocketOpenCOTSServer: Unable to determine socket type for %s\n",
 	    thistrans->TransName, 0, 0);
 	return NULL;
     }
@@ -517,7 +517,7 @@ TRANS(SocketOpenCOTSServer) (Xtransport *thistrans, char *protocol,
     if ((ciptr = TRANS(SocketOpen) (
 	i, Sockettrans2devtab[i].devcotsname)) == NULL)
     {
-	PRMSG (1,"SocketOpenCOTSServer: Unable to open socket for %s\n",
+	PRMSG (1,"[Xtranssock] SocketOpenCOTSServer: Unable to open socket for %s\n",
 	    thistrans->TransName, 0, 0);
 	return NULL;
     }
@@ -560,14 +560,14 @@ TRANS(SocketOpenCLTSClient) (Xtransport *thistrans, char *protocol,
     XtransConnInfo	ciptr;
     int			i;
 
-    PRMSG (2,"SocketOpenCLTSClient(%s,%s,%s)\n", protocol, host, port);
+    PRMSG (2,"[Xtranssock] SocketOpenCLTSClient(%s,%s,%s)\n", protocol, host, port);
 
     SocketInitOnce();
 
     if ((i = TRANS(SocketSelectFamily) (thistrans->TransName)) < 0)
     {
 	PRMSG (1,
-       "SocketOpenCLTSClient: Unable to determine socket type for %s\n",
+       "[Xtranssock] SocketOpenCLTSClient: Unable to determine socket type for %s\n",
 	    thistrans->TransName, 0, 0);
 	return NULL;
     }
@@ -575,7 +575,7 @@ TRANS(SocketOpenCLTSClient) (Xtransport *thistrans, char *protocol,
     if ((ciptr = TRANS(SocketOpen) (
 	i, Sockettrans2devtab[i].devcotsname)) == NULL)
     {
-	PRMSG (1,"SocketOpenCLTSClient: Unable to open socket for %s\n",
+	PRMSG (1,"[Xtranssock] SocketOpenCLTSClient: Unable to open socket for %s\n",
 	      thistrans->TransName, 0, 0);
 	return NULL;
     }
@@ -600,14 +600,14 @@ TRANS(SocketOpenCLTSServer) (Xtransport *thistrans, char *protocol,
     XtransConnInfo	ciptr;
     int	i;
 
-    PRMSG (2,"SocketOpenCLTSServer(%s,%s,%s)\n", protocol, host, port);
+    PRMSG (2,"[Xtranssock] SocketOpenCLTSServer(%s,%s,%s)\n", protocol, host, port);
 
     SocketInitOnce();
 
     if ((i = TRANS(SocketSelectFamily) (thistrans->TransName)) < 0)
     {
 	PRMSG (1,
-       "SocketOpenCLTSServer: Unable to determine socket type for %s\n",
+       "[Xtranssock] SocketOpenCLTSServer: Unable to determine socket type for %s\n",
 	      thistrans->TransName, 0, 0);
 	return NULL;
     }
@@ -615,7 +615,7 @@ TRANS(SocketOpenCLTSServer) (Xtransport *thistrans, char *protocol,
     if ((ciptr = TRANS(SocketOpen) (
 	i, Sockettrans2devtab[i].devcotsname)) == NULL)
     {
-	PRMSG (1,"SocketOpenCLTSServer: Unable to open socket for %s\n",
+	PRMSG (1,"[Xtranssock] SocketOpenCLTSServer: Unable to open socket for %s\n",
 	      thistrans->TransName, 0, 0);
 	return NULL;
     }
@@ -640,14 +640,14 @@ TRANS(SocketReopenCOTSServer) (Xtransport *thistrans, int fd, char *port)
     int			i;
 
     PRMSG (2,
-	"SocketReopenCOTSServer(%d, %s)\n", fd, port, 0);
+	"[Xtranssock] SocketReopenCOTSServer(%d, %s)\n", fd, port, 0);
 
     SocketInitOnce();
 
     if ((i = TRANS(SocketSelectFamily) (thistrans->TransName)) < 0)
     {
 	PRMSG (1,
-       "SocketReopenCOTSServer: Unable to determine socket type for %s\n",
+       "[Xtranssock] SocketReopenCOTSServer: Unable to determine socket type for %s\n",
 	    thistrans->TransName, 0, 0);
 	return NULL;
     }
@@ -656,7 +656,7 @@ TRANS(SocketReopenCOTSServer) (Xtransport *thistrans, int fd, char *port)
 	i, Sockettrans2devtab[i].devcotsname, fd, port)) == NULL)
     {
 	PRMSG (1,
-	    "SocketReopenCOTSServer: Unable to reopen socket for %s\n",
+	    "[Xtranssock] SocketReopenCOTSServer: Unable to reopen socket for %s\n",
 	    thistrans->TransName, 0, 0);
 	return NULL;
     }
@@ -676,14 +676,14 @@ TRANS(SocketReopenCLTSServer) (Xtransport *thistrans, int fd, char *port)
     int			i;
 
     PRMSG (2,
-	"SocketReopenCLTSServer(%d, %s)\n", fd, port, 0);
+	"[Xtranssock] SocketReopenCLTSServer(%d, %s)\n", fd, port, 0);
 
     SocketInitOnce();
 
     if ((i = TRANS(SocketSelectFamily) (thistrans->TransName)) < 0)
     {
 	PRMSG (1,
-       "SocketReopenCLTSServer: Unable to determine socket type for %s\n",
+       "[Xtranssock] SocketReopenCLTSServer: Unable to determine socket type for %s\n",
 	      thistrans->TransName, 0, 0);
 	return NULL;
     }
@@ -692,7 +692,7 @@ TRANS(SocketReopenCLTSServer) (Xtransport *thistrans, int fd, char *port)
 	i, Sockettrans2devtab[i].devcotsname, fd, port)) == NULL)
     {
 	PRMSG (1,
-	     "SocketReopenCLTSServer: Unable to reopen socket for %s\n",
+	     "[Xtranssock] SocketReopenCLTSServer: Unable to reopen socket for %s\n",
 	     thistrans->TransName, 0, 0);
 	return NULL;
     }
@@ -711,7 +711,7 @@ static int
 TRANS(SocketSetOption) (XtransConnInfo ciptr, int option, int arg)
 
 {
-    PRMSG (2,"SocketSetOption(%d,%d,%d)\n", ciptr->fd, option, arg);
+    PRMSG (2,"[Xtranssock] SocketSetOption(%d,%d,%d)\n", ciptr->fd, option, arg);
 
     return -1;
 }
@@ -750,7 +750,7 @@ TRANS(SocketCreateListener) (XtransConnInfo ciptr,
     int	fd = ciptr->fd;
     int	retry;
 
-    PRMSG (3, "SocketCreateListener(%x,%d)\n", ciptr, fd, 0);
+    PRMSG (3, "[Xtranssock] SocketCreateListener(%x,%d)\n", ciptr, fd, 0);
 
     if (Sockettrans2devtab[ciptr->index].family == AF_INET)
 	retry = 20;
@@ -763,7 +763,7 @@ TRANS(SocketCreateListener) (XtransConnInfo ciptr,
 	    return TRANS_ADDR_IN_USE;
 
 	if (retry-- == 0) {
-	    PRMSG (1, "SocketCreateListener: failed to bind listener\n",
+	    PRMSG (1, "[Xtranssock] SocketCreateListener: failed to bind listener\n",
 		0, 0, 0);
 	    close (fd);
 	    return TRANS_CREATE_LISTENER_FAILED;
@@ -791,7 +791,7 @@ TRANS(SocketCreateListener) (XtransConnInfo ciptr,
 
     if (listen (fd, BACKLOG) < 0)
     {
-	PRMSG (1, "SocketCreateListener: listen() failed\n", 0, 0, 0);
+	PRMSG (1, "[Xtranssock] SocketCreateListener: listen() failed\n", 0, 0, 0);
 	close (fd);
 	return TRANS_CREATE_LISTENER_FAILED;
     }
@@ -818,7 +818,7 @@ TRANS(SocketINETCreateListener) (XtransConnInfo ciptr, char *port)
     char	portbuf[PORTBUFSIZE];
 #endif
 
-    PRMSG (2, "SocketINETCreateListener(%s)\n", port, 0, 0);
+    PRMSG (2, "[Xtranssock] SocketINETCreateListener(%s)\n", port, 0, 0);
 
 #ifdef X11_t
     /*
@@ -848,7 +848,7 @@ TRANS(SocketINETCreateListener) (XtransConnInfo ciptr, char *port)
 	    if ((servp = getservbyname (port,"tcp")) == NULL)
 	    {
 		PRMSG (1,
-	     "SocketINETCreateListener: Unable to get service for %s\n",
+	     "[Xtranssock] SocketINETCreateListener: Unable to get service for %s\n",
 		      port, 0, 0);
 		return TRANS_CREATE_LISTENER_FAILED;
 	    }
@@ -883,7 +883,7 @@ TRANS(SocketINETCreateListener) (XtransConnInfo ciptr, char *port)
 	(struct sockaddr *) &sockname, namelen)) < 0)
     {
 	PRMSG (1,
-    "SocketINETCreateListener: ...SocketCreateListener() failed\n",
+    "[Xtranssock] SocketINETCreateListener: ...SocketCreateListener() failed\n",
 	    0, 0, 0);
 	return status;
     }
@@ -891,7 +891,7 @@ TRANS(SocketINETCreateListener) (XtransConnInfo ciptr, char *port)
     if (TRANS(SocketINETGetAddr) (ciptr) < 0)
     {
 	PRMSG (1,
-       "SocketINETCreateListener: ...SocketINETGetAddr() failed\n",
+       "[Xtranssock] SocketINETCreateListener: ...SocketINETGetAddr() failed\n",
 	    0, 0, 0);
 	return TRANS_CREATE_LISTENER_FAILED;
     }
@@ -914,7 +914,7 @@ TRANS(SocketUNIXCreateListener) (XtransConnInfo ciptr, char *port)
     int			status;
     unsigned int	mode;
 
-    PRMSG (2, "SocketUNIXCreateListener(%s)\n",
+    PRMSG (2, "[Xtranssock] SocketUNIXCreateListener(%s)\n",
 	port ? port : "NULL", 0, 0);
 
     /* Make sure the directory is created */
@@ -928,7 +928,7 @@ TRANS(SocketUNIXCreateListener) (XtransConnInfo ciptr, char *port)
     mode = 0777;
 #endif
     if (trans_mkdir((char*)UNIX_DIR, mode) == -1) {
-	PRMSG (1, "SocketUNIXCreateListener: mkdir(%s) failed, errno = %d\n",
+	PRMSG (1, "[Xtranssock] SocketUNIXCreateListener: mkdir(%s) failed, errno = %d\n",
 	       UNIX_DIR, errno, 0);
 	(void) umask (oldUmask);
 	return TRANS_CREATE_LISTENER_FAILED;
@@ -939,7 +939,7 @@ TRANS(SocketUNIXCreateListener) (XtransConnInfo ciptr, char *port)
 
     if (port && *port) {
 	if (set_sun_path(port, UNIX_PATH, sockname.sun_path) != 0) {
-	    PRMSG (1, "SocketUNIXCreateListener: path too long\n", 0, 0, 0);
+	    PRMSG (1, "[Xtranssock] SocketUNIXCreateListener: path too long\n", 0, 0, 0);
 	    return TRANS_CREATE_LISTENER_FAILED;
 	}
     } else {
@@ -958,7 +958,7 @@ TRANS(SocketUNIXCreateListener) (XtransConnInfo ciptr, char *port)
 	(struct sockaddr *) &sockname, namelen)) < 0)
     {
 	PRMSG (1,
-    "SocketUNIXCreateListener: ...SocketCreateListener() failed\n",
+    "[Xtranssock] SocketUNIXCreateListener: ...SocketCreateListener() failed\n",
 	    0, 0, 0);
 	return status;
     }
@@ -975,7 +975,7 @@ TRANS(SocketUNIXCreateListener) (XtransConnInfo ciptr, char *port)
     if ((ciptr->addr = (char *) xalloc (namelen)) == NULL)
     {
         PRMSG (1,
-        "SocketUNIXCreateListener: Can't allocate space for the addr\n",
+        "[Xtranssock] SocketUNIXCreateListener: Can't allocate space for the addr\n",
 	    0, 0, 0);
         return TRANS_CREATE_LISTENER_FAILED;
     }
@@ -1001,7 +1001,7 @@ TRANS(SocketUNIXResetListener) (XtransConnInfo ciptr)
     int 		status = TRANS_RESET_NOOP;
     unsigned int	mode;
 
-    PRMSG (3, "SocketUNIXResetListener(%x,%d)\n", ciptr, ciptr->fd, 0);
+    PRMSG (3, "[Xtranssock] SocketUNIXResetListener(%x,%d)\n", ciptr, ciptr->fd, 0);
 
     if (stat (unsock->sun_path, &statb) == -1 ||
         ((statb.st_mode & S_IFMT) !=
@@ -1020,7 +1020,7 @@ TRANS(SocketUNIXResetListener) (XtransConnInfo ciptr)
 	mode = 0777;
 #endif
         if (trans_mkdir((char*)UNIX_DIR, mode) == -1) {
-            PRMSG (1, "SocketUNIXResetListener: mkdir(%s) failed, errno = %d\n",
+            PRMSG (1, "[Xtranssock] SocketUNIXResetListener: mkdir(%s) failed, errno = %d\n",
 	    UNIX_DIR, errno, 0);
 	    (void) umask (oldUmask);
 	    return TRANS_RESET_FAILURE;
@@ -1077,12 +1077,12 @@ TRANS(SocketINETAccept) (XtransConnInfo ciptr, int *status)
     int namelen = sizeof(sockname);
 #endif
 
-    PRMSG (2, "SocketINETAccept(%p,%d)\n", ciptr, ciptr->fd, 0);
+    PRMSG (2, "[Xtranssock] SocketINETAccept(%p,%d)\n", ciptr, ciptr->fd, 0);
 
     if ((newciptr = (XtransConnInfo) xcalloc (
 	1, sizeof(struct _XtransConnInfo))) == NULL)
     {
-	PRMSG (1, "SocketINETAccept: malloc failed\n", 0, 0, 0);
+	PRMSG (1, "[Xtranssock] SocketINETAccept: malloc failed\n", 0, 0, 0);
 	*status = TRANS_ACCEPT_BAD_MALLOC;
 	return NULL;
     }
@@ -1090,7 +1090,7 @@ TRANS(SocketINETAccept) (XtransConnInfo ciptr, int *status)
     if ((newciptr->fd = accept (ciptr->fd,
 	(struct sockaddr *) &sockname, &namelen)) < 0)
     {
-	PRMSG (1, "SocketINETAccept: accept() failed\n", 0, 0, 0);
+	PRMSG (1, "[Xtranssock] SocketINETAccept: accept() failed\n", 0, 0, 0);
 	xfree (newciptr);
 	*status = TRANS_ACCEPT_FAILED;
 	return NULL;
@@ -1116,7 +1116,7 @@ TRANS(SocketINETAccept) (XtransConnInfo ciptr, int *status)
     if (TRANS(SocketINETGetAddr) (newciptr) < 0)
     {
 	PRMSG (1,
-	    "SocketINETAccept: ...SocketINETGetAddr() failed:\n",
+	    "[Xtranssock] SocketINETAccept: ...SocketINETGetAddr() failed:\n",
 	    0, 0, 0);
 	close (newciptr->fd);
 	xfree (newciptr);
@@ -1127,7 +1127,7 @@ TRANS(SocketINETAccept) (XtransConnInfo ciptr, int *status)
     if (TRANS(SocketINETGetPeerAddr) (newciptr) < 0)
     {
 	PRMSG (1,
-	  "SocketINETAccept: ...SocketINETGetPeerAddr() failed:\n",
+	  "[Xtranssock] SocketINETAccept: ...SocketINETGetPeerAddr() failed:\n",
 		0, 0, 0);
 	close (newciptr->fd);
 	if (newciptr->addr) xfree (newciptr->addr);
@@ -1157,12 +1157,12 @@ TRANS(SocketUNIXAccept) (XtransConnInfo ciptr, int *status)
     int namelen = sizeof sockname;
 #endif
 
-    PRMSG (2, "SocketUNIXAccept(%p,%d)\n", ciptr, ciptr->fd, 0);
+    PRMSG (2, "[Xtranssock] SocketUNIXAccept(%p,%d)\n", ciptr, ciptr->fd, 0);
 
     if ((newciptr = (XtransConnInfo) xcalloc (
 	1, sizeof(struct _XtransConnInfo))) == NULL)
     {
-	PRMSG (1, "SocketUNIXAccept: malloc() failed\n", 0, 0, 0);
+	PRMSG (1, "[Xtranssock] SocketUNIXAccept: malloc() failed\n", 0, 0, 0);
 	*status = TRANS_ACCEPT_BAD_MALLOC;
 	return NULL;
     }
@@ -1170,7 +1170,7 @@ TRANS(SocketUNIXAccept) (XtransConnInfo ciptr, int *status)
     if ((newciptr->fd = accept (ciptr->fd,
 	(struct sockaddr *) &sockname, &namelen)) < 0)
     {
-	PRMSG (1, "SocketUNIXAccept: accept() failed\n", 0, 0, 0);
+	PRMSG (1, "[Xtranssock] SocketUNIXAccept: accept() failed\n", 0, 0, 0);
 	xfree (newciptr);
 	*status = TRANS_ACCEPT_FAILED;
 	return NULL;
@@ -1184,7 +1184,7 @@ TRANS(SocketUNIXAccept) (XtransConnInfo ciptr, int *status)
     if ((newciptr->addr = (char *) xalloc (ciptr->addrlen)) == NULL)
     {
         PRMSG (1,
-        "SocketUNIXAccept: Can't allocate space for the addr\n",
+        "[Xtranssock] SocketUNIXAccept: Can't allocate space for the addr\n",
 	      0, 0, 0);
 	close (newciptr->fd);
 	xfree (newciptr);
@@ -1199,7 +1199,7 @@ TRANS(SocketUNIXAccept) (XtransConnInfo ciptr, int *status)
     if ((newciptr->peeraddr = (char *) xalloc (ciptr->addrlen)) == NULL)
     {
         PRMSG (1,
-	      "SocketUNIXAccept: Can't allocate space for the addr\n",
+	      "[Xtranssock] SocketUNIXAccept: Can't allocate space for the addr\n",
 	      0, 0, 0);
 	close (newciptr->fd);
 	if (newciptr->addr) xfree (newciptr->addr);
@@ -1247,7 +1247,7 @@ TRANS(SocketINETConnect) (XtransConnInfo ciptr, char *host, char *port)
     unsigned long 	tmpaddr;
     char 		hostnamebuf[256];		/* tmp space */
 
-    PRMSG (2,"SocketINETConnect(%d,%s,%s)\n", ciptr->fd, host, port);
+    PRMSG (2,"[Xtranssock] SocketINETConnect(%d,%s,%s)\n", ciptr->fd, host, port);
 
     if (!host)
     {
@@ -1295,7 +1295,7 @@ TRANS(SocketINETConnect) (XtransConnInfo ciptr, char *host, char *port)
 	tmpaddr = -1;
     }
 
-    PRMSG (4,"SocketINETConnect: inet_addr(%s) = %x\n",
+    PRMSG (4,"[Xtranssock] SocketINETConnect: inet_addr(%s) = %x\n",
 	host, tmpaddr, 0);
 
     if (tmpaddr == -1)
@@ -1306,14 +1306,14 @@ TRANS(SocketINETConnect) (XtransConnInfo ciptr, char *host, char *port)
 	if ((hostp = gethostbyname(host,hparams)) == NULL)
 #endif
 	{
-	    PRMSG (1,"SocketINETConnect: Can't get address for %s\n",
+	    PRMSG (1,"[Xtranssock] SocketINETConnect: Can't get address for %s\n",
 		  host, 0, 0);
 	    ESET(EINVAL);
 	    return TRANS_CONNECT_FAILED;
 	}
 	if (hostp->h_addrtype != AF_INET)  /* is IP host? */
 	{
-	    PRMSG (1,"SocketINETConnect: not INET host%s\n",
+	    PRMSG (1,"[Xtranssock] SocketINETConnect: not INET host%s\n",
 		  host, 0, 0);
 	    ESET(EPROTOTYPE);
 	    return TRANS_CONNECT_FAILED;
@@ -1352,7 +1352,7 @@ else
     {
 	if ((servp = getservbyname (port,"tcp")) == NULL)
 	{
-	    PRMSG (1,"SocketINETConnect: can't get service for %s\n",
+	    PRMSG (1,"[Xtranssock] SocketINETConnect: can't get service for %s\n",
 		  port, 0, 0);
 	    return TRANS_CONNECT_FAILED;
 	}
@@ -1366,7 +1366,7 @@ else
 	sockname.sin_port = htons (((unsigned short) tmpport));
     }
 
-    PRMSG (4,"SocketINETConnect: sockname.sin_port = %d\n",
+    PRMSG (4,"[Xtranssock] SocketINETConnect: sockname.sin_port = %d\n",
 	  ntohs(sockname.sin_port), 0, 0);
 
     /*
@@ -1398,7 +1398,7 @@ else
 	    return TRANS_IN_PROGRESS;
 	else
 	{
-	    PRMSG (2,"SocketINETConnect: Can't connect: errno = %d\n",
+	    PRMSG (2,"[Xtranssock] SocketINETConnect: Can't connect: errno = %d\n",
 		   olderrno,0, 0);
 
 	    return TRANS_CONNECT_FAILED;
@@ -1413,7 +1413,7 @@ else
     if (TRANS(SocketINETGetAddr) (ciptr) < 0)
     {
 	PRMSG (1,
-	   "SocketINETConnect: ...SocketINETGetAddr() failed:\n",
+	   "[Xtranssock] SocketINETConnect: ...SocketINETGetAddr() failed:\n",
 	   0, 0, 0);
 	return TRANS_CONNECT_FAILED;
     }
@@ -1421,7 +1421,7 @@ else
     if (TRANS(SocketINETGetPeerAddr) (ciptr) < 0)
     {
 	PRMSG (1,
-	 "SocketINETConnect: ...SocketINETGetPeerAddr() failed:\n",
+	 "[Xtranssock] SocketINETConnect: ...SocketINETGetPeerAddr() failed:\n",
 	      0, 0, 0);
 	return TRANS_CONNECT_FAILED;
     }
@@ -1540,7 +1540,7 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port)
 #endif
 
 
-    PRMSG (2,"SocketUNIXConnect(%d,%s,%s)\n", ciptr->fd, host, port);
+    PRMSG (2,"[Xtranssock] SocketUNIXConnect(%d,%s,%s)\n", ciptr->fd, host, port);
 
     /*
      * Make sure 'host' is really local.  If not, we return failure.
@@ -1553,7 +1553,7 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port)
     if (strcmp (host, "unix") != 0 && !UnixHostReallyLocal (host))
     {
 	PRMSG (1,
-	   "SocketUNIXConnect: Cannot connect to non-local host %s\n",
+	   "[Xtranssock] SocketUNIXConnect: Cannot connect to non-local host %s\n",
 	       host, 0, 0);
 	return TRANS_CONNECT_FAILED;
     }
@@ -1565,7 +1565,7 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port)
 
     if (!port || !*port)
     {
-	PRMSG (1,"SocketUNIXConnect: Missing port specification\n",
+	PRMSG (1,"[Xtranssock] SocketUNIXConnect: Missing port specification\n",
 	      0, 0, 0);
 	return TRANS_CONNECT_FAILED;
     }
@@ -1577,7 +1577,7 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port)
     sockname.sun_family = AF_UNIX;
 
     if (set_sun_path(port, UNIX_PATH, sockname.sun_path) != 0) {
-	PRMSG (1, "SocketUNIXConnect: path too long\n", 0, 0, 0);
+	PRMSG (1, "[Xtranssock] SocketUNIXConnect: path too long\n", 0, 0, 0);
 	return TRANS_CONNECT_FAILED;
     }
 
@@ -1592,7 +1592,7 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port)
      */
     old_sockname.sun_family = AF_UNIX;
     if (set_sun_path(port, OLD_UNIX_PATH, old_sockname.sun_path) != 0) {
-	PRMSG (1, "SocketUNIXConnect: path too long\n", 0, 0, 0);
+	PRMSG (1, "[Xtranssock] SocketUNIXConnect: path too long\n", 0, 0, 0);
 	return TRANS_CONNECT_FAILED;
     }
     old_namelen = strlen (old_sockname.sun_path) +
@@ -1642,7 +1642,7 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port)
 		return TRANS_IN_PROGRESS;
 	    else
 	    {
-		PRMSG (2,"SocketUNIXConnect: Can't connect: errno = %d\n",
+		PRMSG (2,"[Xtranssock] SocketUNIXConnect: Can't connect: errno = %d\n",
 		       EGET(),0, 0);
 
 		return TRANS_CONNECT_FAILED;
@@ -1659,7 +1659,7 @@ TRANS(SocketUNIXConnect) (XtransConnInfo ciptr, char *host, char *port)
        (ciptr->peeraddr = (char *) xalloc(namelen)) == NULL)
     {
         PRMSG (1,
-	"SocketUNIXCreateListener: Can't allocate space for the addr\n",
+	"[Xtranssock] SocketUNIXCreateListener: Can't allocate space for the addr\n",
 	      0, 0, 0);
         return TRANS_CONNECT_FAILED;
     }
@@ -1682,7 +1682,7 @@ static int
 TRANS(SocketBytesReadable) (XtransConnInfo ciptr, BytesReadable_t *pend)
 
 {
-    PRMSG (2,"SocketBytesReadable(%x,%d,%x)\n",
+    PRMSG (2,"[Xtranssock] SocketBytesReadable(%x,%d,%x)\n",
 	ciptr, ciptr->fd, pend);
 #if defined(QNX4)
     *pend = 0L; /* FIONREAD only returns a short. Zero out upper bits */
@@ -1707,7 +1707,7 @@ static int
 TRANS(SocketRead) (XtransConnInfo ciptr, char *buf, int size)
 
 {
-    PRMSG (2,"SocketRead(%d,%x,%d)\n", ciptr->fd, buf, size);
+    PRMSG (2,"[Xtranssock] SocketRead(%d,%x,%d)\n", ciptr->fd, buf, size);
 
 #if defined(_WIN32) || defined(__EMX__)
     return recv ((SOCKET)ciptr->fd, buf, size, 0);
@@ -1721,7 +1721,7 @@ static int
 TRANS(SocketWrite) (XtransConnInfo ciptr, char *buf, int size)
 
 {
-    PRMSG (2,"SocketWrite(%d,%x,%d)\n", ciptr->fd, buf, size);
+    PRMSG (2,"[Xtranssock] SocketWrite(%d,%x,%d)\n", ciptr->fd, buf, size);
 
 #if defined(_WIN32) || defined(__EMX__)
     return send ((SOCKET)ciptr->fd, buf, size, 0);
@@ -1735,7 +1735,7 @@ static int
 TRANS(SocketReadv) (XtransConnInfo ciptr, struct iovec *buf, int size)
 
 {
-    PRMSG (2,"SocketReadv(%d,%x,%d)\n", ciptr->fd, buf, size);
+    PRMSG (2,"[Xtranssock] SocketReadv(%d,%x,%d)\n", ciptr->fd, buf, size);
 
     return READV (ciptr, buf, size);
 }
@@ -1745,7 +1745,7 @@ static int
 TRANS(SocketWritev) (XtransConnInfo ciptr, struct iovec *buf, int size)
 
 {
-    PRMSG (2,"SocketWritev(%d,%x,%d)\n", ciptr->fd, buf, size);
+    PRMSG (2,"[Xtranssock] SocketWritev(%d,%x,%d)\n", ciptr->fd, buf, size);
 
     return WRITEV (ciptr, buf, size);
 }
@@ -1755,7 +1755,7 @@ static int
 TRANS(SocketDisconnect) (XtransConnInfo ciptr)
 
 {
-    PRMSG (2,"SocketDisconnect(%x,%d)\n", ciptr, ciptr->fd, 0);
+    PRMSG (2,"[Xtranssock] SocketDisconnect(%x,%d)\n", ciptr, ciptr->fd, 0);
 
     return shutdown (ciptr->fd, 2); /* disallow further sends and receives */
 }
@@ -1766,7 +1766,7 @@ static int
 TRANS(SocketINETClose) (XtransConnInfo ciptr)
 
 {
-    PRMSG (2,"SocketINETClose(%x,%d)\n", ciptr, ciptr->fd, 0);
+    PRMSG (2,"[Xtranssock] SocketINETClose(%x,%d)\n", ciptr, ciptr->fd, 0);
 
     return close (ciptr->fd);
 }
@@ -1788,7 +1788,7 @@ TRANS(SocketUNIXClose) (XtransConnInfo ciptr)
     char	path[200]; /* > sizeof sun_path +1 */
     int ret;
 
-    PRMSG (2,"SocketUNIXClose(%x,%d)\n", ciptr, ciptr->fd, 0);
+    PRMSG (2,"[Xtranssock] SocketUNIXClose(%x,%d)\n", ciptr, ciptr->fd, 0);
 
     ret = close(ciptr->fd);
 
@@ -1815,7 +1815,7 @@ TRANS(SocketUNIXCloseForCloning) (XtransConnInfo ciptr)
 
     int ret;
 
-    PRMSG (2,"SocketUNIXCloseForCloning(%x,%d)\n",
+    PRMSG (2,"[Xtranssock] SocketUNIXCloseForCloning(%x,%d)\n",
 	ciptr, ciptr->fd, 0);
 
     ret = close(ciptr->fd);
diff --git a/dcop/client/dcopfind.cpp b/dcop/client/dcopfind.cpp
index d12cecddf..a4bcb67bb 100644
--- a/dcop/client/dcopfind.cpp
+++ b/dcop/client/dcopfind.cpp
@@ -192,7 +192,7 @@ bool launchApp(TQString app)
 
 void usage()
 {
-   fprintf( stderr, "Usage: dcopfind [-l] [-a] application [object [function [arg1] [arg2] [arg3] ... ] ] ] \n" );
+   fprintf( stderr, "[dcopfind] Usage: dcopfind [-l] [-a] application [object [function [arg1] [arg2] [arg3] ... ] ] ] \n" );
    exit(0);
 }
 
diff --git a/dcop/dcopidl/scanner.cc b/dcop/dcopidl/scanner.cc
index afc411cca..da3481c04 100644
--- a/dcop/dcopidl/scanner.cc
+++ b/dcop/dcopidl/scanner.cc
@@ -2528,7 +2528,7 @@ YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, int  _yybytes_len )
 
 static void yy_fatal_error (yyconst char* msg )
 {
-    	(void) fprintf( stderr, "%s\n", msg );
+    	(void) fprintf( stderr, "[dcopidl-scanner] %s\n", msg );
 	exit( YY_EXIT_FAILURE );
 }
 
diff --git a/dcop/dcopidl2cpp/main.cpp b/dcop/dcopidl2cpp/main.cpp
index f95983a2e..840669ba4 100644
--- a/dcop/dcopidl2cpp/main.cpp
+++ b/dcop/dcopidl2cpp/main.cpp
@@ -35,14 +35,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 void usage()
 {
-    fprintf( stderr, "Usage: dcopidl2cpp [ --no-skel | --no-stub ] [--c++-suffix <suffix>] file\n" );
+    fprintf( stderr, "[dcopidl2cpp] Usage: dcopidl2cpp [ --no-skel | --no-stub ] [--c++-suffix <suffix>] file\n" );
 }
 
 int main( int argc, char** argv )
 {
 
     if ( *tqVersion() == '1' ) {
-        fprintf( stderr, "dcopidl2cpp appears to be linked to Qt 1 instead of Qt >= 2 ! Aborting.\n" );
+        fprintf( stderr, "[dcopidl2cpp] dcopidl2cpp appears to be linked to Qt 1 instead of Qt >= 2 ! Aborting.\n" );
         exit(1);
     }
     if ( argc < 2 ) {
diff --git a/dcop/dcopserver.cpp b/dcop/dcopserver.cpp
index 695909ea7..80d1d6989 100644
--- a/dcop/dcopserver.cpp
+++ b/dcop/dcopserver.cpp
@@ -130,7 +130,7 @@ static TQCString readQCString(TQDataStream &ds)
    int bytesLeft = device->size()-device->at();
    if ((bytesLeft < 0 ) || (len > (uint) bytesLeft))
    {
-      tqWarning("Corrupt data!\n");
+      tqWarning("[dcopserver] Corrupt data!\n");
       printf("bytesLeft: %d, len: %d\n", bytesLeft, len);
       return result;
    }
@@ -149,7 +149,7 @@ static TQByteArray readQByteArray(TQDataStream &ds)
    int bytesLeft = device->size()-device->at();
    if ((bytesLeft < 0 ) || (len > (uint) bytesLeft))
    {
-      tqWarning("Corrupt data!\n");
+      tqWarning("[dcopserver] Corrupt data!\n");
       return result;
    }
    result.resize( (uint)len );
@@ -241,7 +241,7 @@ void DCOPIceWriteChar(register IceConn iceConn, unsigned long nbytes, char *ptr)
 {
     DCOPConnection* conn = the_server->findConn( iceConn );
 #ifdef DCOP_DEBUG
-tqWarning("DCOPServer: DCOPIceWriteChar() Writing %d bytes [%s]", nbytes, conn ? conn->appId.data() : "<unknown>");
+tqWarning("[dcopserver] DCOPIceWriteChar() Writing %d bytes [%s]", nbytes, conn ? conn->appId.data() : "<unknown>");
 #endif
 
     if (conn)
@@ -251,7 +251,7 @@ tqWarning("DCOPServer: DCOPIceWriteChar() Writing %d bytes [%s]", nbytes, conn ?
           TQByteArray _data(nbytes);
           memcpy(_data.data(), ptr, nbytes);
 #ifdef DCOP_DEBUG
-tqWarning("DCOPServer: _IceWrite() outputBlocked. Queuing %d bytes.", _data.size());
+tqWarning("[dcopserver] _IceWrite() outputBlocked. Queuing %d bytes.", _data.size());
 #endif
           conn->outputBuffer.append(_data);
           return;
@@ -273,14 +273,14 @@ static void DCOPIceWrite(IceConn iceConn, const TQByteArray &_data)
 {
     DCOPConnection* conn = the_server->findConn( iceConn );
 #ifdef DCOP_DEBUG
-tqWarning("DCOPServer: DCOPIceWrite() Writing %d bytes [%s]", _data.size(), conn ? conn->appId.data() : "<unknown>");
+tqWarning("[dcopserver] DCOPIceWrite() Writing %d bytes [%s]", _data.size(), conn ? conn->appId.data() : "<unknown>");
 #endif
     if (conn)
     {
        if (conn->outputBlocked)
        {
 #ifdef DCOP_DEBUG
-tqWarning("DCOPServer: DCOPIceWrite() outputBlocked. Queuing %d bytes.", _data.size());
+tqWarning("[dcopserver] DCOPIceWrite() outputBlocked. Queuing %d bytes.", _data.size());
 #endif
           conn->outputBuffer.append(_data);
           return;
@@ -299,7 +299,7 @@ tqWarning("DCOPServer: DCOPIceWrite() outputBlocked. Queuing %d bytes.", _data.s
 void DCOPConnection::waitForOutputReady(const TQByteArray &_data, int start)
 {
 #ifdef DCOP_DEBUG
-tqWarning("DCOPServer: waitForOutputReady fd = %d datasize = %d start = %d", socket(), _data.size(), start);
+tqWarning("[dcopserver] waitForOutputReady fd = %d datasize = %d start = %d", socket(), _data.size(), start);
 #endif
    outputBlocked = true;
    outputBuffer.append(_data);
@@ -317,7 +317,7 @@ tqWarning("DCOPServer: waitForOutputReady fd = %d datasize = %d start = %d", soc
 void DCOPServer::slotOutputReady(int socket)
 {
 #ifdef DCOP_DEBUG
-tqWarning("DCOPServer: slotOutputReady fd = %d", socket);
+tqWarning("[dcopserver] slotOutputReady fd = %d", socket);
 #endif
    // Find out connection.
    DCOPConnection *conn = fd_clients.find(socket);
@@ -351,7 +351,7 @@ void DCOPConnection::slotOutputReady()
    fcntl(fd, F_SETFL, fd_fl);
 
 #ifdef DCOP_DEBUG
-tqWarning("DCOPServer: slotOutputReady() %d bytes written", nwritten);
+tqWarning("[dcopserver] slotOutputReady() %d bytes written", nwritten);
 #endif
 
    if (nwritten < 0)
@@ -370,7 +370,7 @@ tqWarning("DCOPServer: slotOutputReady() %d bytes written", nwritten);
       if (outputBuffer.isEmpty())
       {
 #ifdef DCOP_DEBUG
-tqWarning("DCOPServer: slotOutputRead() all data transmitted.");
+tqWarning("[dcopserver] slotOutputRead() all data transmitted.");
 #endif
          outputBlocked = false;
          outputBufferNotifier->setEnabled(false);
@@ -378,7 +378,7 @@ tqWarning("DCOPServer: slotOutputRead() all data transmitted.");
 #ifdef DCOP_DEBUG
 else
 {
-tqWarning("DCOPServer: slotOutputRead() more data to send.");
+tqWarning("[dcopserver] slotOutputRead() more data to send.");
 }
 #endif
    }
@@ -390,7 +390,7 @@ static void DCOPIceSendData(register IceConn _iceConn,
    if (_iceConn->outbufptr > _iceConn->outbuf)
    {
 #ifdef DCOP_DEBUG
-tqWarning("DCOPServer: Flushing data, fd = %d", IceConnectionNumber(_iceConn));
+tqWarning("[dcopserver] Flushing data, fd = %d", IceConnectionNumber(_iceConn));
 #endif
       IceFlush( _iceConn );
    }
@@ -645,7 +645,7 @@ SetAuthentication (int count, IceListenObj *_listenObjs,
 
     if (command.isEmpty())
     {
-       fprintf( stderr, "dcopserver: 'iceauth' not found in path, aborting.\n" );
+       fprintf( stderr, "[dcopserver] 'iceauth' not found in path, aborting.\n" );
        exit(1);
     }
 
@@ -713,7 +713,7 @@ void DCOPServer::processMessage( IceConn iceConn, int opcode,
 {
     DCOPConnection* conn = clients.find( iceConn );
     if ( !conn ) {
-	tqWarning("DCOPServer::processMessage message from unknown connection. [opcode = %d]", opcode);
+	tqWarning("[dcopserver] DCOPServer::processMessage message from unknown connection. [opcode = %d]", opcode);
 	return;
     }
     switch( opcode ) {
@@ -733,13 +733,13 @@ void DCOPServer::processMessage( IceConn iceConn, int opcode,
 	    int datalen = ba.size();
 	    if ( opcode == DCOPReplyDelayed ) {
 		if ( !target )
-		    tqWarning("DCOPServer::DCOPReplyDelayed for unknown connection.");
+		    tqWarning("[dcopserver] DCOPServer::DCOPReplyDelayed for unknown connection.");
 		else if ( !conn )
-		    tqWarning("DCOPServer::DCOPReplyDelayed from unknown connection.");
+		    tqWarning("[dcopserver] DCOPServer::DCOPReplyDelayed from unknown connection.");
 		else if (!conn->waitingForDelayedReply.removeRef( target->iceConn ))
-		    tqWarning("DCOPServer::DCOPReplyDelayed from/to does not match. (#2)");
+		    tqWarning("[dcopserver] DCOPServer::DCOPReplyDelayed from/to does not match. (#2)");
                 else if (!target->waitingOnReply.removeRef(iceConn))
-                       tqWarning("DCOPServer::DCOPReplyDelayed for client who wasn't waiting on one!");
+                       tqWarning("[dcopserver] DCOPServer::DCOPReplyDelayed for client who wasn't waiting on one!");
 	    }
 	    if ( target ) {
 #ifdef DCOP_DEBUG
@@ -747,7 +747,7 @@ if (opcode == DCOPSend)
 {
    TQCString obj = readQCString(ds);
    TQCString fun = readQCString(ds);
-   tqWarning("Sending %d bytes from %s to %s. DCOPSend %s", length, fromApp.data(), toApp.data(), fun.data());
+   tqWarning("[dcopserver] Sending %d bytes from %s to %s. DCOPSend %s", length, fromApp.data(), toApp.data(), fun.data());
 }
 #endif
 		IceGetHeader( target->iceConn, majorOpcode, opcode,
@@ -765,7 +765,7 @@ if (opcode == DCOPSend)
 		TQCString replyType;
 		TQByteArray replyData;
 		if ( !receive( toApp, obj, fun, data, replyType, replyData, iceConn ) ) {
-		    tqWarning("%s failure: object '%s' has no function '%s'", toApp.data(), obj.data(), fun.data() );
+		    tqWarning("[dcopserver] %s failure: object '%s' has no function '%s'", toApp.data(), obj.data(), fun.data() );
 		}
 	    } else if ( toApp[toApp.length()-1] == '*') {
 #ifdef DCOP_DEBUG
@@ -773,7 +773,7 @@ if (opcode == DCOPSend)
 {
    TQCString obj = readQCString(ds);
    TQCString fun = readQCString(ds);
-   tqWarning("Sending %d bytes from %s to %s. DCOPSend %s", length, fromApp.data(), toApp.data(), fun.data());
+   tqWarning("[dcopserver] Sending %d bytes from %s to %s. DCOPSend %s", length, fromApp.data(), toApp.data(), fun.data());
 }
 #endif
 		// handle a multicast.
@@ -815,7 +815,7 @@ if (opcode == DCOPCall)
 {
    TQCString obj = readQCString(ds);
    TQCString fun = readQCString(ds);
-   tqWarning("Sending %d bytes from %s to %s. DCOPCall %s", length, fromApp.data(), toApp.data(), fun.data());
+   tqWarning("[dcopserver] Sending %d bytes from %s to %s. DCOPCall %s", length, fromApp.data(), toApp.data(), fun.data());
 }
 #endif
 		target->waitingForReply.append( iceConn );
@@ -839,7 +839,7 @@ if (opcode == DCOPCall)
 		    TQByteArray data = readQByteArray(ds);
 		    b = receive( toApp, obj, fun, data, replyType, replyData, iceConn );
 		    if ( !b )
-			tqWarning("%s failure: object '%s' has no function '%s'", toApp.data(), obj.data(), fun.data() );
+			tqWarning("[dcopserver] %s failure: object '%s' has no function '%s'", toApp.data(), obj.data(), fun.data() );
 		}
 
 		if (b) {
@@ -893,7 +893,7 @@ if (opcode == DCOPCall)
 	    int datalen = ba.size();
 
 	    if ( !connreply )
-		tqWarning("DCOPServer::DCOPReply for unknown connection.");
+		tqWarning("[dcopserver] DCOPServer::DCOPReply for unknown connection.");
 	    else {
 		conn->waitingForReply.removeRef( connreply->iceConn );
 		if ( opcode == DCOPReplyWait )
@@ -903,7 +903,7 @@ if (opcode == DCOPCall)
                 else
                 { // DCOPReply or DCOPReplyFailed
                     if (!connreply->waitingOnReply.removeRef(iceConn))
-                       tqWarning("DCOPServer::DCOPReply from %s to %s who wasn't waiting on one!",
+                       tqWarning("[dcopserver] DCOPReply from %s to %s who wasn't waiting on one!",
                                fromApp.data(), toApp.data());
                 }
 		IceGetHeader( connreply->iceConn, majorOpcode, opcode,
@@ -917,7 +917,7 @@ if (opcode == DCOPCall)
 	}
 	break;
     default:
-	tqWarning("DCOPServer::processMessage unknown message");
+	tqWarning("[dcopserver] DCOPServer::processMessage unknown message");
     }
 }
 
@@ -986,7 +986,7 @@ DCOPServer::DCOPServer(bool _suicide)
 				    DCOPAuthCount, const_cast<char **>(DCOPAuthNames),
 				    DCOPClientAuthProcs, 0);
     if (_kde_IceLastMajorOpcode < 1 )
-	tqWarning("DCOPServer Error: incorrect major opcode!");
+	tqWarning("[dcopserver] DCOPServer Error: incorrect major opcode!");
 
     the_server = this;
     if (( majorOpcode = IceRegisterForProtocolReply (const_cast<char *>("DCOP"),
@@ -1004,7 +1004,7 @@ DCOPServer::DCOPServer(bool _suicide)
 						     NULL	/* IceIOErrorProc */
 						     )) < 0)
 	{
-	    tqWarning("Could not register DCOP protocol with ICE");
+	    tqWarning("[dcopserver] Could not register DCOP protocol with ICE");
 	}
 
     char errormsg[256];
@@ -1012,7 +1012,7 @@ DCOPServer::DCOPServer(bool _suicide)
     if (!IceListenForConnections (&numTransports, &listenObjs,
 				  256, errormsg))
 	{
-	    fprintf (stderr, "%s\n", errormsg);
+	    fprintf (stderr, "[dcopserver] %s\n", errormsg);
 	    exit (1);
 	} else {
 	    (void) umask(orig_umask);
@@ -1020,7 +1020,7 @@ DCOPServer::DCOPServer(bool _suicide)
 	    TQCString fName = DCOPClient::dcopServerFile();
 	    FILE *f;
 	    if(!(f = ::fopen(fName.data(), "w+"))) {
-	        fprintf (stderr, "Can not create file %s: %s\n",
+	        fprintf (stderr, "[dcopserver] Can not create file %s: %s\n",
 			 fName.data(), ::strerror(errno));
 		exit(1);
 	    }
@@ -1119,7 +1119,7 @@ DCOPConnection* DCOPServer::findApp( const TQCString& appId )
  */
 void DCOPServer::slotCleanDeadConnections()
 {
-tqWarning("DCOP Cleaning up dead connections.");
+tqWarning("[dcopserver] DCOP Cleaning up dead connections.");
     while(!deadConnections.isEmpty())
     {
        IceConn iceConn = deadConnections.take(0);
@@ -1158,9 +1158,9 @@ void DCOPServer::newClient( int /*socket*/ )
     IceConn iceConn = IceAcceptConnection( static_cast<const  DCOPListener*>(sender())->listenObj, &status);
     if (!iceConn) {
       if (status == IceAcceptBadMalloc)
-	 tqWarning("Failed to alloc connection object!\n");
+	 tqWarning("[dcopserver] Failed to alloc connection object!\n");
       else // IceAcceptFailure
-         tqWarning("Failed to accept ICE connection!\n");
+         tqWarning("[dcopserver] Failed to accept ICE connection!\n");
       return;
     }
 
@@ -1173,9 +1173,9 @@ void DCOPServer::newClient( int /*socket*/ )
 
     if (cstatus != IceConnectAccepted) {
 	if (cstatus == IceConnectIOError)
-	    tqWarning ("IO error opening ICE Connection!\n");
+	    tqWarning ("[dcopserver] IO error opening ICE Connection!\n");
 	else
-	    tqWarning ("ICE Connection rejected!\n");
+	    tqWarning ("[dcopserver] ICE Connection rejected!\n");
         deadConnections.removeRef(iceConn);
 	(void) IceCloseConnection (iceConn);
     }
@@ -1206,7 +1206,7 @@ void DCOPServer::removeConnection( void* data )
 	IceConn iceConn = conn->waitingForReply.take(0);
 	if (iceConn) {
 	    DCOPConnection* target = clients.find( iceConn );
-	    tqWarning("DCOP aborting call from '%s' to '%s'", target ? target->appId.data() : "<unknown>" , conn->appId.data() );
+	    tqWarning("[dcopserver] DCOP aborting call from '%s' to '%s'", target ? target->appId.data() : "<unknown>" , conn->appId.data() );
 	    TQByteArray reply;
 	    DCOPMsg *pMsg;
 	    IceGetHeader( iceConn, majorOpcode, DCOPReplyFailed,
@@ -1217,9 +1217,9 @@ void DCOPServer::removeConnection( void* data )
 	    DCOPIceSendData(iceConn, reply);
             _DCOPIceSendEnd();
             if (!target)
-               tqWarning("DCOP Error: unknown target in waitingForReply");
+               tqWarning("[dcopserver] Unknown target in waitingForReply");
             else if (!target->waitingOnReply.removeRef(conn->iceConn))
-               tqWarning("DCOP Error: client in waitingForReply wasn't waiting on reply");
+               tqWarning("[dcopserver] Client in waitingForReply wasn't waiting on reply");
 	}
     }
 
@@ -1228,7 +1228,7 @@ void DCOPServer::removeConnection( void* data )
 	IceConn iceConn = conn->waitingForDelayedReply.take(0);
 	if (iceConn) {
 	    DCOPConnection* target = clients.find( iceConn );
-	    tqWarning("DCOP aborting (delayed) call from '%s' to '%s'", target ? target->appId.data() : "<unknown>", conn->appId.data() );
+	    tqWarning("[dcopserver] DCOP aborting (delayed) call from '%s' to '%s'", target ? target->appId.data() : "<unknown>", conn->appId.data() );
 	    TQByteArray reply;
 	    DCOPMsg *pMsg;
 	    IceGetHeader( iceConn, majorOpcode, DCOPReplyFailed,
@@ -1239,9 +1239,9 @@ void DCOPServer::removeConnection( void* data )
 	    DCOPIceSendData( iceConn, reply );
             _DCOPIceSendEnd();
             if (!target)
-               tqWarning("DCOP Error: unknown target in waitingForDelayedReply");
+               tqWarning("[dcopserver] Unknown target in waitingForDelayedReply");
             else if (!target->waitingOnReply.removeRef(conn->iceConn))
-               tqWarning("DCOP Error: client in waitingForDelayedReply wasn't waiting on reply");
+               tqWarning("[dcopserver] Client in waitingForDelayedReply wasn't waiting on reply");
 	}
     }
     while (!conn->waitingOnReply.isEmpty())
@@ -1251,13 +1251,13 @@ void DCOPServer::removeConnection( void* data )
            DCOPConnection* target = clients.find( iceConn );
            if (!target)
            {
-               tqWarning("DCOP Error: still waiting for answer from non-existing client.");
+               tqWarning("[dcopserver] Still waiting for answer from non-existing client.");
                continue;
            }
-           tqWarning("DCOP aborting while waiting for answer from '%s'", target->appId.data());
+           tqWarning("[dcopserver] DCOP aborting while waiting for answer from '%s'", target->appId.data());
            if (!target->waitingForReply.removeRef(conn->iceConn) &&
                !target->waitingForDelayedReply.removeRef(conn->iceConn))
-              tqWarning("DCOP Error: called client has forgotten about caller");
+              tqWarning("[dcopserver] Called client has forgotten about caller");
         }
     }
 
@@ -1290,7 +1290,7 @@ void DCOPServer::removeConnection( void* data )
 void DCOPServer::slotTerminate()
 {
 #ifndef NDEBUG
-    fprintf( stderr, "DCOPServer : slotTerminate() -> sending terminateKDE signal.\n" );
+    fprintf( stderr, "[dcopserver] slotTerminate() -> sending terminateKDE signal.\n" );
 #endif
     TQByteArray data;
     dcopSignals->emitSignal(0L /* dcopserver */, "terminateKDE()", data, false);
@@ -1302,7 +1302,7 @@ void DCOPServer::slotTerminate()
 void DCOPServer::slotSuicide()
 {
 #ifndef NDEBUG
-    fprintf( stderr, "DCOPServer : slotSuicide() -> exit.\n" );
+    fprintf( stderr, "[dcopserver] slotSuicide() -> exit.\n" );
 #endif
     exit(0);
 }
@@ -1310,7 +1310,7 @@ void DCOPServer::slotSuicide()
 void DCOPServer::slotShutdown()
 {
 #ifndef NDEBUG
-    fprintf( stderr, "DCOPServer : slotShutdown() -> waiting for clients to disconnect.\n" );
+    fprintf( stderr, "[dcopserver] slotShutdown() -> waiting for clients to disconnect.\n" );
 #endif
     char c;
 #ifndef Q_OS_WIN
@@ -1332,7 +1332,7 @@ void DCOPServer::slotShutdown()
 void DCOPServer::slotExit()
 {
 #ifndef NDEBUG
-	fprintf( stderr, "DCOPServer : slotExit() -> exit.\n" );
+	fprintf( stderr, "[dcopserver] slotExit() -> exit.\n" );
 #endif
 #ifdef Q_OS_WIN
 	SetEvent(m_evTerminate);
@@ -1629,10 +1629,10 @@ static bool isRunning(const TQCString &fName, bool printNetworkId = false)
 	f.close();
 	if (ok && pid && (kill(pid, SIGHUP) == 0)) {
 	    if (printNetworkId)
-	        tqWarning("%s", contents.left(pos).data());
+	        tqWarning("[dcopserver] %s", contents.left(pos).data());
 	    else
 		tqWarning( "---------------------------------\n"
-		      "It looks like dcopserver is already running. If you are sure\n"
+		      "[dcopserver] It looks like dcopserver is already running. If you are sure\n"
 		      "that it is not already running, remove %s\n"
 		      "and start dcopserver again.\n"
 		      "---------------------------------\n",
@@ -1719,8 +1719,8 @@ extern "C" DCOP_EXPORT int kdemain( int argc, char* argv[] )
 
           if (retcode != 0)
           {
-             tqWarning("dcopserver: Could not raise limit on number of open files.");
-             tqWarning("dcopserver: Current limit = %d", cur_limit);
+             tqWarning("[dcopserver] Could not raise limit on number of open files.");
+             tqWarning("[dcopserver] Current limit = %d", cur_limit);
           }
        }
     }
@@ -1743,7 +1743,7 @@ extern "C" DCOP_EXPORT int kdemain( int argc, char* argv[] )
                if (client.attach())
                   return 0;
             }
-            tqWarning("DCOPServer self-test failed.");
+            tqWarning("[dcopserver] DCOPServer self-test failed.");
             system(findDcopserverShutdown()+" --kill");
             return 1;
 	}
diff --git a/dcop/dcopserver_win.cpp b/dcop/dcopserver_win.cpp
index 4e6bc5e9f..833418876 100644
--- a/dcop/dcopserver_win.cpp
+++ b/dcop/dcopserver_win.cpp
@@ -26,7 +26,7 @@ DWORD WINAPI DCOPServer::TerminatorThread(void * pParam)
     DCOPServer * server = (DCOPServer*)pParam;
 
     WaitForSingleObject(server->m_evTerminate,INFINITE);
-	fprintf( stderr, "DCOPServer : terminate event signaled\n" );
+	fprintf( stderr, "[dcopserver_win] Terminate event signaled\n" );
     if(!server->shutdown) {
 		
 		ResetEvent(server->m_evTerminate);
@@ -36,9 +36,9 @@ DWORD WINAPI DCOPServer::TerminatorThread(void * pParam)
 		// Need some further event processing to get the timer signals
 		while(WaitForSingleObject(server->m_evTerminate,100) != WAIT_OBJECT_0)
 			TQApplication::eventLoop()->processEvents(TQEventLoop::ExcludeUserInput|TQEventLoop::ExcludeSocketNotifiers);
-		fprintf( stderr, "DCOPServer : terminated event signaled the last time\n" );
+		fprintf( stderr, "[dcopserver_win] Terminated event signaled the last time\n" );
     }
-	fprintf( stderr, "DCOPServer : terminate thread teminated\n" );
+	fprintf( stderr, "[dcopserver_win] Terminate thread teminated\n" );
     return 0;
 }