diff --git a/ChangeLog b/ChangeLog
index 42db58e547..3844756c87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-03-05  Dan Williams  <dcbw@redhat.com>
+
+	* gnome/applet/applet-notifications.h
+		- Protect prototype of nma_send_event_notification() because it
+			includes libnotify-specific types
+		- Include libnotify/libnotify.h too, since we technically need it
+
+	* gnome/applet/applet.c
+		- (nma_show_vpn_failure_dialog): fix usage of g_return_if_fail
+		- (nma_show_vpn_login_banner_dialog): add some error checking
+
 2006-03-04  Dan Williams  <dcbw@redhat.com>
 
 	Clean up activation cancellation.  Should be a lot faster now.  Observed
diff --git a/gnome/applet/applet-notifications.h b/gnome/applet/applet-notifications.h
index e95d0b965e..15e63b5a55 100644
--- a/gnome/applet/applet-notifications.h
+++ b/gnome/applet/applet-notifications.h
@@ -22,6 +22,9 @@
 #ifndef NM_NOTIFICATION_H__
 #define NM_NOTIFICATION_H__
 
+#ifdef ENABLE_NOTIFY
+
+#include <libnotify/notify.h>
 #include "applet.h"
 
 void
@@ -31,4 +34,6 @@ nma_send_event_notification (NMApplet *applet,
                               const char *message,
                               const char *icon);
 
+#endif /* ENABLE_NOTIFY */
+
 #endif /* NM_NOTIFICATION_H__ */
diff --git a/gnome/applet/applet.c b/gnome/applet/applet.c
index 9602ec0871..f4d1aeb65a 100644
--- a/gnome/applet/applet.c
+++ b/gnome/applet/applet.c
@@ -386,8 +386,8 @@ nma_show_vpn_failure_dialog (const char *title,
 {
 	GtkWidget	*dialog;
 
-	g_return_if_fail (title != NULL, FALSE);
-	g_return_if_fail (msg != NULL, FALSE);
+	g_return_if_fail (title != NULL);
+	g_return_if_fail (msg != NULL);
 
 	dialog = gtk_message_dialog_new_with_markup (NULL, 0, GTK_MESSAGE_ERROR,
 				GTK_BUTTONS_OK, msg, NULL);
@@ -480,6 +480,9 @@ nma_show_vpn_login_banner_dialog (const char *title,
 {
 	GtkWidget	*dialog;
 
+	g_return_if_fail (title != NULL);
+	g_return_if_fail (msg != NULL);
+
 	dialog = gtk_message_dialog_new_with_markup (NULL, 0, GTK_MESSAGE_INFO,
 					GTK_BUTTONS_OK, msg, NULL);
 	gtk_window_set_title (GTK_WINDOW (dialog), title);