fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-04-30 13:20:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

2005-09-19 Christopher Aillon <caillon@redhat.com>

Browse source 
* 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
This commit is contained in:
Christopher Aillon 2005-09-19 19:28:57 +00:00 • committed by Chris Aillon
parent 804cfe4771
commit 41e1c3e2da
3 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,7 +1,10 @@
2005-09-19 Christopher Aillon <caillon@redhat.com> 2005-09-19 Christopher Aillon <caillon@redhat.com>
* gnome/applet/applet.c: Use translator-credits * src/nm-dbus-device.c: Don't assert when getting
so translators can make themselves known. 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 <caillon@redhat.com> 2005-09-15 Christopher Aillon <caillon@redhat.com>

1
gnome/applet/applet.c
View file

@ -2434,6 +2434,7 @@ out:
{ {
char *msg = g_strdup(_("The NetworkManager applet could not find some required resources. It cannot continue.\n")); char *msg = g_strdup(_("The NetworkManager applet could not find some required resources. It cannot continue.\n"));
show_warning_dialog (msg); show_warning_dialog (msg);
nmwa_icons_free (applet);
} }
return success; return success;

11
src/nm-dbus-device.c
View file

@ -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; 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; NMActStage act_stage = active ? nm_act_request_get_stage (nm_device_get_act_request (dev)) : NM_ACT_STAGE_UNKNOWN;
NMIP4Config * ip4config; NMIP4Config * ip4config;
guint32 broadcast_addr = 0;
guint32 subnetmask_addr = 0;
nm_device_get_hw_address (dev, &hw_addr); nm_device_get_hw_address (dev, &hw_addr);
memset (hw_addr_buf, 0, 20); memset (hw_addr_buf, 0, 20);
ether_ntoa_r (&hw_addr, &hw_addr_buf[0]); ether_ntoa_r (&hw_addr, &hw_addr_buf[0]);
ip4config = nm_device_get_ip4_config (dev); 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)); 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)); broadcast = nm_utils_inet_ip4_address_as_string (broadcast_addr);
subnetmask = nm_utils_inet_ip4_address_as_string (nm_ip4_config_get_netmask (ip4config)); subnetmask = nm_utils_inet_ip4_address_as_string (subnetmask_addr);
if (nm_device_is_wireless (dev)) if (nm_device_is_wireless (dev))
{ {