network-manager-applet r637 - in trunk: . src

[dcbw svn gnome org]

Author: dcbw
Date: Mon Mar 31 19:14:04 2008
New Revision: 637
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=637&view=rev

Log:
2008-03-31  Dan Williams  <dcbw redhat com>

	* src/applet-device-wireless.c
		- (wireless_device_state_changed, wireless_get_icon): notification
			serivce needs UTF-8 safe strings since they get sent to the
			notification daemon over D-Bus, so use the right SSID->string
			conversion function (rh #435384)



Modified:
   trunk/ChangeLog
   trunk/src/applet-device-wireless.c

Modified: trunk/src/applet-device-wireless.c
==============================================================================
--- trunk/src/applet-device-wireless.c	(original)
+++ trunk/src/applet-device-wireless.c	Mon Mar 31 19:14:04 2008
@@ -950,7 +950,7 @@
 		const GByteArray *ssid = nm_access_point_get_ssid (applet->current_ap);
 
 		if (ssid)
-			esc_ssid = (char *) nm_utils_escape_ssid (ssid->data, ssid->len);
+			esc_ssid = nm_utils_ssid_to_utf8 ((const char *) ssid->data, ssid->len);
 
 		g_object_ref (applet->current_ap);
 		g_signal_connect (applet->current_ap,
@@ -969,6 +969,7 @@
 	applet_do_notify (applet, NOTIFY_URGENCY_LOW, _("Connection Established"),
 					  msg, "nm-device-wireless");
 	g_free (msg);
+	g_free (esc_ssid);
 }
 
 static GdkPixbuf *
@@ -979,7 +980,7 @@
 {
 	GdkPixbuf *pixbuf = NULL;
 	const char *iface;
-	char *esc_ssid = _("(none)");
+	char *esc_ssid = NULL;
 
 	iface = nm_device_get_iface (device);
 
@@ -988,9 +989,12 @@
 
 		ssid = nm_access_point_get_ssid (applet->current_ap);
 		if (ssid)
-			esc_ssid = (char *) nm_utils_escape_ssid (ssid->data, ssid->len);
+			esc_ssid = nm_utils_ssid_to_utf8 ((const char *) ssid->data, ssid->len);
 	}
 
+	if (!esc_ssid)
+		esc_ssid = g_strdup (_("(none)"));
+
 	switch (state) {
 	case NM_DEVICE_STATE_PREPARE:
 		*tip = g_strdup_printf (_("Preparing device %s for the wireless network '%s'..."), iface, esc_ssid);
@@ -1033,6 +1037,7 @@
 		break;
 	}
 
+	g_free (esc_ssid);
 	return pixbuf;
 }