diff --git a/ChangeLog b/ChangeLog index d0ce08f53..9647d420e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-01-12 Robert Love + + * 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 * src/nm-device-802-11-wireless.c diff --git a/src/backends/NetworkManagerSuSE.c b/src/backends/NetworkManagerSuSE.c index e6586713b..d280f70d7 100644 --- a/src/backends/NetworkManagerSuSE.c +++ b/src/backends/NetworkManagerSuSE.c @@ -854,14 +854,14 @@ GSList * nm_system_get_dialup_config (void) goto out_free; config = g_malloc (sizeof (NMDialUpConfig)); + config->data = g_strdup (dentry + 6); /* skip the "ifcfg-" prefix */ 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; } 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->data = g_strdup (dentry + 6); /* skip the "ifcfg-" prefix */ list = g_slist_append (list, config);