2006-01-12 Robert Love <rml@novell.com>

* src/backends/NetworkManagerSuSE.c: Put the ppp device in the
	  description so that the description is unique for each
	  pair (device,provider).  Fixes Novell #142773.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1324 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love
2006-01-12 22:21:56 +00:00
committed by Robert Love
parent 07af507307
commit 1ccbaff850
2 changed files with 9 additions and 3 deletions

View File

@@ -1,3 +1,9 @@
2006-01-12 Robert Love <rml@novell.com>
* src/backends/NetworkManagerSuSE.c: Put the ppp device in the
description so that the description is unique for each
pair (device,provider). Fixes Novell #142773.
2006-01-12 Dan Williams <dcbw@redhat.com> 2006-01-12 Dan Williams <dcbw@redhat.com>
* src/nm-device-802-11-wireless.c * src/nm-device-802-11-wireless.c

View File

@@ -854,14 +854,14 @@ GSList * nm_system_get_dialup_config (void)
goto out_free; goto out_free;
config = g_malloc (sizeof (NMDialUpConfig)); config = g_malloc (sizeof (NMDialUpConfig));
config->data = g_strdup (dentry + 6); /* skip the "ifcfg-" prefix */
if (modem) { if (modem) {
config->name = g_strdup_printf ("%s via Modem", provider_name); config->name = g_strdup_printf ("%s via modem (%s)", provider_name, (char *) config->data);
config->type = NM_DIALUP_TYPE_MODEM; config->type = NM_DIALUP_TYPE_MODEM;
} else { } else {
config->name = g_strdup_printf ("%s via ISDN", provider_name); config->name = g_strdup_printf ("%s via ISDN (%s)", provider_name, (char *) config->data);
config->type = NM_DIALUP_TYPE_ISDN; config->type = NM_DIALUP_TYPE_ISDN;
} }
config->data = g_strdup (dentry + 6); /* skip the "ifcfg-" prefix */
list = g_slist_append (list, config); list = g_slist_append (list, config);