From johans@stack.nl  Sun May 15 20:42:32 2005
Return-Path: <johans@stack.nl>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B20B116A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 15 May 2005 20:42:32 +0000 (GMT)
Received: from mailhost.stack.nl (vaak.stack.nl [131.155.140.140])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E299143DC5
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 15 May 2005 20:42:31 +0000 (GMT)
	(envelope-from johans@stack.nl)
Received: by mailhost.stack.nl (Postfix, from userid 65534)
	id 226831F2B8; Sun, 15 May 2005 22:42:30 +0200 (CEST)
Received: from mud.stack.nl (mud.stack.nl [IPv6:2001:610:1108:5011:207:e9ff:fe14:b498])
	by mailhost.stack.nl (Postfix) with ESMTP id 4CD041F2B0
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 15 May 2005 22:42:29 +0200 (CEST)
Received: by mud.stack.nl (Postfix, from userid 801)
	id 33CC3171EC; Sun, 15 May 2005 22:42:29 +0200 (CEST)
Message-Id: <20050515204229.33CC3171EC@mud.stack.nl>
Date: Sun, 15 May 2005 22:42:29 +0200 (CEST)
From: Johan van Selst <johans@stack.nl>
Reply-To: Johan van Selst <johans@stack.nl>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: mail/kiltdown: fix build on FreeBSD >= 5.x
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         81081
>Category:       ports
>Synopsis:       mail/kiltdown: fix build on FreeBSD >= 5.x
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pav
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 15 20:50:03 GMT 2005
>Closed-Date:    Tue May 17 08:58:18 GMT 2005
>Last-Modified:  Tue May 17 08:58:18 GMT 2005
>Originator:     Johan van Selst
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
>Environment:
System: FreeBSD mud.stack.nl 5.4-STABLE FreeBSD 5.4-STABLE #3: Mon May 9 19:06:32 CEST 2005 root@mud.stack.nl:/usr/obj/usr/src/sys/mud i386


	
>Description:
	A variable p shouldn't be used for two completely different things
	(a MessagePriority and QPixmap) in the same sentence.

	Fix: give each beast a unique name
	
>How-To-Repeat:
	
>Fix:

	

	Include the fix below as files/patch-kiltdown_mailviewer.cc

--- kiltdown/mailviewer.cc.orig	Sun May 15 22:29:50 2005
+++ kiltdown/mailviewer.cc	Sun May 15 22:28:00 2005
@@ -950,13 +950,13 @@ void MailViewer::layoutComponents()
                                   ? ID_LOW_PRIORITY_TEXT 
                                   : ID_HIGH_PRIORITY_TEXT);
             if (pstr) {
-                QPixmap p(p == LowPriority ? lowpriIcon : priorityhdrIcon);
-                priorityPixLabel->setPixmap(p);
-                priorityPixLabel->setGeometry(4, top, p.width() + 1, ctlHeight);
+                QPixmap qp(p == LowPriority ? lowpriIcon : priorityhdrIcon);
+                priorityPixLabel->setPixmap(qp);
+                priorityPixLabel->setGeometry(4, top, qp.width() + 1, ctlHeight);
                 priorityLabel->setText(pstr);
                 localFree(pstr);
-                priorityLabel->setGeometry(p.width() + 5, top,
-                                           this->width() - p.width() - 13,
+                priorityLabel->setGeometry(qp.width() + 5, top,
+                                           this->width() - qp.width() - 13,
                                            ctlHeight);
                 top += ctlHeight + 5;
                 priorityPixLabel->show();
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->pav 
Responsible-Changed-By: pav 
Responsible-Changed-When: Mon May 16 22:02:49 GMT 2005 
Responsible-Changed-Why:  
Poke 

http://www.freebsd.org/cgi/query-pr.cgi?pr=81081 
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Tue May 17 08:58:11 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=81081 
>Unformatted:
