Display printable conn_name in nm-applet (bug #356337)

Package-Manager: portage-2.1.9.41/cvs/Linux x86_64

4 files changed, 40 insertions, 15 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index ec9687cb43b2..23e4fd3df93e 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/networkmanager
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.99 2011/02/26 05:59:00 qiaomuf Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.100 2011/02/26 08:13:31 qiaomuf Exp $
+
+*networkmanager-0.8.2-r9 (26 Feb 2011)
+
+  26 Feb 2011; Mu Qiao <qiaomuf@gentoo.org> -networkmanager-0.8.2-r8.ebuild,
+  +networkmanager-0.8.2-r9.ebuild,
+  files/networkmanager-0.8.2-ifnet-smarter-write.patch:
+  Display printable conn_name in nm-applet. (bug #356337)
 
 *networkmanager-0.8.2-r8 (26 Feb 2011)
 
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 0baf49f594b3..25a518589f5d 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -14,7 +14,7 @@ AUX networkmanager-0.8.2-confchanges.patch 1279 RMD160 1ff5b6d663aa4417beaf9c763
 AUX networkmanager-0.8.2-fix-tempfiles.patch 6758 RMD160 c403c33e71a38ca548b6ad8d8a3094094f11a686 SHA1 ee9818f898a34af688f507eabbdbda860108f418 SHA256 76951a82d62de94cd5d5862d26cd6c1b598623ae7b66c6592dff66c8fcb5a926
 AUX networkmanager-0.8.2-fix-tests.patch 2156 RMD160 b549d50e96efe7f26402f5d974560b3f9307dde5 SHA1 c38ae50f82a65c8e7e8c4a4fe65634e5ee9873c8 SHA256 d6cf4ceac6893a9893c916f1a5298cd1817ed0fb357f2e55539a3e6aae5e855e
 AUX networkmanager-0.8.2-fix-timestamp.patch 950 RMD160 4217e0332457eae47eb6c2f87a91f87adad37970 SHA1 d9fcaed9f2622937137bb977fba2d1c123b35893 SHA256 7d1d123b0da02ca8f02ce13b805eec912334bf1981032a38dcd2ef7e422bbf81
-AUX networkmanager-0.8.2-ifnet-smarter-write.patch 5246 RMD160 a3bf57278772419c0ce8ea31f04be2647f21d8d7 SHA1 04ff74828089b936e83dc843e451982e45b91974 SHA256 d14327b1540f0a37f13601980c1a68b9e2083dcfe3436417853deaf62fa820b7
+AUX networkmanager-0.8.2-ifnet-smarter-write.patch 5969 RMD160 d401c8eae69ea70f5bf08f2950a6e476a03f460b SHA1 9a1fde1c789b42ce6e3b0766125862bde962b4c8 SHA256 b4fbc482cbc22edfff0f89624d857cd35b6cb3d7fe85604c5453e7685eb4e12a
 AUX networkmanager-0.8.2-shared-connection.patch 15067 RMD160 3e878a999e92fdb6baffba6f2a12caa25a2ba2c6 SHA1 e9664c505bc19964082aa319c4d524e6cf6651e2 SHA256 57f56fb45e48f80636a17d64f080aae594d6f19e51ff5467cc27a739b4b380e6
 AUX nm-system-settings.conf 23 RMD160 6d66c702b345bde668a420a15716feea6005fbd1 SHA1 49ba558d20f5ca5a201e027e13b878dd5ac3569c SHA256 44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21
 AUX nm-system-settings.conf-ifnet 70 RMD160 c0d2be147383999b62cead86ab4333169e4ef277 SHA1 679ec8052b610969c148a2d34cd4da7a41484a76 SHA256 34f53d9ac1ad65eda6942dc3059117f60f6321059ca23f4fbfcc2f2edcae151f
@@ -27,6 +27,6 @@ EBUILD networkmanager-0.8.1-r6.ebuild 4784 RMD160 cdf8ca556319629e311744d84f0822
 EBUILD networkmanager-0.8.2-r1.ebuild 4132 RMD160 1261ce2f0e499ece5e2ea4c010c8627ede1fa754 SHA1 96f9ac6b0ecaf0656386e82458453a97dfb8be61 SHA256 d247e094c0e22b885b78efa2cc8a6c8b32bbb5967f95a46439985d9a9da7362e
 EBUILD networkmanager-0.8.2-r2.ebuild 4407 RMD160 6ecc01211eb01e86a6856a1379dfdb991177b0d9 SHA1 ae3cc0a5869fc26b155b9704b286e61a01899c8c SHA256 0ead477d6ed601be6d1e3e5fa2a4546cc9cbbde77703406287125b3b639c5db2
 EBUILD networkmanager-0.8.2-r6.ebuild 4837 RMD160 417fa42b1d369fedaa6b7aea043a80cb52fd81e8 SHA1 99779c8f7693c2aeec53c489fa2319e042242b6d SHA256 c591c769bea0660755c3913a879fe74ab6413e2e3e58e83fcf2f0e24f49597de
-EBUILD networkmanager-0.8.2-r8.ebuild 4941 RMD160 ba04f499d74f30dcf19b78b8e79dab38af69d165 SHA1 9167920dbd3b297022908c96c1e29666fcf5490f SHA256 749abe755fcbc049df861f7deda265e2a8fa3d1475c385c45ff01eba463c8384
-MISC ChangeLog 20714 RMD160 5335bca6bad237f9e3d5f0036c82401f6c6a0c72 SHA1 d498789dfe864d7e785bbc8a77b5cf1a9f46ef63 SHA256 72e4fdb7006fb6fdf5cdce4e36fcfc27b03732aa0e604518437206086f61ef21
+EBUILD networkmanager-0.8.2-r9.ebuild 4941 RMD160 c183214554e338d4cef7bb26690b68b7fac9ec7b SHA1 28488b44d53e24963cc2679e7bdafbe140fade1a SHA256 957358e3a9ec961fc3a41830eb8cd93b2998b60c9ab6659fa5d399f49dfc0642
+MISC ChangeLog 20982 RMD160 cff30c4b7ca4e888121d5645c2e4da800efabfca SHA1 8e318f963aef10b66c03aaaa23b8409f4dd13795 SHA256 a375a5a91510f0bd3bcb07a662e7d83507aa8259f61b32624f087a1e0c041024
 MISC metadata.xml 1064 RMD160 28d68851ef6cb80bfef006ab6f88d2f93f44bee9 SHA1 ea76e3b1043d5933df8ed0531f89b0bc8e4b7d7c SHA256 ebb4664fb8edea0672a185e68c1cda3c0f3d5fa0ad906a50a67caafe380ef6be
diff --git a/net-misc/networkmanager/files/networkmanager-0.8.2-ifnet-smarter-write.patch b/net-misc/networkmanager/files/networkmanager-0.8.2-ifnet-smarter-write.patch
index a1f589d0062b..ff4c1f253677 100644
--- a/net-misc/networkmanager/files/networkmanager-0.8.2-ifnet-smarter-write.patch
+++ b/net-misc/networkmanager/files/networkmanager-0.8.2-ifnet-smarter-write.patch
@@ -1,4 +1,4 @@
-From 5b018326db5c9ebad8a63e1e231f49d2ca65e28c Mon Sep 17 00:00:00 2001
+From 776fafc133e18df48dc92a717c662e1b2858567e Mon Sep 17 00:00:00 2001
 From: Mu Qiao <qiaomuf@gentoo.org>
 Date: Fri, 25 Feb 2011 16:25:07 +0000
 Subject: [PATCH 3/3] Won't write when nothing changed
@@ -7,17 +7,35 @@ Subject: [PATCH 3/3] Won't write when nothing changed
 
 Signed-off-by: Mu Qiao <qiaomuf@gentoo.org>
 ---
- system-settings/plugins/ifnet/connection_parser.c |   24 ++++++--------------
- system-settings/plugins/ifnet/net_parser.c        |    8 +++++-
- system-settings/plugins/ifnet/plugin.c            |    4 ---
- system-settings/plugins/ifnet/wpa_parser.c        |    7 ++++-
- 4 files changed, 18 insertions(+), 25 deletions(-)
+ system-settings/plugins/ifnet/connection_parser.c |   33 +++++++++-----------
+ system-settings/plugins/ifnet/net_parser.c        |    8 ++++-
+ system-settings/plugins/ifnet/plugin.c            |    4 --
+ system-settings/plugins/ifnet/wpa_parser.c        |    7 +++-
+ 4 files changed, 26 insertions(+), 26 deletions(-)
 
 diff --git a/system-settings/plugins/ifnet/connection_parser.c b/system-settings/plugins/ifnet/connection_parser.c
-index 9b5ddc1..8600142 100644
+index 9b5ddc1..4ac2173 100644
 --- a/system-settings/plugins/ifnet/connection_parser.c
 +++ b/system-settings/plugins/ifnet/connection_parser.c
-@@ -627,23 +627,13 @@ make_ip4_setting (NMConnection * connection, gchar * conn_name, GError ** error)
+@@ -55,9 +55,16 @@ update_connection_id (NMConnection * connection, gchar * conn_name)
+ 	gchar *idstr = NULL;
+ 	gchar *uuid_base = NULL;
+ 	gchar *uuid = NULL;
++	int name_len;
+ 	NMSettingConnection *setting;
+ 
+-	idstr = g_strdup_printf ("%s (%s)", get_prefix (), conn_name);
++	name_len = strlen (conn_name);
++	if ((name_len > 2) && (g_str_has_prefix (conn_name, "0x"))) {
++		gchar * conn_name_printable = 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
++		idstr = g_strdup_printf ("%s (%s)", get_prefix (), conn_name);
+ 	uuid_base = idstr;
+ 	uuid = nm_utils_uuid_generate_from_string (uuid_base);
+ 	setting =
+@@ -627,23 +634,13 @@ make_ip4_setting (NMConnection * connection, gchar * conn_name, GError ** error)
  				g_object_set (ip4_setting,
  					      NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES,
  					      TRUE, NULL);
@@ -44,7 +62,7 @@ index 9b5ddc1..8600142 100644
  		}
  		g_object_set (ip4_setting,
  			      NM_SETTING_IP4_CONFIG_METHOD,
-@@ -2276,11 +2266,12 @@ write_wireless_setting (NMConnection * connection,
+@@ -2276,11 +2273,12 @@ write_wireless_setting (NMConnection * connection,
  		return FALSE;
  	}
  
@@ -60,7 +78,7 @@ index 9b5ddc1..8600142 100644
  			hex_ssid = TRUE;
  			break;
  		}
-@@ -2487,7 +2478,6 @@ write_ip4_setting (NMConnection * connection, gchar * conn_name,
+@@ -2487,7 +2485,6 @@ write_ip4_setting (NMConnection * connection, gchar * conn_name,
  		ifnet_set_data (conn_name, "config", "dhcp");
  
  	/* DNS Servers */
diff --git a/net-misc/networkmanager/networkmanager-0.8.2-r8.ebuild b/net-misc/networkmanager/networkmanager-0.8.2-r9.ebuild
index 7c1c488f662d..bc12243522bd 100644
--- a/net-misc/networkmanager/networkmanager-0.8.2-r8.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.8.2-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.2-r8.ebuild,v 1.1 2011/02/26 05:59:00 qiaomuf Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.2-r9.ebuild,v 1.1 2011/02/26 08:13:31 qiaomuf Exp $
 
 EAPI="2"