Merge lp:~achiang/network-manager-applet/precise-lp780602 into lp:~network-manager/network-manager-applet/ubuntu.precise

[Alex Chiang]

Backport several memory leaks from trunk that were fixed in 12.10 in the hopes that they fix LP: #780602

Packages built fine, and installed fine on my 12.04 amd64 laptop.

Currently doing a valgrind run to verify that things are better, but since these patches have been shipped for a long time, I think these are pretty safe.

[Mathieu Trudel-Lapierre (cyphermox)]

Looking good, with the only exception (at first glance) that the version should be 2.1 instead of 3. I'll do a more thorough review tomorrow ;)

review: Needs Fixing

[lp:~achiang/network-manager-applet/precise-lp780602]

340. By Alex Chiang on 2012-11-23

Fix version string.

[Mathieu Trudel-Lapierre (cyphermox)]

Already did merge and upload this : approve.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-05 19:07:45 +0000
+++ debian/changelog	2012-11-23 16:30:42 +0000
@@ -1,3 +1,16 @@
+network-manager-applet (0.9.4.1-0ubuntu2.1) UNRELEASED; urgency=low
+
+  * Backport r355, r364, r368 from trunk (LP: #780602)
+    - debian/patches/nm-applet-use-indicator.patch: Plug two small leaks.
+    - debian/patches/git_fix_some_leaks_80ef61b.patch: cherry-picked patch to
+      fix a few leaks: g_object_get() and gtk_tree_model_get() copy/ref the
+      values they return, so make sure to deal with that everywhere.
+    - debian/patches/git_mac_addr_string_leakage_6dae878.patch: use
+      nm_utils_hwaddr_ntoa() to output MAC addresses as strings since it's
+      available and make sure they get freed to avoid leaks.
+
+ -- Alex Chiang <[e-mail]>  Wed, 21 Nov 2012 16:24:21 -0800
+
 network-manager-applet (0.9.4.1-0ubuntu2) precise; urgency=low
 
   * debian/patches/nm-applet-use-indicator.patch: move the tooltip/accessible

=== added file 'debian/patches/git_fix_some_leaks_80ef61b.patch'
--- debian/patches/git_fix_some_leaks_80ef61b.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git_fix_some_leaks_80ef61b.patch	2012-11-23 16:30:42 +0000
@@ -0,0 +1,336 @@
+From 80ef61b967d33e398b0637ebfb5a0dae06ddd379 Mon Sep 17 00:00:00 2001
+From: Dan Winship <[e-mail]>
+Date: Thu, 15 Mar 2012 14:25:46 +0000
+Subject: Fix some leaks
+
+g_object_get() and gtk_tree_model_get() copy/ref the values they
+return, so make sure to deal with that everywhere.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=679723
+---
+diff --git a/src/connection-editor/nm-connection-list.c b/src/connection-editor/nm-connection-list.c
+index 455334d..09e84ea 100644
+--- a/src/connection-editor/nm-connection-list.c
++++ b/src/connection-editor/nm-connection-list.c
+@@ -127,6 +127,12 @@ get_active_connection (GtkTreeView *treeview)
+ 	g_list_foreach (selected_rows, (GFunc) gtk_tree_path_free, NULL);
+ 	g_list_free (selected_rows);
+ 
++	/* gtk_tree_model_get() will have reffed connection, but we don't
++	 * need that since we know the model will continue to hold a ref.
++	 */
++	if (connection)
++		g_object_unref (connection);
++
+ 	return connection;
+ }
+ 
+@@ -198,9 +204,9 @@ get_iter_for_connection (GtkTreeModel *model,
+ 		if (candidate && (candidate == connection)) {
+ 			*iter = temp_iter;
+ 			found = TRUE;
+-			break;
+ 		}
+-	} while (gtk_tree_model_iter_next (model, &temp_iter));
++		g_object_unref (candidate);
++	} while (!found && gtk_tree_model_iter_next (model, &temp_iter));
+ 
+ 	return found;
+ }
+diff --git a/src/connection-editor/page-wireless-security.c b/src/connection-editor/page-wireless-security.c
+index 346a52a..09a6744 100644
+--- a/src/connection-editor/page-wireless-security.c
++++ b/src/connection-editor/page-wireless-security.c
+@@ -504,6 +504,8 @@ validate (CEPage *page, NMConnection *connection, GError **error)
+ 				valid = FALSE;
+ 			}
+ 		}
++
++		wireless_security_unref (sec);
+ 	} else {
+ 		/* No security, unencrypted */
+ 		g_object_set (s_wireless, NM_SETTING_WIRELESS_SEC, NULL, NULL);
+@@ -519,9 +521,14 @@ static GtkWidget *
+ nag_user (CEPage *page)
+ {
+ 	WirelessSecurity *sec;
++	GtkWidget *nag = NULL;
+ 
+ 	sec = wireless_security_combo_get_active (CE_PAGE_WIRELESS_SECURITY (page));
+-	return sec ? wireless_security_nag_user (sec) : NULL;
++	if (sec) {
++		nag = wireless_security_nag_user (sec);
++		wireless_security_unref (sec);
++	}
++	return nag;
+ }
+ 
+ static void
+diff --git a/src/connection-editor/page-wireless.c b/src/connection-editor/page-wireless.c
+index 886f175..3b1b57e 100644
+--- a/src/connection-editor/page-wireless.c
++++ b/src/connection-editor/page-wireless.c
+@@ -285,9 +285,9 @@ populate_ui (CEPageWireless *self)
+ {
+ 	CEPageWirelessPrivate *priv = CE_PAGE_WIRELESS_GET_PRIVATE (self);
+ 	NMSettingWireless *setting = priv->setting;
+-	const GByteArray *ssid = NULL;
+-	const char *mode = NULL;
+-	const char *band = NULL;
++	GByteArray *ssid = NULL;
++	char *mode = NULL;
++	char *band = NULL;
+ 	int band_idx = 0;
+ 	int rate_def;
+ 	int tx_power_def;
+@@ -330,6 +330,7 @@ populate_ui (CEPageWireless *self)
+ 	gtk_entry_set_text (priv->ssid, utf8_ssid);
+ 	g_signal_connect_swapped (priv->ssid, "changed", G_CALLBACK (ce_page_changed), self);
+ 	g_free (utf8_ssid);
++	g_byte_array_unref (ssid);
+ 
+ 	/* Default to Infrastructure */
+ 	gtk_combo_box_set_active (priv->mode, 0);
+@@ -337,6 +338,7 @@ populate_ui (CEPageWireless *self)
+ 		gtk_combo_box_set_active (priv->mode, 1);
+ 	mode_combo_changed_cb (priv->mode, self);
+ 	g_signal_connect (priv->mode, "changed", G_CALLBACK (mode_combo_changed_cb), self);
++	g_free (mode);
+ 
+ 	g_signal_connect (priv->channel, "output",
+ 	                  G_CALLBACK (channel_spin_output_cb),
+@@ -354,6 +356,7 @@ populate_ui (CEPageWireless *self)
+ 			band_idx = 2;
+ 			gtk_widget_set_sensitive (GTK_WIDGET (priv->channel), TRUE);
+ 		}
++		g_free (band);
+ 	}
+ 
+ 	gtk_combo_box_set_active (priv->band, band_idx);
+diff --git a/src/connection-editor/vpn-helpers.c b/src/connection-editor/vpn-helpers.c
+index 12547fe..55ef432 100644
+--- a/src/connection-editor/vpn-helpers.c
++++ b/src/connection-editor/vpn-helpers.c
+@@ -427,17 +427,22 @@ sort_plugins (gconstpointer a, gconstpointer b)
+ {
+ 	NMVpnPluginUiInterface *aa = NM_VPN_PLUGIN_UI_INTERFACE (a);
+ 	NMVpnPluginUiInterface *bb = NM_VPN_PLUGIN_UI_INTERFACE (b);
+-	const char *aa_desc = NULL, *bb_desc = NULL;
++	char *aa_desc = NULL, *bb_desc = NULL;
++	gint ret;
+ 
+ 	g_object_get (aa, NM_VPN_PLUGIN_UI_INTERFACE_NAME, &aa_desc, NULL);
+ 	g_object_get (bb, NM_VPN_PLUGIN_UI_INTERFACE_NAME, &bb_desc, NULL);
+ 
+ 	if (!aa_desc)
+-		return -1;
+-	if (!bb_desc)
+-		return 1;
+-
+-	return strcmp (aa_desc, bb_desc);
++		ret = -1;
++	else if (!bb_desc)
++		ret = 1;
++	else
++		ret = strcmp (aa_desc, bb_desc);
++
++	g_free (aa_desc);
++	g_free (bb_desc);
++	return ret;
+ }
+ 
+ #define COL_PLUGIN_DESC 0
+@@ -450,7 +455,7 @@ combo_changed_cb (GtkComboBox *combo, gpointer user_data)
+ 	GtkTreeModel *model;
+ 	GtkTreeIter iter;
+ 	NMVpnPluginUiInterface *plugin = NULL;
+-	const char *desc = NULL;
++	char *desc = NULL;
+ 	char *tmp;
+ 
+ 	if (!gtk_combo_box_get_active_iter (combo, &iter))
+@@ -465,12 +470,14 @@ combo_changed_cb (GtkComboBox *combo, gpointer user_data)
+ 		goto error;
+ 
+ 	g_object_get (G_OBJECT (plugin), NM_VPN_PLUGIN_UI_INTERFACE_DESC, &desc, NULL);
++	g_object_unref (plugin);
+ 	if (!desc)
+ 		goto error;
+ 
+ 	tmp = g_strdup_printf ("<i>%s</i>", desc);
+ 	gtk_label_set_markup (label, tmp);
+ 	g_free (tmp);
++	g_free (desc);
+ 	return;
+ 
+ error:
+@@ -515,13 +522,14 @@ vpn_ask_connection_type (GtkWindow *parent)
+ 	plugin_list = g_slist_sort (plugin_list, sort_plugins);
+ 	for (iter = plugin_list; iter; iter = g_slist_next (iter)) {
+ 		NMVpnPluginUiInterface *plugin = NM_VPN_PLUGIN_UI_INTERFACE (iter->data);
+-		const char *desc;
++		char *desc;
+ 
+ 		gtk_list_store_append (GTK_LIST_STORE (model), &tree_iter);
+ 		g_object_get (plugin, NM_VPN_PLUGIN_UI_INTERFACE_NAME, &desc, NULL);
+ 		gtk_list_store_set (GTK_LIST_STORE (model), &tree_iter,
+ 		                    COL_PLUGIN_DESC, desc,
+ 		                    COL_PLUGIN_OBJ, plugin, -1);
++		g_free (desc);
+ 	}
+ 
+ 	combo = GTK_WIDGET (gtk_builder_get_object (builder, "vpn_type_combo"));
+@@ -540,15 +548,17 @@ vpn_ask_connection_type (GtkWindow *parent)
+ 		NMVpnPluginUiInterface *plugin = NULL;
+ 
+ 		gtk_tree_model_get (model, &tree_iter, COL_PLUGIN_OBJ, &plugin, -1);
+-		if (plugin)
++		if (plugin) {
+ 			g_object_get (G_OBJECT (plugin), NM_VPN_PLUGIN_UI_INTERFACE_SERVICE, &service_type, NULL);
++			g_object_unref (plugin);
++		}
+ 	}
+ 
+ out:
+ 	gtk_widget_destroy (dialog);
+ 	g_object_unref (builder);
+ 	if (service_type)
+-		return g_strdup (service_type);
++		return service_type;
+ 	return NULL;
+ }
+ 
+diff --git a/src/libnm-gtk/nm-mobile-wizard.c b/src/libnm-gtk/nm-mobile-wizard.c
+index 2b91fa9..0966c99 100644
+--- a/src/libnm-gtk/nm-mobile-wizard.c
++++ b/src/libnm-gtk/nm-mobile-wizard.c
+@@ -171,6 +171,8 @@ assistant_closed (GtkButton *button, gpointer user_data)
+ 
+ 	(*(self->callback)) (self, FALSE, wiz_method, self->user_data);
+ 
++	if (provider)
++		nmn_mobile_provider_unref (provider);
+ 	g_free (wiz_method->provider_name);
+ 	g_free (wiz_method->plan_name);
+ 	g_free (wiz_method->username);
+@@ -292,17 +294,20 @@ confirm_prepare (NMAMobileWizard *self)
+ 
+ 	/* Provider */
+ 	str = g_string_new (NULL);
+-	if (provider)
++	if (provider) {
+ 		g_string_append (str, provider->name);
+-	else {
++		nmn_mobile_provider_unref (provider);
++	} else {
+ 		const char *unlisted_provider;
+ 
+ 		unlisted_provider = gtk_entry_get_text (GTK_ENTRY (self->provider_unlisted_entry));
+ 		g_string_append (str, unlisted_provider);
+ 	}
+ 
+-	if (country)
++	if (country) {
+ 		g_string_append_printf (str, ", %s", country);
++		g_free (country);
++	}
+ 	gtk_label_set_text (GTK_LABEL (self->confirm_provider), str->str);
+ 	g_string_free (str, TRUE);
+ 
+@@ -576,6 +581,7 @@ plan_prepare (NMAMobileWizard *self)
+ 			                    -1);
+ 			count++;
+ 		}
++		nmn_mobile_provider_unref (provider);
+ 
+ 		/* Draw the separator */
+ 		if (count)
+diff --git a/src/libnm-gtk/nm-wireless-dialog.c b/src/libnm-gtk/nm-wireless-dialog.c
+index f17c776..885a1c6 100644
+--- a/src/libnm-gtk/nm-wireless-dialog.c
++++ b/src/libnm-gtk/nm-wireless-dialog.c
+@@ -112,25 +112,6 @@ nma_wireless_dialog_get_nag_ignored (NMAWirelessDialog *self)
+ }
+ 
+ static void
+-model_free (GtkTreeModel *model, guint col)
+-{
+-	GtkTreeIter	iter;
+-
+-	if (!model)
+-		return;
+-
+-	if (gtk_tree_model_get_iter_first (model, &iter)) {
+-		do {
+-			char *str;
+-
+-			gtk_tree_model_get (model, &iter, col, &str, -1);
+-			g_free (str);
+-		} while (gtk_tree_model_iter_next (model, &iter));
+-	}
+-	g_object_unref (model);
+-}
+-
+-static void
+ size_group_clear (GtkSizeGroup *group)
+ {
+ 	GSList *iter;
+@@ -427,7 +408,7 @@ connection_combo_init (NMAWirelessDialog *self, NMConnection *connection)
+ 	g_return_val_if_fail (priv->connection == NULL, FALSE);
+ 
+ 	/* Clear any old model */
+-	model_free (priv->connection_model, C_NAME_COLUMN);
++	g_object_unref (priv->connection_model);
+ 
+ 	/* New model */
+ 	store = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_OBJECT, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
+@@ -1358,7 +1339,7 @@ GtkWidget *
+ nma_wireless_dialog_nag_user (NMAWirelessDialog *self)
+ {
+ 	NMAWirelessDialogPrivate *priv;
+-	GtkWidget *combo;
++	GtkWidget *combo, *nag;
+ 	GtkTreeModel *model;
+ 	GtkTreeIter iter;
+ 	WirelessSecurity *sec = NULL;
+@@ -1378,8 +1359,11 @@ nma_wireless_dialog_nag_user (NMAWirelessDialog *self)
+ 	}
+ 
+ 	gtk_tree_model_get (model, &iter, S_SEC_COLUMN, &sec, -1);
+-	if (sec)
+-		return wireless_security_nag_user (sec);
++	if (sec) {
++		nag = wireless_security_nag_user (sec);
++		wireless_security_unref (sec);
++		return nag;
++	}
+ 
+ 	return NULL;
+ }
+@@ -1417,8 +1401,8 @@ dispose (GObject *object)
+ 	g_object_unref (priv->settings);
+ 	g_object_unref (priv->builder);
+ 
+-	model_free (priv->device_model, D_NAME_COLUMN);
+-	model_free (priv->connection_model, C_NAME_COLUMN);
++	g_object_unref (priv->device_model);
++	g_object_unref (priv->connection_model);
+ 
+ 	if (priv->group)
+ 		g_object_unref (priv->group);
+diff --git a/src/wireless-security/wireless-security.c b/src/wireless-security/wireless-security.c
+index 00cc637..db51920 100644
+--- a/src/wireless-security/wireless-security.c
++++ b/src/wireless-security/wireless-security.c
+@@ -544,6 +544,8 @@ ws_802_1x_nag_user (WirelessSecurity *sec,
+ 	gtk_tree_model_get (model, &iter, AUTH_METHOD_COLUMN, &eap, -1);
+ 	g_return_val_if_fail (eap != NULL, NULL);
+ 
+-	return eap_method_nag_user (eap);
++	widget = eap_method_nag_user (eap);
++	eap_method_unref (eap);
++	return widget;
+ }
+ 
+--
+cgit v0.9.0.2

