~network-manager/network-manager-applet/ubuntu.0.7.1.jaunty

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
=== modified file 'src/applet-device-wired.c'
--- a/src/applet-device-wired.c	2009-01-12 17:39:22 +0000
+++ b/src/applet-device-wired.c	2009-02-17 15:29:30 +0000
@@ -253,23 +253,19 @@
 	if (new_state == NM_DEVICE_STATE_ACTIVATED) {
 		NMConnection *connection;
 		NMSettingConnection *s_con = NULL;
-		char *str = NULL;
+		const char *str = NULL;
 
 		connection = applet_find_active_connection_for_device (device, applet, NULL);
 		if (connection) {
-			const char *id;
 			s_con = NM_SETTING_CONNECTION (nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION));
-			id = s_con ? nm_setting_connection_get_id (s_con) : NULL;
-			if (id)
-				str = g_strdup_printf (_("You are now connected to '%s'."), id);
+			str = s_con ? nm_setting_connection_get_id (s_con) : NULL;
 		}
 
 		applet_do_notify_with_pref (applet,
-		                            _("Connection Established"),
-		                            str ? str : _("You are now connected to the wired network."),
+		                            str ? str : _("Wired network"),
+		                            _("Connection Established"),
 		                            "nm-device-wired",
 		                            PREF_DISABLE_CONNECTED_NOTIFICATIONS);
-		g_free (str);
 	}
 }