hal/libhal libhal.c,1.22,1.23

David Zeuthen david at freedesktop.org
Mon Aug 2 13:17:29 PDT 2004


Update of /cvs/hal/hal/libhal
In directory pdx:/tmp/cvs-serv19391/libhal

Modified Files:
	libhal.c 
Log Message:
2004-08-02  David Zeuthen  <david at fubar.dk>

	* libhal/libhal.c (filter_func): Only return RESULT_HANDLED if we
	really handle the message. Otherwise return RESULT_NOT_YET_HANDLED.
	Bug identified by Dan Williams <dcbw at redhat.com>. 



Index: libhal.c
===================================================================
RCS file: /cvs/hal/hal/libhal/libhal.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- libhal.c	29 Jul 2004 17:07:09 -0000	1.22
+++ libhal.c	2 Aug 2004 20:17:27 -0000	1.23
@@ -432,6 +432,7 @@
 				dbus_free (udi);
 			}
 		}
+		return DBUS_HANDLER_RESULT_HANDLED;
 	} else
 	    if (dbus_message_is_signal
 		(message, "org.freedesktop.Hal.Manager",
@@ -445,6 +446,7 @@
 				dbus_free (udi);
 			}
 		}
+		return DBUS_HANDLER_RESULT_HANDLED;
 	} else
 	    if (dbus_message_is_signal
 		(message, "org.freedesktop.Hal.Manager",
@@ -463,6 +465,7 @@
 				dbus_free (capability);
 			}
 		}
+		return DBUS_HANDLER_RESULT_HANDLED;
 	} else
 	    if (dbus_message_is_signal
 		(message, "org.freedesktop.Hal.Device", "Condition")) {
@@ -481,6 +484,7 @@
 
 			dbus_free (condition_name);
 		}
+		return DBUS_HANDLER_RESULT_HANDLED;
 	} else
 	    if (dbus_message_is_signal
 		(message, "org.freedesktop.Hal.Device",
@@ -519,9 +523,10 @@
 			}
 
 		}
+		return DBUS_HANDLER_RESULT_HANDLED;
 	}
 
-	return DBUS_HANDLER_RESULT_HANDLED;
+	return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
 
 static LibHalFunctions hal_null_functions = {




More information about the hal-commit mailing list