Received: from [131.252.208.82] (helo=gabe.freedesktop.org)
	by mx30.web.de with esmtp (WEB.DE 4.104 #268)
	id 1DEfRS-0001ri-00
	for danny.kukawka@web.de; Fri, 25 Mar 2005 04:24:58 +0100
Received: from gabe.freedesktop.org (localhost.localdomain [127.0.0.1])
	by gabe.freedesktop.org (Postfix) with ESMTP id D01AD9E8C5;
	Thu, 24 Mar 2005 19:24:56 -0800 (PST)
X-Original-To: hal-commit@freedesktop.org
Delivered-To: hal-commit@freedesktop.org
Received: by gabe.freedesktop.org (Postfix, from userid 2559)
	id 45D4F9E7D6; Thu, 24 Mar 2005 19:24:54 -0800 (PST)
To: hal-commit@freedesktop.org
Message-Id: <20050325032454.45D4F9E7D6@gabe.freedesktop.org>
Date: Thu, 24 Mar 2005 19:24:54 -0800 (PST)
From: david@freedesktop.org (David Zeuthen)
Subject: hal/libhal libhal.c,1.45,1.46
X-BeenThere: hal-commit@lists.freedesktop.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: HAL CVS commit notification <hal-commit.lists.freedesktop.org>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/listinfo/hal-commit>, 
	<mailto:hal-commit-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/hal-commit>
List-Post: <mailto:hal-commit@lists.freedesktop.org>
List-Help: <mailto:hal-commit-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/hal-commit>,
	<mailto:hal-commit-request@lists.freedesktop.org?subject=subscribe>
Errors-To: hal-commit-bounces@lists.freedesktop.org
Sender: hal-commit-bounces@lists.freedesktop.org
Status: RO
X-Status: ORC
X-KMail-EncryptionState:  
X-KMail-SignatureState:  
X-KMail-MDN-Sent:  
X-UID: 0
Content-Type: 

Update of /cvs/hal/hal/libhal
In directory gabe:/tmp/cvs-serv13098/libhal

Modified Files:
	libhal.c 
Log Message:
2005-03-24  David Zeuthen  <davidz@redhat.com>

	* libhal/libhal.c (filter_func): Stupid bug; checked for ctx->
	device_new_capability, but should check for ctx->device_condition

	* hald/linux2/physdev.c (pci_add): Even more stupid bug; somehow
	the hal_util_set_driver were enclosed in an if statement, thus
	rendering the next statement conditional (the one that sets
	pci.product_id)



Index: libhal.c
===================================================================
RCS file: /cvs/hal/hal/libhal/libhal.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- libhal.c	2 Mar 2005 19:27:43 -0000	1.45
+++ libhal.c	25 Mar 2005 03:24:51 -0000	1.46
@@ -690,7 +690,7 @@
 					   DBUS_TYPE_STRING, &condition_name,
 					   DBUS_TYPE_STRING, &condition_detail,
 					   DBUS_TYPE_INVALID)) {
-			if (ctx->device_new_capability != NULL) {
+			if (ctx->device_condition != NULL) {
 				ctx->device_condition (ctx, object_path, condition_name, condition_detail);
 			}
 		}

_______________________________________________
hal-commit mailing list
hal-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/hal-commit