=== added file 'debian/patches/git_mac_addr_string_leakage_6dae878.patch'
--- debian/patches/git_mac_addr_string_leakage_6dae878.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/git_mac_addr_string_leakage_6dae878.patch	2012-11-23 16:30:42 +0000
@@ -0,0 +1,94 @@
+From 6dae878bbd1c2d0813f26b38cd6c447e33c903fe Mon Sep 17 00:00:00 2001
+From: Jiří Klimeš <[e-mail]>
+Date: Wed, 05 Sep 2012 12:59:26 +0000
+Subject: editor: use nm_utils_hwaddr_ntoa() for converting MAC address to string
+
+and fix the string leakage.
+---
+diff --git a/src/connection-editor/page-wired.c b/src/connection-editor/page-wired.c
+index 2d1ad0f..58e13be 100644
+--- a/src/connection-editor/page-wired.c
++++ b/src/connection-editor/page-wired.c
+@@ -17,7 +17,7 @@
+  * with this program; if not, write to the Free Software Foundation, Inc.,
+  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  *
+- * (C) Copyright 2008 - 2011 Red Hat, Inc.
++ * (C) Copyright 2008 - 2012 Red Hat, Inc.
+  */
+ 
+ #include "config.h"
+@@ -31,6 +31,8 @@
+ #include <nm-setting-connection.h>
+ #include <nm-setting-wired.h>
+ #include <nm-device-ethernet.h>
++#include <nm-utils.h>
++#include <net/if_arp.h> /* for ARPHRD_ETHER for MAC utilies */
+ 
+ #include "page-wired.h"
+ 
+@@ -174,11 +176,7 @@ populate_ui (CEPageWired *self)
+ 	/* Device MAC address */
+ 	mac_list = ce_page_get_mac_list (CE_PAGE (self));
+ 	s_mac = nm_setting_wired_get_mac_address (setting);
+-	s_mac_str = s_mac ? g_strdup_printf ("%02X:%02X:%02X:%02X:%02X:%02X",
+-	                                     s_mac->data[0], s_mac->data[1], s_mac->data[2],
+-	                                     s_mac->data[3], s_mac->data[4], s_mac->data[5]):
+-	                    NULL;
+-
++	s_mac_str = s_mac ? nm_utils_hwaddr_ntoa (s_mac->data, ARPHRD_ETHER) : NULL;
+ 	for (iter = mac_list; iter && *iter; iter++) {
+ #if GTK_CHECK_VERSION (2,24,0)
+ 		gtk_combo_box_text_append_text (priv->device_mac, *iter);
+@@ -202,6 +200,7 @@ populate_ui (CEPageWired *self)
+ 		if (entry)
+ 			gtk_entry_set_text (GTK_ENTRY (entry), active_mac ? active_mac : s_mac_str);
+ 	}
++	g_free (s_mac_str);
+ 	g_strfreev (mac_list);
+ 	g_signal_connect (priv->device_mac, "changed", G_CALLBACK (stuff_changed), self);
+ 
+diff --git a/src/connection-editor/page-wireless.c b/src/connection-editor/page-wireless.c
+index 886f175..74b48cf 100644
+--- a/src/connection-editor/page-wireless.c
++++ b/src/connection-editor/page-wireless.c
+@@ -17,7 +17,7 @@
+  * with this program; if not, write to the Free Software Foundation, Inc.,
+  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  *
+- * (C) Copyright 2008 - 2010 Red Hat, Inc.
++ * (C) Copyright 2008 - 2012 Red Hat, Inc.
+  */
+ 
+ #include "config.h"
+@@ -32,6 +32,7 @@
+ #include <nm-setting-wireless.h>
+ #include <nm-device-wifi.h>
+ #include <nm-utils.h>
++#include <net/if_arp.h> /* for ARPHRD_ETHER for MAC utilies */
+ 
+ #include "page-wireless.h"
+ 
+@@ -374,11 +375,7 @@ populate_ui (CEPageWireless *self)
+ 	/* Device MAC address */
+ 	mac_list = ce_page_get_mac_list (CE_PAGE (self));
+ 	s_mac = nm_setting_wireless_get_mac_address (setting);
+-	s_mac_str = s_mac ? g_strdup_printf ("%02X:%02X:%02X:%02X:%02X:%02X",
+-	                                     s_mac->data[0], s_mac->data[1], s_mac->data[2],
+-	                                     s_mac->data[3], s_mac->data[4], s_mac->data[5]):
+-	                    NULL;
+-
++	s_mac_str = s_mac ? nm_utils_hwaddr_ntoa (s_mac->data, ARPHRD_ETHER) : NULL;
+ 	for (iter = mac_list; iter && *iter; iter++) {
+ #if GTK_CHECK_VERSION (2,24,0)
+ 		gtk_combo_box_text_append_text (priv->device_mac, *iter);
+@@ -402,6 +399,7 @@ populate_ui (CEPageWireless *self)
+ 		if (entry)
+ 			gtk_entry_set_text (GTK_ENTRY (entry), active_mac ? active_mac : s_mac_str);
+ 	}
++	g_free (s_mac_str);
+ 	g_strfreev (mac_list);
+ 	g_signal_connect_swapped (priv->device_mac, "changed", G_CALLBACK (ce_page_changed), self);
+ 
+--
+cgit v0.9.0.2

