--- a/plugins/dbus-example.c	Mon Jul 17 05:50:28 2006 +0000
+++ b/plugins/dbus-example.c	Mon Jul 17 06:21:53 2006 +0000
@@ -109,16 +109,7 @@
 static gboolean
 plugin_load(GaimPlugin *plugin)
 {
-	const char *dbus_init_error;
-
-	dbus_init_error = gaim_dbus_get_init_error();
-	if (dbus_init_error != NULL)
-	{
-		gaim_notify_error(NULL, _("Unable to Load Plugin"),
-				_("Gaim's D-BUS server is not running for the reason listed below"),
-				_(dbus_init_error));
-		return FALSE;
-	}
+	GAIM_DBUS_RETURN_FALSE_IF_DISABLED(plugin);
 
     /* First, we have to register our four exported functions with the
        main gaim dbus loop.  Without this statement, the gaim dbus