From 41e1c3e2daf313d4dd4aa4e1819dfbbfe0eb7827 Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Mon, 19 Sep 2005 19:28:57 +0000 Subject: [PATCH] 2005-09-19 Christopher Aillon * src/nm-dbus-device.c: Don't assert when getting addresses of a not yet connected interface. * gnome/applet/applet.c: Free icons if loading fails. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@967 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 7 +++++-- gnome/applet/applet.c | 1 + src/nm-dbus-device.c | 11 +++++++++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d8ccd0384..192c51547a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,10 @@ 2005-09-19 Christopher Aillon - * gnome/applet/applet.c: Use translator-credits - so translators can make themselves known. + * src/nm-dbus-device.c: Don't assert when getting + addresses of a not yet connected interface. + + * gnome/applet/applet.c: Free icons if loading fails. + Use translator-credits so translators can make themselves known. 2005-09-15 Christopher Aillon diff --git a/gnome/applet/applet.c b/gnome/applet/applet.c index 893f65e5f9..f69046dc45 100644 --- a/gnome/applet/applet.c +++ b/gnome/applet/applet.c @@ -2434,6 +2434,7 @@ out: { char *msg = g_strdup(_("The NetworkManager applet could not find some required resources. It cannot continue.\n")); show_warning_dialog (msg); + nmwa_icons_free (applet); } return success; diff --git a/src/nm-dbus-device.c b/src/nm-dbus-device.c index 85090cd063..f6b30bd19f 100644 --- a/src/nm-dbus-device.c +++ b/src/nm-dbus-device.c @@ -342,15 +342,22 @@ static DBusMessage *nm_dbus_device_get_properties (DBusConnection *connection, D dbus_bool_t active = nm_device_get_act_request (dev) ? TRUE : FALSE; NMActStage act_stage = active ? nm_act_request_get_stage (nm_device_get_act_request (dev)) : NM_ACT_STAGE_UNKNOWN; NMIP4Config * ip4config; + guint32 broadcast_addr = 0; + guint32 subnetmask_addr = 0; nm_device_get_hw_address (dev, &hw_addr); memset (hw_addr_buf, 0, 20); ether_ntoa_r (&hw_addr, &hw_addr_buf[0]); ip4config = nm_device_get_ip4_config (dev); + if (ip4config) + { + broadcast_addr = nm_ip4_config_get_broadcast (ip4config); + subnetmask_addr = nm_ip4_config_get_netmask (ip4config); + } ip4_address = nm_utils_inet_ip4_address_as_string (nm_device_get_ip4_address (dev)); - broadcast = nm_utils_inet_ip4_address_as_string (nm_ip4_config_get_broadcast (ip4config)); - subnetmask = nm_utils_inet_ip4_address_as_string (nm_ip4_config_get_netmask (ip4config)); + broadcast = nm_utils_inet_ip4_address_as_string (broadcast_addr); + subnetmask = nm_utils_inet_ip4_address_as_string (subnetmask_addr); if (nm_device_is_wireless (dev)) {