diff --git a/ChangeLog b/ChangeLog
index 6c65d83a86..0eb6f8b49f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-07  Dan Williams  <dcbw@redhat.com>
+
+	* libnm_glib/libnm_glib.c
+		- Small cleanup in element list iteration
+
 2005-02-07  Dan Williams  <dcbw@redhat.com>
 
 	* src/NetworkManagerWireless.c
diff --git a/libnm_glib/libnm_glib.c b/libnm_glib/libnm_glib.c
index 0b06f7793d..e8f65dbb6a 100644
--- a/libnm_glib/libnm_glib.c
+++ b/libnm_glib/libnm_glib.c
@@ -138,13 +138,11 @@ static void libnm_glib_call_callbacks (libnm_glib_ctx *ctx)
 	g_return_if_fail (ctx != NULL);
 
 	g_mutex_lock (ctx->callbacks_lock);
-	elem = ctx->callbacks;
-	while (elem)
+	for (elem = ctx->callbacks; elem; elem = g_slist_next (elem))
 	{
 		libnm_glib_callback *callback = (libnm_glib_callback *)(elem->data);
 		if (callback)
 			libnm_glib_schedule_single_callback (ctx, callback);
-		elem = g_slist_next (elem);
 	}
 	g_mutex_unlock (ctx->callbacks_lock);
 }