=== modified file 'debian/patches/nm-applet-use-indicator.patch'
--- debian/patches/nm-applet-use-indicator.patch	2012-04-03 15:31:39 +0000
+++ debian/patches/nm-applet-use-indicator.patch	2012-11-23 16:30:42 +0000
@@ -25,11 +25,11 @@
  src/mobile-helpers.h          |   11 +
  14 files changed, 1020 insertions(+), 113 deletions(-)
 
-Index: b/configure.ac
+Index: network-manager-applet-0.9.4.1/configure.ac
 ===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -170,6 +170,14 @@ case "${with_bluetooth}" in
+--- network-manager-applet-0.9.4.1.orig/configure.ac	2012-03-23 15:55:33.000000000 -0700
++++ network-manager-applet-0.9.4.1/configure.ac	2012-11-21 16:19:09.071734640 -0800
+@@ -170,6 +170,14 @@
  		;;
  esac
  
@@ -44,11 +44,11 @@
  AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes")
  
  AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
-Index: b/src/Makefile.am
+Index: network-manager-applet-0.9.4.1/src/Makefile.am
 ===================================================================
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -8,6 +8,7 @@ nm_applet_CPPFLAGS = \
+--- network-manager-applet-0.9.4.1.orig/src/Makefile.am	2012-03-13 16:03:59.000000000 -0700
++++ network-manager-applet-0.9.4.1/src/Makefile.am	2012-11-21 16:19:09.071734640 -0800
+@@ -8,6 +8,7 @@
  	$(GCONF_CFLAGS) \
  	$(GNOME_KEYRING_CFLAGS) \
  	$(NOTIFY_CFLAGS) \
@@ -56,7 +56,7 @@
  	-DICONDIR=\""$(datadir)/icons"\"						\
  	-DUIDIR=\""$(uidir)"\"							\
  	-DBINDIR=\""$(bindir)"\"								\
-@@ -68,6 +69,7 @@ nm_applet_LDADD = \
+@@ -68,6 +69,7 @@
  	$(GCONF_LIBS) \
  	$(GNOME_KEYRING_LIBS) \
  	$(NOTIFY_LIBS) \
