mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-08 19:28:04 +02:00
2005-06-30 Robert Love <rml@novell.com>
* gnome/applet/menu-items.c: whitespace, misc. cleanup. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@766 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
parent
72806fa701
commit
0b9da2df82
2 changed files with 10 additions and 5 deletions
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
* src/NetworkManagerDevice.c: g_malloc0 cannot fail.
|
* src/NetworkManagerDevice.c: g_malloc0 cannot fail.
|
||||||
* src/nm-dbus-nm.c: print when we sleep and wake up.
|
* 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>
|
2005-06-27 Robert Love <rml@novell.com>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -20,10 +20,10 @@
|
||||||
* Authors: Darin Adler <darin@eazel.com>
|
* Authors: Darin Adler <darin@eazel.com>
|
||||||
* Pavel Cisler <pavel@eazel.com>
|
* Pavel Cisler <pavel@eazel.com>
|
||||||
* Mike Fleming <mfleming@eazel.com>
|
* Mike Fleming <mfleming@eazel.com>
|
||||||
* John Sullivan <sullivan@eazel.com>
|
* John Sullivan <sullivan@eazel.com>
|
||||||
*
|
*
|
||||||
* (C) Copyright 2004 Red Hat, Inc.
|
* (C) Copyright 2004 Red Hat, Inc.
|
||||||
* Copyright (C) 1999, 2000 Eazel, Inc.
|
* (C) Copyright 1999, 2000 Eazel, Inc.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#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)
|
void wired_menu_item_update (NMWiredMenuItem *item, NetworkDevice *dev, const gint n_devices)
|
||||||
{
|
{
|
||||||
char *text;
|
char *text;
|
||||||
const char *dev_name;
|
|
||||||
|
|
||||||
g_return_if_fail (dev != NULL);
|
g_return_if_fail (dev != NULL);
|
||||||
g_return_if_fail (item != NULL);
|
g_return_if_fail (item != NULL);
|
||||||
g_assert (network_device_is_wired (dev));
|
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)
|
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);
|
text = g_strdup_printf (_("Wired Network (%s)"), dev_name);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
text = g_strdup (_("_Wired Network"));
|
text = g_strdup (_("_Wired Network"));
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue