diff --git a/ChangeLog b/ChangeLog
index 99e9813..f0f6d7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Jul 25 18:00:12 PDT 2005  Christian Hammond <chipx86@gnupdate.org>
+
+	* libnotify/notify.c:
+	* tests/test-animation.c:
+	  - Flush the D-BUS connection queue on uninit so that messages go
+	    through and so we don't trigger this ugly little warning on
+	    D-BUS 0.3x.
+	  - Fix a compiler warning on gcc4.
+
 Wed Jul 27 02:12:31 PDT 2005  Christian Hammond <chipx86@chipx86.com>
 
 	* libnotify/notify.c:
diff --git a/libnotify/notify.c b/libnotify/notify.c
index 7caa932..9be213c 100644
--- a/libnotify/notify.c
+++ b/libnotify/notify.c
@@ -322,6 +322,7 @@ _notify_disconnect(void)
 	}
 
 	dbus_connection_disconnect(_dbus_conn);
+	dbus_connection_dispatch(_dbus_conn);
 	dbus_connection_unref(_dbus_conn);
 
 	_dbus_conn = NULL;
diff --git a/tests/test-animation.c b/tests/test-animation.c
index 7fc48f4..ae544a8 100644
--- a/tests/test-animation.c
+++ b/tests/test-animation.c
@@ -84,7 +84,7 @@ int main()
 
 		g_assert(error == NULL);
 
-		notify_icon_add_frame_from_data(icon, size, pngdata);
+		notify_icon_add_frame_from_data(icon, size, (guchar *)pngdata);
 	}
 
 	NotifyHandle *n = notify_send_notification(NULL, // replaces nothing