colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ifnet: remove system prefix

Browse Source 
As all connections are system connection so the prefix is meaningless.
Drop it now.
This commit is contained in:
Mu Qiao
2011-12-22 09:57:26 +08:00
committed by Dan Williams
parent e3a1b6e065
commit e7380561d5
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
po/POTFILES.in
View File

@@ -30,6 +30,5 @@ src/nm-device-vlan.c
src/nm-manager.c src/nm-manager.c
src/nm-netlink-monitor.c src/nm-netlink-monitor.c
src/settings/plugins/ifcfg-rh/reader.c src/settings/plugins/ifcfg-rh/reader.c
src/settings/plugins/ifnet/connection_parser.c
src/settings/nm-settings-utils.c src/settings/nm-settings-utils.c

12
src/settings/plugins/ifnet/connection_parser.c
View File

@@ -45,12 +45,6 @@
#include "connection_parser.h" #include "connection_parser.h"
#include "nm-ifnet-connection.h" #include "nm-ifnet-connection.h"
static const char *
get_prefix (void)
{
return _("System");
}
static void static void
update_connection_id (NMConnection *connection, const char *conn_name) update_connection_id (NMConnection *connection, const char *conn_name)
{ {
@@ -62,11 +56,9 @@ update_connection_id (NMConnection *connection, const char *conn_name)
name_len = strlen (conn_name); name_len = strlen (conn_name);
if ((name_len > 2) && (g_str_has_prefix (conn_name, "0x"))) { if ((name_len > 2) && (g_str_has_prefix (conn_name, "0x"))) {
gchar * conn_name_printable = utils_hexstr2bin (conn_name + 2, name_len - 2); idstr = utils_hexstr2bin (conn_name + 2, name_len - 2);
idstr = g_strdup_printf ("%s (%s)", get_prefix (), conn_name_printable);
g_free (conn_name_printable);
} else } else
idstr = g_strdup_printf ("%s (%s)", get_prefix (), conn_name); idstr = g_strdup_printf ("%s", conn_name);
uuid_base = idstr; uuid_base = idstr;
uuid = nm_utils_uuid_generate_from_string (uuid_base); uuid = nm_utils_uuid_generate_from_string (uuid_base);
setting = nm_connection_get_setting_connection (connection); setting = nm_connection_get_setting_connection (connection);