diff --git a/ChangeLog b/ChangeLog
index 395de615ab..2f6f6b5b76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 	* src/NetworkManagerDevice.c: g_malloc0 cannot fail.
 	* src/nm-dbus-nm.c: print when we sleep and wake up.
+	* gnome/applet/menu-items.c: whitespace, misc. cleanup.
 
 2005-06-27  Robert Love  <rml@novell.com>
 
diff --git a/gnome/applet/menu-items.c b/gnome/applet/menu-items.c
index 6689591aa3..4a48ac0617 100644
--- a/gnome/applet/menu-items.c
+++ b/gnome/applet/menu-items.c
@@ -20,10 +20,10 @@
  *     Authors: Darin Adler <darin@eazel.com>
  * 	    Pavel Cisler <pavel@eazel.com>
  * 	    Mike Fleming  <mfleming@eazel.com>
- *          John Sullivan <sullivan@eazel.com>
+ *       John Sullivan <sullivan@eazel.com>
  *
  * (C) Copyright 2004 Red Hat, Inc.
- * Copyright (C) 1999, 2000 Eazel, Inc.
+ * (C) Copyright 1999, 2000 Eazel, Inc.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -74,16 +74,20 @@ GtkCheckMenuItem *wired_menu_item_get_check_item (NMWiredMenuItem *item)
 void wired_menu_item_update (NMWiredMenuItem *item, NetworkDevice *dev, const gint n_devices)
 {
 	char *text;
-	const char *dev_name;
 
 	g_return_if_fail (dev != NULL);
 	g_return_if_fail (item != NULL);
 	g_assert (network_device_is_wired (dev));
 
-	dev_name = network_device_get_desc (dev) ? network_device_get_desc (dev) : network_device_get_iface (dev);
-
 	if (n_devices > 1)
+	{
+		const char *dev_name;
+
+		dev_name = network_device_get_desc (dev);
+		if (!dev_name)
+			dev_name = network_device_get_iface (dev);
 		text = g_strdup_printf (_("Wired Network (%s)"), dev_name);
+	}
 	else
 		text = g_strdup (_("_Wired Network"));