/[gentoo-x86]/net-misc/networkmanager/files/networkmanager-0.9.2.0-ifnet-remove-system-prefix.patch
Gentoo

Contents of /net-misc/networkmanager/files/networkmanager-0.9.2.0-ifnet-remove-system-prefix.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Thu Sep 13 09:54:12 2012 UTC (19 months ago) by tetromino
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Version bump with various fixes. No longer saves thousands of temporary ipv6 routes (bug #428274, thanks to Matthias Nagel). No longer installs dispatcher and init scripts when USE=systemd to avoid annoying systemd users (bug #434692, thanks to Arne St├Ącker). Drop old.

(Portage version: 2.2.0_alpha125/cvs/Linux x86_64)

1 From 145f86d0e98f5525e69a86c15be3f932104b5129 Mon Sep 17 00:00:00 2001
2 From: Mu Qiao <qiaomuf@gentoo.org>
3 Date: Thu, 22 Dec 2011 09:57:26 +0800
4 Subject: [PATCH 4/4] ifnet: remove system prefix
5
6 As all connections are system connection so the prefix is meaningless.
7 Drop it now.
8 ---
9 po/POTFILES.in | 1 -
10 src/settings/plugins/ifnet/connection_parser.c | 12 ++----------
11 2 files changed, 2 insertions(+), 11 deletions(-)
12
13 diff --git a/po/POTFILES.in b/po/POTFILES.in
14 index f021275..20b60d3 100644
15 --- a/po/POTFILES.in
16 +++ b/po/POTFILES.in
17 @@ -26,6 +26,5 @@ src/nm-device-olpc-mesh.c
18 src/nm-manager.c
19 src/nm-netlink-monitor.c
20 src/settings/plugins/ifcfg-rh/reader.c
21 -src/settings/plugins/ifnet/connection_parser.c
22 src/settings/nm-settings-utils.c
23
24 diff --git a/src/settings/plugins/ifnet/connection_parser.c b/src/settings/plugins/ifnet/connection_parser.c
25 index 66ce318..97bc7ff 100644
26 --- a/src/settings/plugins/ifnet/connection_parser.c
27 +++ b/src/settings/plugins/ifnet/connection_parser.c
28 @@ -45,12 +45,6 @@
29 #include "connection_parser.h"
30 #include "nm-ifnet-connection.h"
31
32 -static const char *
33 -get_prefix (void)
34 -{
35 - return _("System");
36 -}
37 -
38 static void
39 update_connection_id (NMConnection *connection, const char *conn_name)
40 {
41 @@ -62,11 +56,9 @@ update_connection_id (NMConnection *connection, const char *conn_name)
42
43 name_len = strlen (conn_name);
44 if ((name_len > 2) && (g_str_has_prefix (conn_name, "0x"))) {
45 - gchar * conn_name_printable = utils_hexstr2bin (conn_name + 2, name_len - 2);
46 - idstr = g_strdup_printf ("%s (%s)", get_prefix (), conn_name_printable);
47 - g_free (conn_name_printable);
48 + idstr = utils_hexstr2bin (conn_name + 2, name_len - 2);
49 } else
50 - idstr = g_strdup_printf ("%s (%s)", get_prefix (), conn_name);
51 + idstr = g_strdup_printf("%s", conn_name);
52 uuid_base = idstr;
53 uuid = nm_utils_uuid_generate_from_string (uuid_base);
54 setting =
55 --
56 1.7.3.4

  ViewVC Help
Powered by ViewVC 1.1.20