@@ -64,11 +64,11 @@
  	${top_builddir}/src/marshallers/libmarshallers.la \
  	${top_builddir}/src/utils/libutils.la \
  	${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
-Index: b/src/applet-device-bt.c
+Index: network-manager-applet-0.9.4.1/src/applet-device-bt.c
 ===================================================================
---- a/src/applet-device-bt.c
-+++ b/src/applet-device-bt.c
-@@ -154,7 +154,9 @@ bt_add_menu_item (NMDevice *device,
+--- network-manager-applet-0.9.4.1.orig/src/applet-device-bt.c	2012-03-19 11:39:48.000000000 -0700
++++ network-manager-applet-0.9.4.1/src/applet-device-bt.c	2012-11-21 16:19:09.071734640 -0800
+@@ -154,7 +154,9 @@
  
  	item = applet_menu_item_create_device_item_helper (device, applet, text);
  
@@ -78,7 +78,7 @@
  	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
  	gtk_widget_show (item);
  
-@@ -209,15 +211,16 @@ bt_device_state_changed (NMDevice *devic
+@@ -209,15 +211,16 @@
  	}
  }
  
@@ -97,7 +97,7 @@
  	const char *id;
  
  	id = nm_device_get_iface (NM_DEVICE (device));
-@@ -240,14 +243,16 @@ bt_get_icon (NMDevice *device,
+@@ -240,14 +243,16 @@
  		*tip = g_strdup_printf (_("Requesting a network address for '%s'..."), id);
  		break;
  	case NM_DEVICE_STATE_ACTIVATED:
@@ -116,11 +116,11 @@
  }
  
  typedef struct {
-Index: b/src/applet-device-cdma.c
+Index: network-manager-applet-0.9.4.1/src/applet-device-cdma.c
 ===================================================================
---- a/src/applet-device-cdma.c
-+++ b/src/applet-device-cdma.c
-@@ -327,6 +327,9 @@ cdma_add_menu_item (NMDevice *device,
+--- network-manager-applet-0.9.4.1.orig/src/applet-device-cdma.c	2012-03-19 07:53:53.000000000 -0700
++++ network-manager-applet-0.9.4.1/src/applet-device-cdma.c	2012-11-21 16:19:09.071734640 -0800
+@@ -327,6 +327,9 @@
  	char *text;
  	GtkWidget *item;
  	GSList *connections, *all, *iter;
@@ -130,7 +130,7 @@
  
  	info = g_object_get_data (G_OBJECT (device), "devinfo");
  
-@@ -348,7 +351,9 @@ cdma_add_menu_item (NMDevice *device,
+@@ -348,7 +351,9 @@
  	}
  
  	item = applet_menu_item_create_device_item_helper (device, applet, text);
@@ -140,7 +140,7 @@
  	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
  	gtk_widget_show (item);
  	g_free (text);
-@@ -360,6 +365,7 @@ cdma_add_menu_item (NMDevice *device,
+@@ -360,6 +365,7 @@
  		s_con = nm_connection_get_setting_connection (active);
  		g_assert (s_con);
  
@@ -148,7 +148,7 @@
  		item = nm_mb_menu_item_new (nm_setting_connection_get_id (s_con),
  		                            info->quality_valid ? info->quality : 0,
  		                            info->provider_name,
-@@ -368,6 +374,21 @@ cdma_add_menu_item (NMDevice *device,
+@@ -368,6 +374,21 @@
  		                            cdma_state_to_mb_state (info),
  		                            info->modem_enabled,
  		                            applet);
@@ -170,7 +170,7 @@
  		gtk_widget_set_sensitive (GTK_WIDGET (item), TRUE);
  		add_connection_item (device, active, item, menu, applet);
  	}
-@@ -381,6 +402,7 @@ cdma_add_menu_item (NMDevice *device,
+@@ -381,6 +402,7 @@
  		}
  	} else {
  		/* Otherwise show idle registration state or disabled */
@@ -178,7 +178,7 @@
  		item = nm_mb_menu_item_new (NULL,
  		                            info->quality_valid ? info->quality : 0,
  		                            info->provider_name,
-@@ -389,6 +411,21 @@ cdma_add_menu_item (NMDevice *device,
+@@ -389,6 +411,21 @@
  		                            cdma_state_to_mb_state (info),
  		                            info->modem_enabled,
  		                            applet);
@@ -200,7 +200,7 @@
  		gtk_widget_set_sensitive (GTK_WIDGET (item), FALSE);
  		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
  	}
-@@ -454,15 +491,16 @@ cdma_device_state_changed (NMDevice *dev
+@@ -454,15 +491,16 @@
  	check_start_polling (info);
  }
  
@@ -219,7 +219,7 @@
  	const char *id;
  	CdmaDeviceInfo *info;
  	gboolean mb_state;
-@@ -491,11 +529,14 @@ cdma_get_icon (NMDevice *device,
+@@ -491,11 +529,14 @@
  		break;
  	case NM_DEVICE_STATE_ACTIVATED:
  		mb_state = cdma_state_to_mb_state (info);
@@ -235,7 +235,7 @@
  
  		if ((mb_state != MB_STATE_UNKNOWN) && info->quality_valid) {
  			gboolean roaming = (mb_state == MB_STATE_ROAMING);
-@@ -510,8 +551,6 @@ cdma_get_icon (NMDevice *device,
+@@ -510,8 +551,6 @@
  	default:
  		break;
  	}
@@ -244,7 +244,7 @@
  }
  
  typedef struct {
-@@ -877,6 +916,9 @@ reg_state_changed_cb (DBusGProxy *proxy,
+@@ -877,6 +916,9 @@
  	update_registration_state (info, cdma1x_state, evdo_state);
  	info->skip_reg_poll = TRUE;
  	applet_schedule_update_icon (info->applet);
@@ -254,10 +254,10 @@
  }
  
  static void
-Index: b/src/applet-device-gsm.c
+Index: network-manager-applet-0.9.4.1/src/applet-device-gsm.c
 ===================================================================
---- a/src/applet-device-gsm.c
-+++ b/src/applet-device-gsm.c
+--- network-manager-applet-0.9.4.1.orig/src/applet-device-gsm.c	2012-11-21 16:19:08.943734000 -0800
++++ network-manager-applet-0.9.4.1/src/applet-device-gsm.c	2012-11-21 16:19:09.071734640 -0800
 @@ -42,6 +42,7 @@
  #include "applet-device-gsm.h"
  #include "utils.h"
@@ -266,7 +266,7 @@
  #include "applet-dialogs.h"
  #include "mb-menu-item.h"
  #include "nma-marshal.h"
-@@ -374,6 +375,9 @@ gsm_add_menu_item (NMDevice *device,
+@@ -374,6 +375,9 @@
  	char *text;
  	GtkWidget *item;
  	GSList *connections, *all, *iter;
@@ -276,7 +276,7 @@
  
  	info = g_object_get_data (G_OBJECT (device), "devinfo");
  
-@@ -395,7 +399,9 @@ gsm_add_menu_item (NMDevice *device,
+@@ -395,7 +399,9 @@
  	}
  
  	item = applet_menu_item_create_device_item_helper (device, applet, text);
@@ -286,7 +286,7 @@
  	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
  	gtk_widget_show (item);
  	g_free (text);
-@@ -407,6 +413,7 @@ gsm_add_menu_item (NMDevice *device,
+@@ -407,6 +413,7 @@
  		s_con = nm_connection_get_setting_connection (active);
  		g_assert (s_con);
  
@@ -294,7 +294,7 @@
  		item = nm_mb_menu_item_new (nm_setting_connection_get_id (s_con),
  		                            info->quality_valid ? info->quality : 0,
  		                            info->op_name,
-@@ -415,6 +422,21 @@ gsm_add_menu_item (NMDevice *device,
+@@ -415,6 +422,21 @@
  		                            gsm_state_to_mb_state (info),
  		                            info->modem_enabled,
  		                            applet);
@@ -316,7 +316,7 @@
  		gtk_widget_set_sensitive (GTK_WIDGET (item), TRUE);
  		add_connection_item (device, active, item, menu, applet);
  	}
-@@ -428,6 +450,7 @@ gsm_add_menu_item (NMDevice *device,
+@@ -428,6 +450,7 @@
  		}
  	} else {
  		/* Otherwise show idle registration state or disabled */
@@ -324,7 +324,7 @@
  		item = nm_mb_menu_item_new (NULL,
  		                            info->quality_valid ? info->quality : 0,
  		                            info->op_name,
-@@ -436,6 +459,23 @@ gsm_add_menu_item (NMDevice *device,
+@@ -436,6 +459,23 @@
  		                            gsm_state_to_mb_state (info),
  		                            info->modem_enabled,
  		                            applet);
@@ -348,7 +348,7 @@
  		gtk_widget_set_sensitive (GTK_WIDGET (item), FALSE);
  		gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
  	}
-@@ -496,15 +536,16 @@ gsm_device_state_changed (NMDevice *devi
+@@ -496,15 +536,16 @@
  	check_start_polling (info);
  }
  
@@ -367,7 +367,7 @@
  	const char *id;
  	GsmDeviceInfo *info;
  	guint32 mb_state;
-@@ -533,11 +574,14 @@ gsm_get_icon (NMDevice *device,
+@@ -533,11 +574,14 @@
  		break;
  	case NM_DEVICE_STATE_ACTIVATED:
  		mb_state = gsm_state_to_mb_state (info);
@@ -383,7 +383,7 @@
  
  		if ((mb_state != MB_STATE_UNKNOWN) && info->quality_valid) {
  			gboolean roaming = (mb_state == MB_STATE_ROAMING);
-@@ -552,8 +596,6 @@ gsm_get_icon (NMDevice *device,
+@@ -552,8 +596,6 @@
  	default:
  		break;
  	}
@@ -392,7 +392,7 @@
  }
  
  typedef struct {
-@@ -1554,6 +1596,10 @@ reg_info_changed_cb (DBusGProxy *proxy,
+@@ -1554,6 +1596,10 @@
  	g_free (info->op_name);
  	info->op_name = parse_op_name (info, op_name, info->op_code);
  	info->skip_reg_poll = TRUE;
@@ -403,10 +403,10 @@
  }
  
  static void
-Index: b/src/applet-device-wifi.c
+Index: network-manager-applet-0.9.4.1/src/applet-device-wifi.c
 ===================================================================
---- a/src/applet-device-wifi.c
-+++ b/src/applet-device-wifi.c
+--- network-manager-applet-0.9.4.1.orig/src/applet-device-wifi.c	2012-11-21 16:19:08.971734142 -0800
++++ network-manager-applet-0.9.4.1/src/applet-device-wifi.c	2012-11-21 16:22:11.308638296 -0800
 @@ -31,6 +31,7 @@
  
  #include <glib/gi18n.h>
@@ -415,7 +415,7 @@
  
  #include <nm-device.h>
  #include <nm-access-point.h>
-@@ -309,6 +310,135 @@ is_blacklisted_ssid (const GByteArray *s
+@@ -309,6 +310,135 @@
  	return is_ssid_in_list (ssid, blacklisted_ssids);
  }
  
@@ -544,14 +544,14 @@
 +out:
 +	atk_object_set_name (gtk_widget_get_accessible (GTK_WIDGET (item)), icon_desc->str);
 +	g_free (ssid);
-+	g_string_free (icon_desc, FALSE);
++	g_string_free (icon_desc, TRUE);
 +}
 +#endif
 +
  static void
  clamp_ap_to_bssid (NMAccessPoint *ap, NMSettingWireless *s_wifi)
  {
-@@ -517,7 +647,11 @@ wireless_menu_item_activate (GtkMenuItem
+@@ -517,7 +647,11 @@
  
  struct dup_data {
  	NMDevice *device;
@@ -563,7 +563,7 @@
  	char *hash;
  };
  
-@@ -533,19 +667,34 @@ find_duplicate (gpointer d, gpointer use
+@@ -533,19 +667,34 @@
  	g_return_if_fail (data);
  	g_return_if_fail (data->hash);
  
@@ -598,7 +598,7 @@
  create_new_ap_item (NMDeviceWifi *device,
                      NMAccessPoint *ap,
                      struct dup_data *dup_data,
-@@ -554,7 +703,16 @@ create_new_ap_item (NMDeviceWifi *device
+@@ -554,7 +703,16 @@
  {
  	WirelessMenuItemInfo *info;
  	GSList *iter;
@@ -615,7 +615,7 @@
  	GSList *dev_connections = NULL;
  	GSList *ap_connections = NULL;
  	const GByteArray *ssid;
-@@ -565,18 +723,51 @@ create_new_ap_item (NMDeviceWifi *device
+@@ -565,18 +723,51 @@
  	g_slist_free (dev_connections);
  	dev_connections = NULL;
  
@@ -669,7 +669,7 @@
  
  	g_object_set_data (G_OBJECT (item), "device", NM_DEVICE (device));
  
-@@ -634,7 +825,11 @@ create_new_ap_item (NMDeviceWifi *device
+@@ -634,7 +825,11 @@
  	return item;
  }
  
@@ -681,7 +681,7 @@
  get_menu_item_for_ap (NMDeviceWifi *device,
                        NMAccessPoint *ap,
                        GSList *connections,
-@@ -658,14 +853,31 @@ get_menu_item_for_ap (NMDeviceWifi *devi
+@@ -658,14 +853,32 @@
  	 */
  	dup_data.found = NULL;
  	dup_data.hash = g_object_get_data (G_OBJECT (ap), "hash");
@@ -706,14 +706,15 @@
 +		GSList *dupes = NULL;
 +		const char *path;
 +
-+		dupes = g_object_get_data (G_OBJECT (dup_data.found), "dupes");
++		dupes = g_object_steal_data (G_OBJECT (dup_data.found), "dupes");
 +		path = nm_object_get_path (NM_OBJECT (ap));
 +		dupes = g_slist_prepend (dupes, g_strdup (path));
++		g_object_set_data_full (G_OBJECT (dup_data.found), "dupes", (gpointer) dupes, (GDestroyNotify) clear_dupes_list);
 +#endif
  		return NULL;
  	}
  
-@@ -675,6 +887,7 @@ get_menu_item_for_ap (NMDeviceWifi *devi
+@@ -675,6 +888,7 @@
  static gint
  sort_by_name (gconstpointer tmpa, gconstpointer tmpb)
  {
@@ -721,7 +722,7 @@
  	NMNetworkMenuItem *a = NM_NETWORK_MENU_ITEM (tmpa);
  	NMNetworkMenuItem *b = NM_NETWORK_MENU_ITEM (tmpb);
  	const char *a_ssid, *b_ssid;
-@@ -711,6 +924,44 @@ sort_by_name (gconstpointer tmpa, gconst
+@@ -711,6 +925,44 @@
  		return -1;
  
  	return 0;
@@ -766,7 +767,7 @@
  }
  
  /* Sort menu items for the top-level menu:
-@@ -722,6 +973,7 @@ sort_by_name (gconstpointer tmpa, gconst
+@@ -722,6 +974,7 @@
  static gint
  sort_toplevel (gconstpointer tmpa, gconstpointer tmpb)
  {
@@ -774,7 +775,7 @@
  	NMNetworkMenuItem *a = NM_NETWORK_MENU_ITEM (tmpa);
  	NMNetworkMenuItem *b = NM_NETWORK_MENU_ITEM (tmpb);
  	gboolean a_fave, b_fave;
-@@ -756,6 +1008,42 @@ sort_toplevel (gconstpointer tmpa, gcons
+@@ -756,6 +1009,42 @@
  	 * both are unencrypted) just sort by name.
  	 */
  	return sort_by_name (a, b);
@@ -817,7 +818,7 @@
  }
  
  static void
-@@ -774,7 +1062,11 @@ wireless_add_menu_item (NMDevice *device
+@@ -774,7 +1063,11 @@
  	gboolean wireless_enabled = TRUE;
  	gboolean wireless_hw_enabled = TRUE;
  	GSList *menu_items = NULL;  /* All menu items we'll be adding */
@@ -829,7 +830,7 @@
  	GtkWidget *widget;
  
  	wdev = NM_DEVICE_WIFI (device);
-@@ -812,7 +1104,9 @@ wireless_add_menu_item (NMDevice *device
+@@ -812,7 +1105,9 @@
  		if (active_ap) {
  			active_item = item = get_menu_item_for_ap (wdev, active_ap, connections, NULL, applet);
  			if (item) {
@@ -839,7 +840,7 @@
  				menu_items = g_slist_append (menu_items, item);
  
  				gtk_menu_shell_append (GTK_MENU_SHELL (menu), GTK_WIDGET (item));
-@@ -1109,6 +1403,9 @@ access_point_added_cb (NMDeviceWifi *dev
+@@ -1109,6 +1404,9 @@
  	                  applet);
  	
  	queue_avail_access_point_notification (NM_DEVICE (device));
@@ -849,7 +850,7 @@
  }
  
  static void
-@@ -1126,6 +1423,9 @@ access_point_removed_cb (NMDeviceWifi *d
+@@ -1126,6 +1424,9 @@
  	if (old == ap) {
  		g_object_set_data (G_OBJECT (device), ACTIVE_AP_TAG, NULL);
  		applet_schedule_update_icon (applet);
@@ -859,7 +860,7 @@
  	}
  }
  
-@@ -1272,16 +1572,17 @@ wireless_device_state_changed (NMDevice
+@@ -1272,16 +1573,17 @@
  	g_free (esc_ssid);
  }
  
@@ -879,7 +880,7 @@
  	const char *id;
  	char *ssid = NULL;
  
-@@ -1314,22 +1615,25 @@ wireless_get_icon (NMDevice *device,
+@@ -1314,22 +1616,25 @@
  			strength = CLAMP (strength, 0, 100);
  
  			if (strength > 80)
@@ -911,7 +912,7 @@
  			*tip = g_strdup_printf (_("Wireless network connection '%s' active"), id);
  		}
  		break;
-@@ -1337,7 +1641,8 @@ wireless_get_icon (NMDevice *device,
+@@ -1337,7 +1642,8 @@
  		break;
  	}
  
@@ -921,11 +922,11 @@
  }
  
  static gboolean
-Index: b/src/applet-device-wired.c
+Index: network-manager-applet-0.9.4.1/src/applet-device-wired.c
 ===================================================================
---- a/src/applet-device-wired.c
-+++ b/src/applet-device-wired.c
-@@ -221,7 +221,9 @@ wired_add_menu_item (NMDevice *device,
+--- network-manager-applet-0.9.4.1.orig/src/applet-device-wired.c	2012-11-21 16:19:08.943734000 -0800
++++ network-manager-applet-0.9.4.1/src/applet-device-wired.c	2012-11-21 16:19:09.079734683 -0800
+@@ -221,7 +221,9 @@
   	if (nm_device_get_capabilities (device) & NM_DEVICE_CAP_CARRIER_DETECT)
  		carrier = nm_device_ethernet_get_carrier (NM_DEVICE_ETHERNET (device));
  
@@ -935,7 +936,7 @@
  	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
  	gtk_widget_show (item);
  
-@@ -274,15 +276,16 @@ wired_device_state_changed (NMDevice *de
+@@ -274,15 +276,16 @@
  	}
  }
  
@@ -954,7 +955,7 @@
  	const char *id;
  
  	id = nm_device_get_iface (NM_DEVICE (device));
-@@ -305,14 +308,16 @@ wired_get_icon (NMDevice *device,
+@@ -305,14 +308,16 @@
  		*tip = g_strdup_printf (_("Requesting a wired network address for '%s'..."), id);
  		break;
  	case NM_DEVICE_STATE_ACTIVATED:
@@ -973,11 +974,11 @@
  }
  
  /* PPPoE */
-Index: b/src/applet.c
+Index: network-manager-applet-0.9.4.1/src/applet.c
 ===================================================================
---- a/src/applet.c
-+++ b/src/applet.c
-@@ -499,6 +499,8 @@ add_and_activate_cb (NMClient *client,
+--- network-manager-applet-0.9.4.1.orig/src/applet.c	2012-11-21 16:19:09.047734521 -0800
++++ network-manager-applet-0.9.4.1/src/applet.c	2012-11-21 16:19:33.259854586 -0800
+@@ -499,6 +499,8 @@
                       GError *error,
                       gpointer user_data)
  {
@@ -986,7 +987,7 @@
  	if (error) {
  		const char *text = _("Failed to add/activate connection");
  		char *err_text = g_strdup_printf ("(%d) %s", error->code,
-@@ -509,7 +511,8 @@ add_and_activate_cb (NMClient *client,
+@@ -509,7 +511,8 @@
  		g_free (err_text);
  	}
  
@@ -996,7 +997,7 @@
  }
  
  static void
-@@ -543,6 +546,8 @@ applet_menu_item_activate_helper_new_con
+@@ -543,6 +546,8 @@
  static void
  disconnect_cb (NMDevice *device, GError *error, gpointer user_data)
  {
@@ -1005,7 +1006,7 @@
  	if (error) {
  		const char *text = _("Device disconnect failed");
  		char *err_text = g_strdup_printf ("(%d) %s", error->code,
-@@ -552,6 +557,9 @@ disconnect_cb (NMDevice *device, GError
+@@ -552,6 +557,9 @@
  		utils_show_error_dialog (_("Disconnect failure"), text, err_text, FALSE, NULL);
  		g_free (err_text);
  	}
@@ -1015,7 +1016,7 @@
  }
  
  void
-@@ -560,7 +568,7 @@ applet_menu_item_disconnect_helper (NMDe
+@@ -560,7 +568,7 @@
  {
  	g_return_if_fail (NM_IS_DEVICE (device));
  
@@ -1024,7 +1025,7 @@
  }
  
  static void
-@@ -633,13 +641,15 @@ applet_menu_item_add_complex_separator_h
+@@ -633,13 +641,15 @@
                                                 const gchar* label,
                                                 int pos)
  {
@@ -1041,7 +1042,7 @@
  
  	if (label) {
  		xlabel = gtk_label_new (NULL);
-@@ -663,6 +673,9 @@ applet_menu_item_add_complex_separator_h
+@@ -663,6 +673,9 @@
  	              "child", box,
  	              "sensitive", FALSE,
  	              NULL);
@@ -1051,7 +1052,7 @@
  	if (pos < 0)
  		gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
  	else
-@@ -677,10 +690,13 @@ applet_new_menu_item_helper (NMConnectio
+@@ -677,10 +690,13 @@
  {
  	GtkWidget *item;
  	NMSettingConnection *s_con;
@@ -1065,7 +1066,7 @@
  	item = gtk_image_menu_item_new_with_label ("");
  	if (add_active && (active == connection)) {
  		/* Pure evil */
-@@ -693,9 +709,13 @@ applet_new_menu_item_helper (NMConnectio
+@@ -693,9 +709,13 @@
  		gtk_menu_item_set_label (GTK_MENU_ITEM (item), nm_setting_connection_get_id (s_con));
  
  	gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (item), TRUE);
@@ -1079,7 +1080,7 @@
  #define TITLE_TEXT_R ((double) 0x5e / 255.0 )
  #define TITLE_TEXT_G ((double) 0x5e / 255.0 )
  #define TITLE_TEXT_B ((double) 0x5e / 255.0 )
-@@ -800,6 +820,8 @@ menu_title_item_expose (GtkWidget *widge
+@@ -800,6 +820,8 @@
  }
  #endif
  
@@ -1088,7 +1089,7 @@
  GtkWidget *
  applet_menu_item_create_device_item_helper (NMDevice *device,
                                              NMApplet *applet,
-@@ -809,11 +831,13 @@ applet_menu_item_create_device_item_help
+@@ -809,11 +831,13 @@
  
  	item = gtk_menu_item_new_with_mnemonic (text);
  	gtk_widget_set_sensitive (item, FALSE);
@@ -1102,7 +1103,7 @@
  	return item;
  }
  
-@@ -860,7 +884,12 @@ applet_do_notify (NMApplet *applet,
+@@ -860,7 +884,12 @@
  	g_return_if_fail (summary != NULL);
  	g_return_if_fail (message != NULL);
  
@@ -1115,7 +1116,7 @@
  		return;
  
  	escaped = utils_escape_notify_message (message);
-@@ -1144,6 +1173,7 @@ vpn_connection_state_changed (NMVPNConne
+@@ -1144,6 +1173,7 @@
  		clear_animation_timeout (applet);
  
  	applet_schedule_update_icon (applet);
@@ -1123,7 +1124,7 @@
  }
  
  static const char *
-@@ -1199,10 +1229,13 @@ activate_vpn_cb (NMClient *client,
+@@ -1199,10 +1229,13 @@
  	}
  
  	applet_schedule_update_icon (info->applet);
@@ -1137,7 +1138,7 @@
  static void
  nma_menu_vpn_item_clicked (GtkMenuItem *item, gpointer user_data)
  {
-@@ -1225,9 +1258,14 @@ nma_menu_vpn_item_clicked (GtkMenuItem *
+@@ -1225,9 +1258,14 @@
  		return;
  	}
  
@@ -1153,7 +1154,7 @@
  
  	s_con = nm_connection_get_setting_connection (connection);
  	info = g_malloc0 (sizeof (VPNActivateInfo));
-@@ -1620,6 +1658,8 @@ nma_menu_add_devices (GtkWidget *menu, N
+@@ -1620,6 +1658,8 @@
  		dclass = get_device_class (device, applet);
  		if (dclass)
  			dclass->add_menu_item (device, n_devices, active, menu, applet);
@@ -1162,7 +1163,7 @@
  	}
  
   out:
-@@ -1677,8 +1717,6 @@ nma_menu_add_vpn_submenu (GtkWidget *men
+@@ -1677,8 +1717,6 @@
  	GSList *list, *iter;
  	int num_vpn_active = 0;
  
@@ -1171,7 +1172,7 @@
  	vpn_menu = GTK_MENU (gtk_menu_new ());
  
  	item = GTK_MENU_ITEM (gtk_menu_item_new_with_mnemonic (_("_VPN Connections")));
-@@ -1697,13 +1735,20 @@ nma_menu_add_vpn_submenu (GtkWidget *men
+@@ -1697,13 +1735,20 @@
  		NMConnection *connection = NM_CONNECTION (iter->data);
  		NMActiveConnection *active;
  		const char *name;
@@ -1192,7 +1193,7 @@
  
  		/* If no VPN connections are active, draw all menu items enabled. If
  		 * >= 1 VPN connections are active, only the active VPN menu item is
-@@ -1722,8 +1767,12 @@ nma_menu_add_vpn_submenu (GtkWidget *men
+@@ -1722,8 +1767,12 @@
  			gtk_widget_set_sensitive (GTK_WIDGET (item), FALSE);
  
  		if (active) {
@@ -1205,7 +1206,7 @@
  		}
  
  		g_object_set_data_full (G_OBJECT (item), "connection", 
-@@ -1797,6 +1846,7 @@ nma_set_networking_enabled_cb (GtkWidget
+@@ -1797,6 +1846,7 @@
  }
  
  
@@ -1213,7 +1214,7 @@
  static void
  nma_set_notifications_enabled_cb (GtkWidget *widget, NMApplet *applet)
  {
-@@ -1823,6 +1873,7 @@ nma_set_notifications_enabled_cb (GtkWid
+@@ -1823,6 +1873,7 @@
  	                       !state,
  	                       NULL);
  }
@@ -1221,7 +1222,7 @@
  
  /*
   * nma_menu_show_cb
-@@ -1911,7 +1962,9 @@ nma_context_menu_update (NMApplet *apple
+@@ -1911,7 +1962,9 @@
  	gboolean wireless_hw_enabled;
  	gboolean wwan_hw_enabled;
  	gboolean wimax_hw_enabled;
@@ -1231,7 +1232,7 @@
  	gboolean sensitive = FALSE;
  
  	state = nm_client_get_state (applet->nm_client);
-@@ -1971,6 +2024,7 @@ nma_context_menu_update (NMApplet *apple
+@@ -1971,6 +2024,7 @@
  	gtk_widget_set_sensitive (GTK_WIDGET (applet->wimax_enabled_item),
  	                          wimax_hw_enabled && is_permission_yes (applet, NM_CLIENT_PERMISSION_ENABLE_DISABLE_WIMAX));
  
@@ -1239,7 +1240,7 @@
  	/* Enabled notifications */
  	g_signal_handler_block (G_OBJECT (applet->notifications_enabled_item),
  	                        applet->notifications_enabled_toggled_id);
-@@ -1982,6 +2036,7 @@ nma_context_menu_update (NMApplet *apple
+@@ -1982,6 +2036,7 @@
  	gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (applet->notifications_enabled_item), notifications_enabled);
  	g_signal_handler_unblock (G_OBJECT (applet->notifications_enabled_item),
  	                          applet->notifications_enabled_toggled_id);
@@ -1247,7 +1248,7 @@
  
  	/* Don't show wifi-specific stuff if wireless is off */
  	if (state != NM_STATE_ASLEEP) {
-@@ -2054,16 +2109,20 @@ applet_connection_info_cb (NMApplet *app
+@@ -2054,16 +2109,20 @@
   * Generate the contextual popup menu.
   *
   */
@@ -1269,7 +1270,7 @@
  
  	/* 'Enable Networking' item */
  	applet->networking_enabled_item = gtk_check_menu_item_new_with_mnemonic (_("Enable _Networking"));
-@@ -2103,6 +2162,7 @@ static GtkWidget *nma_context_menu_creat
+@@ -2103,6 +2162,7 @@
  
  	nma_menu_add_separator_item (GTK_WIDGET (menu));
  
@@ -1277,7 +1278,7 @@
  	/* Toggle notifications item */
  	applet->notifications_enabled_item = gtk_check_menu_item_new_with_mnemonic (_("Enable N_otifications"));
  	id = g_signal_connect (applet->notifications_enabled_item,
-@@ -2113,6 +2173,7 @@ static GtkWidget *nma_context_menu_creat
+@@ -2113,6 +2173,7 @@
  	gtk_menu_shell_append (menu, applet->notifications_enabled_item);
  
  	nma_menu_add_separator_item (GTK_WIDGET (menu));
@@ -1285,7 +1286,7 @@
  
  	/* 'Connection Information' item */
  	applet->info_menu_item = gtk_image_menu_item_new_with_mnemonic (_("Connection _Information"));
-@@ -2134,6 +2195,7 @@ static GtkWidget *nma_context_menu_creat
+@@ -2134,6 +2195,7 @@
  	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (applet->connections_menu_item), image);
  	gtk_menu_shell_append (menu, applet->connections_menu_item);
  
@@ -1293,7 +1294,7 @@
  	/* Separator */
  	nma_menu_add_separator_item (GTK_WIDGET (menu));
  
-@@ -2153,25 +2215,112 @@ static GtkWidget *nma_context_menu_creat
+@@ -2153,25 +2215,112 @@
  	image = gtk_image_new_from_stock (GTK_STOCK_ABOUT, GTK_ICON_SIZE_MENU);
  	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image);
  	gtk_menu_shell_append (menu, menu_item);
@@ -1410,7 +1411,7 @@
  	/* Ignore setting of the same icon as is already displayed */
  	if (applet->icon_layers[layer] == pixbuf)
  		return;
-@@ -2205,8 +2354,13 @@ foo_set_icon (NMApplet *applet, GdkPixbu
+@@ -2205,8 +2354,13 @@
  
  	gtk_status_icon_set_from_pixbuf (applet->status_icon, pixbuf);
  	g_object_unref (pixbuf);
@@ -1425,7 +1426,7 @@
  
  NMRemoteConnection *
  applet_get_exported_connection_for_device (NMDevice *device, NMApplet *applet)
-@@ -2393,6 +2547,7 @@ foo_device_state_changed_cb (NMDevice *d
+@@ -2393,6 +2547,7 @@
  	applet_common_device_state_changed (device, new_state, old_state, reason, applet);
  
  	applet_schedule_update_icon (applet);
@@ -1433,7 +1434,7 @@
  }
  
  static void
-@@ -2448,8 +2603,20 @@ foo_client_state_changed_cb (NMClient *c
+@@ -2448,8 +2603,20 @@
  	}
  
  	applet_schedule_update_icon (applet);
@@ -1454,7 +1455,7 @@
  static void
  foo_manager_running_cb (NMClient *client,
                          GParamSpec *pspec,
-@@ -2465,6 +2632,7 @@ foo_manager_running_cb (NMClient *client
+@@ -2465,6 +2632,7 @@
  	}
  
  	applet_schedule_update_icon (applet);
@@ -1462,7 +1463,7 @@
  }
  
  #define VPN_STATE_ID_TAG "vpn-state-id"
-@@ -2494,6 +2662,7 @@ foo_active_connections_changed_cb (NMCli
+@@ -2494,6 +2662,7 @@
  	}
  
  	applet_schedule_update_icon (applet);
@@ -1470,7 +1471,7 @@
  }
  
  static void
-@@ -2526,6 +2695,9 @@ foo_set_initial_state (gpointer data)
+@@ -2526,6 +2695,9 @@
  	return FALSE;
  }
  
@@ -1480,7 +1481,7 @@
  static void
  foo_client_setup (NMApplet *applet)
  {
-@@ -2542,6 +2714,11 @@ foo_client_setup (NMApplet *applet)
+@@ -2542,6 +2714,11 @@
  	g_signal_connect (applet->nm_client, "device-added",
  	                  G_CALLBACK (foo_device_added_cb),
  	                  applet);
@@ -1492,7 +1493,7 @@
  	g_signal_connect (applet->nm_client, "notify::manager-running",
  	                  G_CALLBACK (foo_manager_running_cb),
  	                  applet);
-@@ -2561,10 +2738,12 @@ foo_client_setup (NMApplet *applet)
+@@ -2561,10 +2738,12 @@
  	applet_schedule_update_icon (applet);
  }
  
@@ -1508,7 +1509,7 @@
  	int stage = -1;
  
  	switch (state) {
-@@ -2583,25 +2762,32 @@ applet_common_get_device_icon (NMDeviceS
+@@ -2583,25 +2762,32 @@
  	}
  
  	if (stage >= 0) {
@@ -1553,7 +1554,7 @@
  }
  
  static char *
-@@ -2640,12 +2826,14 @@ get_tip_for_device_state (NMDevice *devi
+@@ -2640,12 +2826,14 @@
  	return tip;
  }
  
@@ -1571,7 +1572,7 @@
  	NMDeviceState state = NM_DEVICE_STATE_UNKNOWN;
  	NMADeviceClass *dclass;
  
-@@ -2670,19 +2858,13 @@ applet_get_device_icon_for_state (NMAppl
+@@ -2670,19 +2858,13 @@
  
  		connection = applet_find_active_connection_for_device (device, applet, NULL);
  		/* device class returns a referenced pixbuf */
@@ -1595,7 +1596,7 @@
  }
  
  static char *
-@@ -2738,7 +2920,7 @@ applet_update_icon (gpointer user_data)
+@@ -2738,7 +2920,7 @@
  	NMApplet *applet = NM_APPLET (user_data);
  	GdkPixbuf *pixbuf = NULL;
  	NMState state;
@@ -1604,7 +1605,7 @@
  	NMVPNConnectionState vpn_state = NM_VPN_SERVICE_STATE_UNKNOWN;
  	gboolean nm_running;
  	NMActiveConnection *active_vpn = NULL;
-@@ -2753,36 +2935,53 @@ applet_update_icon (gpointer user_data)
+@@ -2753,36 +2935,53 @@
  	if (!nm_running)
  		state = NM_STATE_UNKNOWN;
  
@@ -1663,7 +1664,7 @@
  			break;
  		case NM_VPN_CONNECTION_STATE_PREPARE:
  		case NM_VPN_CONNECTION_STATE_NEED_AUTH:
-@@ -2797,6 +2996,9 @@ applet_update_icon (gpointer user_data)
+@@ -2797,6 +2996,9 @@
  			}
  
  			pixbuf = applet->vpn_connecting_icons[applet->animation_step];
@@ -1673,7 +1674,7 @@
  			applet->animation_step++;
  			if (applet->animation_step >= NUM_VPN_CONNECTING_FRAMES)
  				applet->animation_step = 0;
-@@ -2807,28 +3009,9 @@ applet_update_icon (gpointer user_data)
+@@ -2807,28 +3009,9 @@
  
  		vpn_tip = get_tip_for_vpn (active_vpn, vpn_state, applet);
  	}
@@ -1705,7 +1706,7 @@
  
  	return FALSE;
  }
-@@ -3311,18 +3494,95 @@ status_icon_popup_menu_cb (GtkStatusIcon
+@@ -3311,18 +3494,95 @@
  	 * of the notification. 
  	 */
  
@@ -1802,7 +1803,7 @@
  	if (!applet->status_icon)
  		return FALSE;
  	if (shell_debug)
-@@ -3337,11 +3597,34 @@ setup_widgets (NMApplet *applet)
+@@ -3337,11 +3597,34 @@
  	g_signal_connect (applet->status_icon, "popup-menu",
  			  G_CALLBACK (status_icon_popup_menu_cb), applet);
  
@@ -1841,7 +1842,7 @@
  }
  
  static void
-@@ -3537,6 +3820,8 @@ constructor (GType type,
+@@ -3537,6 +3820,8 @@
  	                      GCONF_CLIENT_PRELOAD_ONELEVEL,
  	                      NULL);
  
@@ -1850,7 +1851,7 @@
  	/* Load pixmaps and create applet widgets */
  	if (!setup_widgets (applet))
  		goto error;
-@@ -3555,6 +3840,13 @@ constructor (GType type,
+@@ -3555,6 +3840,13 @@
  	/* Move user connections to the system */
  	nm_gconf_move_connections_to_system (import_cb, applet);
  
@@ -1864,7 +1865,7 @@
  	applet->agent = applet_agent_new ();
  	g_assert (applet->agent);
  	g_signal_connect (applet->agent, APPLET_AGENT_GET_SECRETS,
-@@ -3583,8 +3875,6 @@ constructor (GType type,
+@@ -3583,8 +3875,6 @@
  	applet->wimax_class = applet_device_wimax_get_class (applet);
  	g_assert (applet->wimax_class);
  
@@ -1873,7 +1874,7 @@
  	/* Track embedding to help debug issues where user has removed the
  	 * notification area applet from the panel, and thus nm-applet too.
  	 */
-@@ -3630,6 +3920,11 @@ static void finalize (GObject *object)
+@@ -3630,6 +3920,11 @@
  	if (applet->update_icon_id)
  		g_source_remove (applet->update_icon_id);
  
@@ -1885,7 +1886,7 @@
  	if (applet->menu)
  		g_object_unref (applet->menu);
  	nma_icons_free (applet);
-@@ -3657,6 +3952,11 @@ static void finalize (GObject *object)
+@@ -3657,6 +3952,11 @@
  	if (applet->status_icon)
  		g_object_unref (applet->status_icon);
  
@@ -1897,10 +1898,10 @@
  	if (applet->nm_client)
  		g_object_unref (applet->nm_client);
  
-Index: b/src/applet.h
+Index: network-manager-applet-0.9.4.1/src/applet.h
 ===================================================================
---- a/src/applet.h
-+++ b/src/applet.h
+--- network-manager-applet-0.9.4.1.orig/src/applet.h	2012-11-21 16:19:08.971734142 -0800
++++ network-manager-applet-0.9.4.1/src/applet.h	2012-11-21 16:19:33.239854478 -0800
 @@ -38,6 +38,10 @@
  
  #include <libnotify/notify.h>
@@ -1912,7 +1913,7 @@
  #include <nm-connection.h>
  #include <nm-client.h>
  #include <nm-access-point.h>
-@@ -148,6 +152,11 @@ typedef struct
+@@ -148,6 +152,11 @@
  	guint			animation_id;
  
  	/* Direct UI elements */
@@ -1924,7 +1925,7 @@
  	GtkStatusIcon * status_icon;
  	int             icon_size;
  
-@@ -234,13 +243,15 @@ struct NMADeviceClass {
+@@ -234,13 +243,15 @@
  	                                        NMDeviceStateReason reason,
  	                                        NMApplet *applet);
  
@@ -1942,7 +1943,7 @@
  	                                        char **tip,
  	                                        NMApplet *applet);
  
-@@ -255,6 +266,10 @@ NMApplet *nm_applet_new (GMainLoop *loop
+@@ -255,6 +266,10 @@
  
  void applet_schedule_update_icon (NMApplet *applet);
  
@@ -1953,10 +1954,10 @@
  NMRemoteSettings *applet_get_settings (NMApplet *applet);
  
  GSList *applet_get_all_connections (NMApplet *applet);
-Index: b/src/mobile-helpers.c
+Index: network-manager-applet-0.9.4.1/src/mobile-helpers.c
 ===================================================================
---- a/src/mobile-helpers.c
-+++ b/src/mobile-helpers.c
+--- network-manager-applet-0.9.4.1.orig/src/mobile-helpers.c	2012-03-19 11:41:12.000000000 -0700
++++ network-manager-applet-0.9.4.1/src/mobile-helpers.c	2012-11-21 16:19:09.079734683 -0800
 @@ -21,6 +21,7 @@
   */
  
@@ -1965,7 +1966,7 @@
  
  GdkPixbuf *
  mobile_helper_get_status_pixbuf (guint32 quality,
-@@ -35,7 +36,11 @@ mobile_helper_get_status_pixbuf (guint32
+@@ -35,7 +36,11 @@
  
  	if (!quality_valid)
  		quality = 0;
@@ -1977,7 +1978,7 @@
  
  	pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
  	                         TRUE,
-@@ -83,9 +88,14 @@ mobile_helper_get_status_pixbuf (guint32
+@@ -83,9 +88,14 @@
  	return pixbuf;
  }
  
@@ -1992,7 +1993,7 @@
  	if (quality > 80)
  		return nma_icon_check_and_load ("nm-signal-100", &applet->wireless_100_icon, applet);
  	else if (quality > 55)
-@@ -96,7 +106,132 @@ mobile_helper_get_quality_icon (guint32
+@@ -96,7 +106,132 @@
  		return nma_icon_check_and_load ("nm-signal-25", &applet->wireless_25_icon, applet);
  
  	return nma_icon_check_and_load ("nm-signal-00", &applet->wireless_00_icon, applet);
@@ -2125,11 +2126,11 @@
  
  GdkPixbuf *
  mobile_helper_get_tech_icon (guint32 tech, NMApplet *applet)
-Index: b/src/mobile-helpers.h
+Index: network-manager-applet-0.9.4.1/src/mobile-helpers.h
 ===================================================================
---- a/src/mobile-helpers.h
-+++ b/src/mobile-helpers.h
-@@ -56,9 +56,20 @@ GdkPixbuf *mobile_helper_get_status_pixb
+--- network-manager-applet-0.9.4.1.orig/src/mobile-helpers.h	2012-03-13 16:04:00.000000000 -0700
++++ network-manager-applet-0.9.4.1/src/mobile-helpers.h	2012-11-21 16:19:09.079734683 -0800
+@@ -56,9 +56,20 @@
                                              guint32 access_tech,
                                              NMApplet *applet);
  
@@ -2150,11 +2151,11 @@
 +
  #endif  /* APPLET_MOBILE_HELPERS_H */
  
-Index: b/src/mb-menu-item.c
+Index: network-manager-applet-0.9.4.1/src/mb-menu-item.c
 ===================================================================
---- a/src/mb-menu-item.c
-+++ b/src/mb-menu-item.c
-@@ -180,11 +180,14 @@ nm_mb_menu_item_new (const char *connect
+--- network-manager-applet-0.9.4.1.orig/src/mb-menu-item.c	2012-03-20 13:32:44.000000000 -0700
++++ network-manager-applet-0.9.4.1/src/mb-menu-item.c	2012-11-21 16:19:09.079734683 -0800
+@@ -180,11 +180,14 @@
  		gtk_label_set_text (GTK_LABEL (priv->desc), priv->desc_string);
  	}
  
@@ -2169,11 +2170,11 @@
  
  	return GTK_WIDGET (item);
  }
-Index: b/src/gconf-helpers/Makefile.am
+Index: network-manager-applet-0.9.4.1/src/gconf-helpers/Makefile.am
 ===================================================================
---- a/src/gconf-helpers/Makefile.am
-+++ b/src/gconf-helpers/Makefile.am
-@@ -16,6 +16,7 @@ libgconf_helpers_la_CPPFLAGS = \
+--- network-manager-applet-0.9.4.1.orig/src/gconf-helpers/Makefile.am	2012-03-13 16:03:59.000000000 -0700
++++ network-manager-applet-0.9.4.1/src/gconf-helpers/Makefile.am	2012-11-21 16:19:09.083734694 -0800
+@@ -16,6 +16,7 @@
  	-I$(top_srcdir)/src/utils \
  	$(GTK_CFLAGS) \
  	$(NMA_CFLAGS) \
@@ -2181,7 +2182,7 @@
  	$(GCONF_CFLAGS) \
  	$(GNOME_KEYRING_CFLAGS) \
  	$(DISABLE_DEPRECATED)
-@@ -23,6 +24,7 @@ libgconf_helpers_la_CPPFLAGS = \
+@@ -23,6 +24,7 @@
  libgconf_helpers_la_LIBADD = \
  	$(GTK_LIBS) \
  	$(NMA_LIBS) \
@@ -2189,10 +2190,10 @@
  	$(GCONF_LIBS) \
  	$(GNOME_KEYRING_LIBS)
  
-Index: b/src/applet-device-wimax.c
+Index: network-manager-applet-0.9.4.1/src/applet-device-wimax.c
 ===================================================================
---- a/src/applet-device-wimax.c
-+++ b/src/applet-device-wimax.c
+--- network-manager-applet-0.9.4.1.orig/src/applet-device-wimax.c	2012-03-19 07:53:53.000000000 -0700
++++ network-manager-applet-0.9.4.1/src/applet-device-wimax.c	2012-11-21 16:19:09.083734694 -0800
 @@ -36,6 +36,7 @@
  #include "applet.h"
  #include "applet-device-wimax.h"
@@ -2201,7 +2202,7 @@
  #include "applet-dialogs.h"
  #include "nma-marshal.h"
  #include "mb-menu-item.h"
-@@ -141,9 +142,14 @@ new_nsp_menu_item (NMDeviceWimax *device
+@@ -141,9 +142,14 @@
  {
  	GtkWidget *item;
  	WimaxMenuItemInfo *info;
@@ -2216,7 +2217,7 @@
  	item = nm_mb_menu_item_new (nm_wimax_nsp_get_name (nsp),
  		                        nm_wimax_nsp_get_signal_quality (nsp),
  		                        NULL,
-@@ -152,6 +158,16 @@ new_nsp_menu_item (NMDeviceWimax *device
+@@ -152,6 +158,16 @@
  		                        nsp_type_to_mb_state (nm_wimax_nsp_get_network_type (nsp)),
  		                        TRUE,
  		                        applet);
@@ -2233,7 +2234,7 @@
  	gtk_widget_set_sensitive (GTK_WIDGET (item), TRUE);
  
  	info = g_slice_new0 (WimaxMenuItemInfo);
-@@ -305,7 +321,12 @@ wimax_add_menu_item (NMDevice *device,
+@@ -305,7 +321,12 @@
  static void
  nsp_quality_changed (NMWimaxNsp *nsp, GParamSpec *pspec, gpointer user_data)
  {
@@ -2247,7 +2248,7 @@
  }
  
  static NMWimaxNsp *
-@@ -367,8 +388,12 @@ active_nsp_changed_cb (NMDeviceWimax *de
+@@ -367,8 +388,12 @@
  	if (!s_wimax)
  		return;
  
@@ -2261,7 +2262,7 @@
  }
  
  static void
-@@ -384,6 +409,9 @@ nsp_removed_cb (NMDeviceWimax *device,
+@@ -384,6 +409,9 @@
  	if (old == nsp) {
  		g_object_set_data (G_OBJECT (device), ACTIVE_NSP_TAG, NULL);
  		applet_schedule_update_icon (applet);
@@ -2271,7 +2272,7 @@
  	}
  }
  
-@@ -432,15 +460,16 @@ wimax_device_state_changed (NMDevice *de
+@@ -432,15 +460,16 @@
  	}
  }
  
@@ -2290,7 +2291,7 @@
  	const char *id;
  	NMWimaxNsp *nsp;
  	guint32 quality = 0;
-@@ -474,7 +503,7 @@ wimax_get_icon (NMDevice *device,
+@@ -474,7 +503,7 @@
  		break;
  	case NM_DEVICE_STATE_ACTIVATED:
  		roaming = (nsp_type == NM_WIMAX_NSP_NETWORK_TYPE_ROAMING_PARTNER);
@@ -2299,7 +2300,7 @@
  		                                          TRUE,
  		                                          nsp_type_to_mb_state (nsp_type),
  		                                          MB_TECH_WIMAX,
-@@ -483,12 +512,11 @@ wimax_get_icon (NMDevice *device,
+@@ -483,12 +512,11 @@
  		                        id, quality,
  		                        roaming ? ", " : "",
  		                        roaming ? _("roaming") : "");

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-03-27 14:17:07 +0000
+++ debian/patches/series	2012-11-23 16:30:42 +0000
@@ -1,3 +1,5 @@
+git_fix_some_leaks_80ef61b.patch
+git_mac_addr_string_leakage_6dae878.patch
 lp289466_always_show_tray_icon.patch
 lp328572-dxteam-connect-text.patch
 lp330571_dxteam_wired_connect_text.patch