Update to 0.8.997 (0.9-beta3)

2011-03-25 11:02:41 -05:00 · 2011-03-25 11:02:41 -05:00 · 65bc38d0ff
commit 65bc38d0ff
parent 8d0ac9988c
17 changed files with 167 additions and 798 deletions
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@ -1,15 +1,15 @@
 %define dbus_version 1.1
 %define dbus_glib_version 0.86-4

-%define gtk2_version	2.18.0
-%define glib2_version	2.16.0
+%define gtk3_version	3.0.1
+%define glib2_version	2.24.0
 %define wireless_tools_version 1:28-0pre9
 %define libnl_version 1.1
 %define ppp_version 2.4.5

-%define snapshot .git20101117
-%define applet_snapshot .git20101117
-%define realversion 0.8.2
+%define snapshot .git20110325
+%define applet_snapshot .git20110325
+%define realversion 0.8.997

 %define use_systemd 0
 %if 0%{?fedora} >= 15
@ -19,8 +19,8 @@
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
-Version: 0.8.2
-Release: 9%{snapshot}%{?dist}
+Version: 0.8.997
+Release: 4%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@ -31,28 +31,24 @@ Source2: NetworkManager.conf
 Patch1: nm-applet-internal-buildfixes.patch
 Patch2: explain-dns1-dns2.patch
 Patch3: nm-applet-no-notifications.patch
-Patch4: modem-ip-interface-property-change.patch
-Patch5: no-unused-but-set-warning.patch
-Patch6: fix-uninitialized.patch
-Patch7: fix-resolv-conf-updating.patch
-Patch10: Port-to-libnotify-070.patch
-Patch11: gtk3-1.patch
-Patch12: gtk3-2.patch
-Patch13: gtk3-3.patch
-Patch14: gtk3-4.patch
-Patch15: gtk3-5.patch
-Patch16: gtk3-6.patch
-Patch17: nm-applet-no-unused-but-set-warning.patch
+Patch4: nm-polkit-permissive.patch
+Patch5: nm-applet-wifi-dialog-ui-fixes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

 Requires(post): chkconfig
 Requires(preun): chkconfig
+%if %{use_systemd}
+Requires(post): /bin/systemctl
+Requires(preun): /bin/systemctl
+Requires(postun): /bin/systemctl
+%endif
+
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: glib2 >= %{glib2_version}
 Requires: iproute
 Requires: dhclient >= 12:4.1.0
-Requires: wpa_supplicant >= 1:0.6.8-4
+Requires: wpa_supplicant >= 1:0.7.3-1
 Requires: libnl >= %{libnl_version}
 Requires: %{name}-glib = %{epoch}:%{version}-%{release}
 Requires: ppp = %{ppp_version}
@ -72,10 +68,11 @@ BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 BuildRequires: wireless-tools-devel >= %{wireless_tools_version}
 BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: gtk2-devel >= %{gtk2_version}
+BuildRequires: gtk3-devel >= %{gtk3_version}
 BuildRequires: libglade2-devel
 BuildRequires: GConf2-devel
 BuildRequires: gnome-keyring-devel
+BuildRequires: gobject-introspection-devel >= 0.10.3
 BuildRequires: gettext-devel
 BuildRequires: pkgconfig
 BuildRequires: wpa_supplicant
@ -128,11 +125,11 @@ Requires: %{name} = %{epoch}:%{version}-%{release}
 Requires: %{name}-glib = %{epoch}:%{version}-%{release}
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
-Requires: libnotify >= 0.7.0
+Requires: libnotify >= 0.4.3
 Requires: gnome-keyring
 Requires: nss >= 3.11.7
 Requires: gnome-icon-theme
-Requires(post): gtk2 >= %{gtk2_version}
+Requires(post): /usr/bin/gtk-update-icon-cache

 %description gnome
 This package contains GNOME utilities and applications for use with
@ -173,20 +170,8 @@ tar -xjf %{SOURCE1}
 %patch1 -p1 -b .buildfix
 %patch2 -p1 -b .explain-dns1-dns2
 %patch3 -p1 -b .no-notifications
-%patch4 -p1 -b .modem-ip-iface
-%patch5 -p1 -b .no-unused-but-set
-%patch6 -p1 -b .uninitialized
-%patch7 -p1 -b .resolv-conf-updating
-pushd  network-manager-applet-%{realversion}
-%patch10 -p1 -b .libnotify-070
-%patch11 -p1 -b .gtk3-1
-%patch12 -p1 -b .gtk3-2
-%patch13 -p1 -b .gtk3-3
-%patch14 -p1 -b .gtk3-4
-%patch15 -p1 -b .gtk3-5
-%patch16 -p1 -b .gtk3-6
-%patch17 -p1 -b .applet-no-unused-but-set
-popd
+%patch4 -p1 -b .polkit-permissive
+%patch5 -p1 -b .applet-wifi-ui

 %build

@ -194,7 +179,8 @@ popd
 # multilib unhappy due to different timestamps in the generated content
 %{__cp} -R docs ORIG-docs

-autoreconf -i -f
+autopoint --force
+intltoolize --force
 %configure \
 	--disable-static \
 	--with-distro=redhat \
@ -202,6 +188,7 @@ autoreconf -i -f
 	--with-dhcpcd=no \
 	--with-crypto=nss \
 	--enable-more-warnings=yes \
+	--enable-wimax=no \
 	--with-docs=yes \
 	--with-system-ca-path=/etc/pki/tls/certs \
 	--with-tests=yes \
@ -212,13 +199,13 @@ make %{?_smp_mflags}

 # build the applet
 pushd network-manager-applet-%{realversion}
-	autoreconf -i -f
+	autoreconf -i
 	intltoolize --force
 	%configure \
 		--disable-static \
-		--with-gtk2=yes \
 		--with-bluetooth \
-		--enable-more-warnings=yes
+		--enable-more-warnings=yes \
+		--with-gtkver=3
 	make %{?_smp_mflags}
 popd

@ -340,21 +327,21 @@ if [ "$1" -eq 0 ]; then
 fi

 %post gnome
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 if [ -f "%{_sysconfdir}/gconf/schemas/nm-applet.schemas" ]; then
  gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/nm-applet.schemas >/dev/null
 fi

 %postun gnome
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi

+%posttrans gnome
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 %files -f %{name}.lang
 %defattr(-,root,root,0755)
 %doc COPYING NEWS AUTHORS README CONTRIBUTING TODO
@ -398,15 +385,17 @@ fi

 %files devel
 %defattr(-,root,root,0755)
-%doc ChangeLog docs/spec.html
+%doc ChangeLog docs/api/html/*
 %dir %{_includedir}/%{name}
 %{_includedir}/%{name}/%{name}.h
 %{_includedir}/%{name}/NetworkManagerVPN.h
+%{_includedir}/%{name}/nm-version.h
 %{_libdir}/pkgconfig/%{name}.pc
+%dir %{_datadir}/gtk-doc/html/NetworkManager
+%{_datadir}/gtk-doc/html/NetworkManager/*

 %files gnome
 %defattr(-,root,root,0755)
-%{_sysconfdir}/dbus-1/system.d/nm-applet.conf
 %{_bindir}/nm-applet
 %{_bindir}/nm-connection-editor
 %{_datadir}/applications/*.desktop
@ -428,26 +417,60 @@ fi
 %{_libdir}/libnm-glib.so.*
 %{_libdir}/libnm-glib-vpn.so.*
 %{_libdir}/libnm-util.so.*
+%{_libdir}/girepository-1.0/NetworkManager-1.0.typelib
+%{_libdir}/girepository-1.0/NMClient-1.0.typelib

 %files glib-devel
 %defattr(-,root,root,0755)
 %dir %{_includedir}/libnm-glib
 %{_includedir}/libnm-glib/*.h
-%{_includedir}/%{name}/nm-*.h
+%{_includedir}/%{name}/nm-setting*.h
+%{_includedir}/%{name}/nm-connection.h
+%{_includedir}/%{name}/nm-utils.h
 %{_libdir}/pkgconfig/libnm-glib.pc
 %{_libdir}/pkgconfig/libnm-glib-vpn.pc
 %{_libdir}/pkgconfig/libnm-util.pc
 %{_libdir}/libnm-glib.so
 %{_libdir}/libnm-glib-vpn.so
 %{_libdir}/libnm-util.so
+%{_datadir}/gir-1.0/NetworkManager-1.0.gir
+%{_datadir}/gir-1.0/NMClient-1.0.gir
 %dir %{_datadir}/gtk-doc/html/libnm-glib
 %{_datadir}/gtk-doc/html/libnm-glib/*
 %dir %{_datadir}/gtk-doc/html/libnm-util
 %{_datadir}/gtk-doc/html/libnm-util/*

 %changelog
-* Wed Feb 23 2011 Jiří Klimeš <jklimes@redhat.com> - 0.8.2-9.git20101117
- Fix updating resolv.conf (rh #672282)
+* Fri Mar 25 2011 Dan Williams <dcbw@redhat.com> - 0.8.997-4.git20110325
+- core: fix possible libnm-glib crash when activating connections
+- applet: fix various naming and dialog title issues
+
+* Thu Mar 24 2011 Dan Williams <dcbw@redhat.com> - 0.8.997-3.git20110324
+- nm-version.h should be in NetworkManager-devel, not -glib-devel (rh #685442)
+
+* Mon Mar 21 2011 Dan Williams <dcbw@redhat.com> - 0.8.997-1
+- Update to 0.8.997 (0.9-beta3)
+- ifcfg-rh: fix reading and writing of Dynamic WEP connections using LEAP as the eap method
+- wifi: fix signal strength for scanned access points with some drivers
+- applet: translation updates
+
+* Thu Mar 10 2011 Dan Williams <dcbw@redhat.com> - 0.8.996-1
+- Update to 0.8.996 (0.9-beta2)
+
+* Wed Mar  9 2011 Dan Williams <dcbw@redhat.com> - 0.8.995-4.git20110308
+- applet: fix bus name more
+
+* Wed Mar  9 2011 Dan Williams <dcbw@redhat.com> - 0.8.995-3.git20110308
+- applet: fix bus name
+
+* Tue Mar  8 2011 Matthias Clasen <mclasen@redhat.com> - 0.8.995-2.git20110308
+- Fix systemd requires
+
+* Mon Mar  7 2011 Dan Williams <dcbw@redhat.com> - 0.8.995-1.git20110308
+- Update to NetworkManager 0.9-beta1
+- core: consolidate user and system settings services into NM itself
+- core: add WiMAX support
+- applet: support Fast User Switching

 * Fri Feb 11 2011 Matthias Clasen <mclasen@redhat.com> - 0.8.2-8.git20101117
 - Rebuild against newer gtk
--- a/Port-to-libnotify-070.patch
+++ b/Port-to-libnotify-070.patch
@ -1,44 +0,0 @@
-From 9ac43601950dfd568cc9f64cf9a20c11af6fa627 Mon Sep 17 00:00:00 2001
-From: William Jon McCann <jmccann@redhat.com>
-Date: Sat, 16 Oct 2010 22:01:00 -0400
-Subject: [PATCH] Port to libnotify 0.7.0
-
-https://bugzilla.gnome.org/show_bug.cgi?id=632327
---
- configure.ac |    2 +-
- src/applet.c |    4 +---
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index acb39a2..8fb0a66 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -78,7 +78,7 @@ PKG_CHECK_MODULES(NMA,
- 		 gmodule-export-2.0
- 		 gconf-2.0
- 		 gnome-keyring-1
-		 libnotify >= 0.4.3])
-+		 libnotify >= 0.7.0])
- 
- # Check for dbus-1.2.6 or later for deny-by-default rules
- PKG_CHECK_MODULES(DBUS_126, [dbus-1 >= 1.2.6], [have_dbus_126=yes],[have_dbus_126=no])
-diff --git a/src/applet.c b/src/applet.c
-index e451f75..8164501 100644
--- a/src/applet.c
-+++ b/src/applet.c
-@@ -622,12 +622,10 @@ applet_do_notify (NMApplet *applet,
- 	escaped = utils_escape_notify_message (message);
- 	notify = notify_notification_new (summary,
- 	                                  escaped,
-	                                  icon ? icon : GTK_STOCK_NETWORK,
-	                                  NULL);
-+	                                  icon ? icon : GTK_STOCK_NETWORK);
- 	g_free (escaped);
- 	applet->notification = notify;
- 
-	notify_notification_attach_to_status_icon (notify, applet->status_icon);
- 	notify_notification_set_urgency (notify, urgency);
- 	notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT);
- 
-- 
-1.7.2.3
--- a/fix-resolv-conf-updating.patch
+++ b/fix-resolv-conf-updating.patch
@ -1,57 +0,0 @@
-From 0d157c412776877a3cc76b845910036d29ca2f0a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <jklimes@redhat.com>
-Date: Tue, 22 Feb 2011 18:28:12 +0100
-Subject: [PATCH] dns: fix up updating resolv.conf (rh #672282)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-
-Signed-off-by: Jiří Klimeš <jklimes@redhat.com>
---
- src/dns-manager/nm-dns-manager.c |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c
-index b0cdcc2..32800d0 100644
--- a/src/dns-manager/nm-dns-manager.c
-+++ b/src/dns-manager/nm-dns-manager.c
-@@ -16,7 +16,7 @@
-  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  *
-  * Copyright (C) 2004 - 2005 Colin Walters <walters@redhat.com>
- * Copyright (C) 2004 - 2010 Red Hat, Inc.
-+ * Copyright (C) 2004 - 2011 Red Hat, Inc.
-  * Copyright (C) 2005 - 2008 Novell, Inc.
-  *   and others
-  */
-@@ -861,7 +861,7 @@ nm_dns_manager_remove_ip4_config (NMDnsManager *mgr,
- 
- 	g_object_unref (config);
- 
-	if (config_changed (mgr))
-+	if (!config_changed (mgr))
- 		return TRUE;
- 
- 	if (!update_dns (mgr, iface, FALSE, &error)) {
-@@ -906,7 +906,7 @@ nm_dns_manager_add_ip6_config (NMDnsManager *mgr,
- 	if (!g_slist_find (priv->configs, config))
- 		priv->configs = g_slist_append (priv->configs, g_object_ref (config));
- 
-	if (config_changed (mgr))
-+	if (!config_changed (mgr))
- 		return TRUE;
- 
- 	if (!update_dns (mgr, iface, FALSE, &error)) {
-@@ -946,7 +946,7 @@ nm_dns_manager_remove_ip6_config (NMDnsManager *mgr,
- 
- 	g_object_unref (config);	
- 
-	if (config_changed (mgr))
-+	if (!config_changed (mgr))
- 		return TRUE;
- 
- 	if (!update_dns (mgr, iface, FALSE, &error)) {
-- 
-1.7.4
-
--- a/fix-uninitialized.patch
+++ b/fix-uninitialized.patch
@ -1,45 +0,0 @@
-diff -up NetworkManager-0.8.2/src/nm-device-ethernet.c.uninitialized NetworkManager-0.8.2/src/nm-device-ethernet.c
--- NetworkManager-0.8.2/src/nm-device-ethernet.c.uninitialized	2010-11-17 18:24:02.000000000 -0600
-+++ NetworkManager-0.8.2/src/nm-device-ethernet.c	2011-02-01 22:03:10.633281326 -0600
-@@ -308,7 +308,7 @@ _update_s390_subchannels (NMDeviceEthern
- 	const char *iface;
- 	GUdevClient *client;
- 	GUdevDevice *dev;
-	GUdevDevice *parent;
-+	GUdevDevice *parent = NULL;
- 	const char *parent_path, *item, *driver;
- 	const char *subsystems[] = { "net", NULL };
- 	GDir *dir;
-diff -up NetworkManager-0.8.2/system-settings/plugins/ifcfg-rh/reader.c.uninitialized NetworkManager-0.8.2/system-settings/plugins/ifcfg-rh/reader.c
--- NetworkManager-0.8.2/system-settings/plugins/ifcfg-rh/reader.c.uninitialized	2011-02-01 22:04:47.501070312 -0600
-+++ NetworkManager-0.8.2/system-settings/plugins/ifcfg-rh/reader.c	2011-02-01 22:05:16.234711093 -0600
-@@ -893,7 +893,7 @@ error:
- static NMIP6Address *
- parse_full_ip6_address (const char *addr_str, GError **error)
- {
-	NMIP6Address *addr;
-+	NMIP6Address *addr = NULL;
- 	char **list;
- 	char *ip_tag, *prefix_tag;
- 	struct in6_addr tmp = IN6ADDR_ANY_INIT;
-@@ -944,7 +944,8 @@ parse_full_ip6_address (const char *addr
- 
- error:
- 	if (!success) {
-		nm_ip6_address_unref (addr);
-+		if (addr)
-+			nm_ip6_address_unref (addr);
- 		addr = NULL;
- 	}
- 
-diff -up NetworkManager-0.8.2/system-settings/plugins/ifcfg-rh/writer.c.uninitialized NetworkManager-0.8.2/system-settings/plugins/ifcfg-rh/writer.c
--- NetworkManager-0.8.2/system-settings/plugins/ifcfg-rh/writer.c.uninitialized	2010-10-18 18:44:05.000000000 -0500
-+++ NetworkManager-0.8.2/system-settings/plugins/ifcfg-rh/writer.c	2011-02-01 22:03:10.634281314 -0600
-@@ -884,6 +884,7 @@ write_wired_setting (NMConnection *conne
- 	svSetValue (ifcfg, "SUBCHANNELS", NULL, FALSE);
- 	s390_subchannels = nm_setting_wired_get_s390_subchannels (s_wired);
- 	if (s390_subchannels) {
-+		tmp = NULL;
- 	    if (s390_subchannels->len == 2) {
- 			tmp = g_strdup_printf ("%s,%s",
- 				                   (const char *) g_ptr_array_index (s390_subchannels, 0),
--- a/gtk3-1.patch
+++ b/gtk3-1.patch
@ -1,11 +0,0 @@
--- a/src/applet.c	2010-11-02 21:28:16.850180001 -0400
-+++ b/src/applet.c	2010-11-02 20:58:40.797180001 -0400
-@@ -2736,7 +2736,7 @@
- 	return *icon;
- }
- 
-#define FALLBACK_ICON_NAME "gtk-dialog-error"
-+#define FALLBACK_ICON_NAME "dialog-error"
- 
- static gboolean
- nma_icons_reload (NMApplet *applet)
--- a/gtk3-2.patch
+++ b/gtk3-2.patch
@ -1,34 +0,0 @@
-commit f53171cc0f0e38c16a6d7b0f50ed2e545b9ec1df
-Author: Dan Williams <dcbw@redhat.com>
-Date:   Fri Nov 5 14:58:51 2010 -0500
-
-    trivial: fix for GTK 3.0 (bgo #632328)
-
-diff --git a/src/applet.c b/src/applet.c
-index 90f606c..7e13e2a 100644
--- a/src/applet.c
-+++ b/src/applet.c
-@@ -2936,7 +2936,11 @@ applet_pre_keyring_callback (gpointer user_data)
- 	if (applet->menu)
- 		window = gtk_widget_get_window (applet->menu);
- 	if (window) {
-+#if GTK_CHECK_VERSION(2,23,0)
-+		screen = gdk_window_get_screen (window);
-+#else
- 		screen = gdk_drawable_get_screen (window);
-+#endif
- 		display = gdk_screen_get_display (screen);
- 		g_object_ref (display);
- 
-@@ -2957,7 +2961,11 @@ applet_pre_keyring_callback (gpointer user_data)
- 	if (applet->context_menu)
- 		window = gtk_widget_get_window (applet->context_menu);
- 	if (window) {
-+#if GTK_CHECK_VERSION(2,23,0)
-+		screen = gdk_window_get_screen (window);
-+#else
- 		screen = gdk_drawable_get_screen (window);
-+#endif
- 		display = gdk_screen_get_display (screen);
- 		g_object_ref (display);
- 
--- a/gtk3-3.patch
+++ b/gtk3-3.patch
@ -1,155 +0,0 @@
-commit d48d0db2e22c6ca31f5cb709e063db8b99401b25
-Author: Dan Williams <dcbw@redhat.com>
-Date:   Fri Nov 5 15:12:42 2010 -0500
-
-    core: clean up about dialog (bgo #632328)
-    
-    First, GTK 3.0 removed gdk_spawn_command_line_on_screen().
-    
-    Second, everyone listed in the Credits gets monthly emails from
-    users with random questions; these should go to the list instead.
-    So remove credits entirely and mention contributions in the
-    copyright message.
-
-diff --git a/src/applet-dialogs.c b/src/applet-dialogs.c
-index 58ad88b..046f378 100644
--- a/src/applet-dialogs.c
-+++ b/src/applet-dialogs.c
-@@ -568,123 +568,46 @@ applet_info_dialog_show (NMApplet *applet)
- 		gdk_x11_get_server_time (gtk_widget_get_window (dialog)));
- }
- 
-+#if !GTK_CHECK_VERSION(2,23,0)
- static void 
- about_dialog_handle_url_cb (GtkAboutDialog *about, const gchar *url, gpointer data)
- {
-	GError *error = NULL;
- 	gboolean ret;
- 	char *cmdline;
-	GdkScreen *gscreen;
-	GtkWidget *error_dialog;
-+	GdkScreen *screen;
- 
-	gscreen = gtk_window_get_screen (GTK_WINDOW (about));
-+	screen = gtk_window_get_screen (GTK_WINDOW (about));
- 
- 	cmdline = g_strconcat ("gnome-open ", url, NULL);
-	ret = gdk_spawn_command_line_on_screen (gscreen, cmdline, &error);
-+	ret = gdk_spawn_command_line_on_screen (screen, cmdline, NULL);
- 	g_free (cmdline);
- 
-	if (ret == TRUE)
-		return;
-
-	g_error_free (error);
-	error = NULL;
-
-	cmdline = g_strconcat ("xdg-open ", url, NULL);
-	ret = gdk_spawn_command_line_on_screen (gscreen, cmdline, &error);
-	g_free (cmdline);
-	
-	if (ret == FALSE) {
-		error_dialog = gtk_message_dialog_new ( NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "Failed to show url %s", error->message); 
-		gtk_dialog_run (GTK_DIALOG (error_dialog));
-		g_error_free (error);
-	}
-
-}
-
-/* Make email in about dialog clickable */
-static void 
-about_dialog_handle_email_cb (GtkAboutDialog *about, const char *email_address, gpointer data)
-{
-	GError *error = NULL;
-	gboolean ret;
-	char *cmdline;
-	GdkScreen *gscreen;
-	GtkWidget *error_dialog;
-
-	gscreen = gtk_window_get_screen (GTK_WINDOW (about));
-
-	cmdline = g_strconcat ("gnome-open mailto:", email_address, NULL);
-	ret = gdk_spawn_command_line_on_screen (gscreen, cmdline, &error);
-	g_free (cmdline);
-
-	if (ret == TRUE)
-		return;
-
-	g_error_free (error);
-	error = NULL;
-
-	cmdline = g_strconcat ("xdg-open mailto:", email_address, NULL);
-	ret = gdk_spawn_command_line_on_screen (gscreen, cmdline, &error);
-	g_free (cmdline);
-	
- 	if (ret == FALSE) {
-		error_dialog = gtk_message_dialog_new ( NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "Failed to show url %s", error->message); 
-		gtk_dialog_run (GTK_DIALOG (error_dialog));
-		g_error_free (error);
-+		cmdline = g_strconcat ("xdg-open ", url, NULL);
-+		ret = gdk_spawn_command_line_on_screen (screen, cmdline, NULL);
-+		g_free (cmdline);
- 	}
- }
-+#endif
- 
- void
- applet_about_dialog_show (NMApplet *applet)
- {
-	static const gchar *authors[] = {
-		"The Red Hat Desktop Team, including:\n",
-		"Christopher Aillon <caillon@redhat.com>",
-		"Jonathan Blandford <jrb@redhat.com>",
-		"John Palmieri <johnp@redhat.com>",
-		"Ray Strode <rstrode@redhat.com>",
-		"Colin Walters <walters@redhat.com>",
-		"Dan Williams <dcbw@redhat.com>",
-		"David Zeuthen <davidz@redhat.com>",
-		"\nAnd others, including:\n",
-		"Bill Moss <bmoss@clemson.edu>",
-		"Tom Parker",
-		"j@bootlab.org",
-		"Peter Jones <pjones@redhat.com>",
-		"Robert Love <rml@novell.com>",
-		"Tim Niemueller (http://www.niemueller.de)",
-		NULL
-	};
-
-	static const gchar *artists[] = {
-		"Diana Fong <dfong@redhat.com>",
-		NULL
-	};
-
-
-	/* FIXME: unnecessary with libgnomeui >= 2.16.0 */
-	static gboolean been_here = FALSE;
-	if (!been_here) {
-		been_here = TRUE;
-		gtk_about_dialog_set_url_hook (about_dialog_handle_url_cb, NULL, NULL);
-		gtk_about_dialog_set_email_hook (about_dialog_handle_email_cb, NULL, NULL);
-	}
-
-+#if !GTK_CHECK_VERSION(2,23,0)
-+	gtk_about_dialog_set_url_hook (about_dialog_handle_url_cb, NULL, NULL);
-+#endif
- 	gtk_show_about_dialog (NULL,
- 	                       "version", VERSION,
-	                       "copyright", _("Copyright \xc2\xa9 2004-2008 Red Hat, Inc.\n"
-					                  "Copyright \xc2\xa9 2005-2008 Novell, Inc."),
-+	                       "copyright", _("Copyright \xc2\xa9 2004-2010 Red Hat, Inc.\n"
-+	                                      "Copyright \xc2\xa9 2005-2008 Novell, Inc.\n"
-+	                                      "and many other community contributors and translators"),
- 	                       "comments", _("Notification area applet for managing your network devices and connections."),
- 	                       "website", "http://www.gnome.org/projects/NetworkManager/",
- 	                       "website-label", _("NetworkManager Website"),
-	                       "authors", authors,
-	                       "artists", artists,
-	                       "translator-credits", _("translator-credits"),
- 	                       "logo-icon-name", GTK_STOCK_NETWORK,
- 	                       NULL);
- }
- 
-
- GtkWidget *
- applet_warning_dialog_show (const char *message)
- {
--- a/gtk3-4.patch
+++ b/gtk3-4.patch
@ -1,34 +0,0 @@
-commit 06c7c14a5e3c6eaf9975c97e15f56bf7ca5f5c75
-Author: Dan Williams <dcbw@redhat.com>
-Date:   Sat Nov 6 13:31:13 2010 -0500
-
-    mobile: more gtk3 fixes (bgo #632652)
-
-diff --git a/src/utils/mobile-wizard.c b/src/utils/mobile-wizard.c
-index 8445132..d562fc5 100644
--- a/src/utils/mobile-wizard.c
-+++ b/src/utils/mobile-wizard.c
-@@ -747,11 +747,23 @@ providers_setup (MobileWizard *self)
- 	gtk_table_attach (GTK_TABLE (unlisted_table), alignment,
- 	                  1, 2, 0, 1, GTK_EXPAND | GTK_FILL, 0, 6, 6);
- 
-+#if GTK_CHECK_VERSION(2,23,0)
-+	self->provider_unlisted_type_combo = gtk_combo_box_text_new ();
-+#else
- 	self->provider_unlisted_type_combo = gtk_combo_box_new_text ();
-+#endif
- 	gtk_label_set_mnemonic_widget (GTK_LABEL (label), self->provider_unlisted_type_combo);
-+#if GTK_CHECK_VERSION(2,23,0)
-+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (self->provider_unlisted_type_combo),
-+#else
- 	gtk_combo_box_append_text (GTK_COMBO_BOX (self->provider_unlisted_type_combo),
-+#endif
- 	                           _("My provider uses GSM technology (GPRS, EDGE, UMTS, HSPA)"));
-+#if GTK_CHECK_VERSION(2,23,0)
-+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (self->provider_unlisted_type_combo),
-+#else
- 	gtk_combo_box_append_text (GTK_COMBO_BOX (self->provider_unlisted_type_combo),
-+#endif
- 	                           _("My provider uses CDMA technology (1xRTT, EVDO)"));
- 	gtk_combo_box_set_active (GTK_COMBO_BOX (self->provider_unlisted_type_combo), 0);
- 
--- a/gtk3-5.patch
+++ b/gtk3-5.patch
@ -1,215 +0,0 @@
-commit 546ae3141a987b3efa350b1a31c0579f1fa88c73
-Author: Dan Williams <dcbw@redhat.com>
-Date:   Sat Nov 6 14:25:56 2010 -0500
-
-    core: more fixes for GTK3
-    
-    It'll actually build now.  GTK3 is the default, pass:
-    
-    --with-gtk2=yes
-    
-    to still use GTK2.
-
-diff --git a/configure.ac b/configure.ac
-index f8d6819..cbfa4cf 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -73,13 +73,24 @@ PKG_CHECK_MODULES(NMA,
- PKG_CHECK_MODULES(NMA,
- 		[dbus-glib-1 >= 0.74
- 		 glib-2.0 >= 2.16
-		 gtk+-2.0 >= 2.14
- 		 libglade-2.0
- 		 gmodule-export-2.0
- 		 gconf-2.0
- 		 gnome-keyring-1
- 		 libnotify >= 0.7.0])
- 
-+AC_ARG_WITH([gtk2], AS_HELP_STRING([--with-gtk2], [Use GTK+ 2.x instead of GTK+ 3.x]),
-+            with_gtk2="$withval",with_gtk2=no)
-+gtkver=3
-+case "${with_gtk2}" in
-+	yes)	PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.18)
-+		gtkver=2
-+		;;
-+	*)	PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 2.90)
-+		;;
-+esac
-+AM_CONDITIONAL(USE_GTK2, test x"$gtkver" = "x2")
-+
- # Check for dbus-1.2.6 or later for deny-by-default rules
- PKG_CHECK_MODULES(DBUS_126, [dbus-1 >= 1.2.6], [have_dbus_126=yes],[have_dbus_126=no])
- AM_CONDITIONAL(HAVE_DBUS_126, test x"$have_dbus_126" = "xyes")
-@@ -156,3 +167,6 @@ icons/scalable/Makefile
- po/Makefile.in
- ])
- AC_OUTPUT
-+
-+echo Building for GTK+ version: ${gtkver}
-+
-diff --git a/src/Makefile.am b/src/Makefile.am
-index ec786d8..2da5ee2 100644
--- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -3,6 +3,7 @@ SUBDIRS = marshallers utils gconf-helpers wireless-security connection-editor gn
-            -I${top_srcdir}/../libnm-glib
- 
- nm_applet_CPPFLAGS = \
-+	$(GTK_CFLAGS) \
- 	$(NMA_CFLAGS) \
- 	$(NOTIFY_CFLAGS) \
- 	-DICONDIR=\""$(datadir)/icons"\"						\
-@@ -53,6 +54,7 @@ nm_applet_SOURCES =			\
- 
- nm_applet_LDADD = \
- 	-lm \
-+	$(GTK_LIBS) \
- 	$(NMA_LIBS) \
- 	$(NOTIFY_LIBS) \
- 	${top_builddir}/src/marshallers/libmarshallers.la \
-diff --git a/src/applet-dialogs.c b/src/applet-dialogs.c
-index 046f378..132cec2 100644
--- a/src/applet-dialogs.c
-+++ b/src/applet-dialogs.c
-@@ -1031,13 +1031,21 @@ applet_mobile_pin_dialog_start_spinner (GtkWidget *dialog, const char *text)
- 	xml = g_object_get_data (G_OBJECT (dialog), "xml");
- 	g_return_if_fail (xml != NULL);
- 
-+#if GTK_CHECK_VERSION(2,90,0)
-+	spinner = gtk_spinner_new ();
-+#else
- 	spinner = nma_bling_spinner_new ();
-+#endif
- 	g_return_if_fail (spinner != NULL);
- 	g_object_set_data (G_OBJECT (dialog), "spinner", spinner);
- 
- 	align = glade_xml_get_widget (xml, "spinner_alignment");
- 	gtk_container_add (GTK_CONTAINER (align), spinner);
-+#if GTK_CHECK_VERSION(2,90,0)
-+	gtk_spinner_start (GTK_SPINNER (spinner));
-+#else
- 	nma_bling_spinner_start (NMA_BLING_SPINNER (spinner));
-+#endif
- 
- 	widget = glade_xml_get_widget (xml, "progress_label");
- 	gtk_label_set_text (GTK_LABEL (widget), text);
-@@ -1075,7 +1083,11 @@ applet_mobile_pin_dialog_stop_spinner (GtkWidget *dialog, const char *text)
- 
- 	spinner = g_object_get_data (G_OBJECT (dialog), "spinner");
- 	g_return_if_fail (spinner != NULL);
-+#if GTK_CHECK_VERSION(2,90,0)
-+	gtk_spinner_stop (GTK_SPINNER (spinner));
-+#else
- 	nma_bling_spinner_stop (NMA_BLING_SPINNER (spinner));
-+#endif
- 	g_object_set_data (G_OBJECT (dialog), "spinner", NULL);
- 
- 	/* Remove it from the alignment */
-diff --git a/src/connection-editor/Makefile.am b/src/connection-editor/Makefile.am
-index 326c642..a4d04a7 100644
--- a/src/connection-editor/Makefile.am
-+++ b/src/connection-editor/Makefile.am
-@@ -1,6 +1,7 @@
-            -I${top_srcdir}/../libnm-glib
- 
- nm_connection_editor_CPPFLAGS = \
-+	$(GTK_CFLAGS) \
- 	$(NMA_CFLAGS) \
- 	-DICONDIR=\""$(datadir)/icons"\" \
- 	-DGLADEDIR=\""$(gladedir)"\" \
-@@ -63,6 +64,7 @@ nm_connection_editor_LDADD = \
- 	${top_builddir}/src/wireless-security/libwireless-security.la \
- 	${top_builddir}/src/utils/libutils.la \
- 	${top_builddir}/src/marshallers/libmarshallers.la \
-+	$(GTK_LIBS) \
- 	$(NMA_LIBS) \
- 	-lm \
- 	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
-diff --git a/src/gconf-helpers/Makefile.am b/src/gconf-helpers/Makefile.am
-index 873fc90..3ec3489 100644
--- a/src/gconf-helpers/Makefile.am
-+++ b/src/gconf-helpers/Makefile.am
-@@ -11,6 +11,7 @@ libgconf_helpers_la_SOURCES =	\
- 	nma-gconf-settings.c
- 
- libgconf_helpers_la_CPPFLAGS = \
-+	$(GTK_CFLAGS) \
- 	$(NMA_CFLAGS) \
- 	$(DISABLE_DEPRECATED) \
- 	-I${top_srcdir}/src \
-@@ -18,6 +19,7 @@ libgconf_helpers_la_CPPFLAGS = \
- 	-I${top_srcdir}/src/utils
- 
- libgconf_helpers_la_LIBADD = \
-+	$(GTK_LIBS) \
- 	$(NMA_LIBS) \
- 	${top_builddir}/src/marshallers/libmarshallers.la \
- 	${top_builddir}/src/utils/libutils.la \
-diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
-index 0794db5..d9a9c8e 100644
--- a/src/utils/Makefile.am
-+++ b/src/utils/Makefile.am
-@@ -8,11 +8,16 @@ libutils_la_SOURCES = \
- 	nmn-mobile-providers.h \
- 	nmn-mobile-providers.c \
- 	mobile-wizard.h \
-	mobile-wizard.c \
-+	mobile-wizard.c
-+
-+if USE_GTK2
-+libutils_la_SOURCES += \
- 	nma-bling-spinner.h \
- 	nma-bling-spinner.c
-+endif
- 
- libutils_la_CPPFLAGS = \
-+	$(GTK_CFLAGS) \
- 	$(NMA_CFLAGS) \
- 	-DGLADEDIR=\""$(gladedir)"\" \
- 	-DDATADIR=\""$(datadir)"\" \
-@@ -20,7 +25,7 @@ libutils_la_CPPFLAGS = \
- 	-I${top_srcdir}/src/gconf-helpers \
- 	-I${top_srcdir}/src
- 
-libutils_la_LIBADD = $(NMA_LIBS) \
-+libutils_la_LIBADD = $(GTK_LIBS) $(NMA_LIBS) \
- 	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
- 	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
- 
-diff --git a/src/utils/tests/Makefile.am b/src/utils/tests/Makefile.am
-index 72169d6..213829f 100644
--- a/src/utils/tests/Makefile.am
-+++ b/src/utils/tests/Makefile.am
-@@ -4,10 +4,11 @@ noinst_PROGRAMS = test-utils
- 
- test_utils_SOURCES = test-utils.c
- 
-test_utils_CPPFLAGS = $(NMA_CFLAGS)
-+test_utils_CPPFLAGS = $(GTK_CFLAGS) $(NMA_CFLAGS)
- 
- test_utils_LDADD = \
- 	${top_builddir}/src/utils/libutils.la \
-+	$(GTK_LIBS) \
- 	$(NMA_LIBS)
- 
- check-local: test-utils
-diff --git a/src/wireless-security/Makefile.am b/src/wireless-security/Makefile.am
-index 3f4088f..986d60d 100644
--- a/src/wireless-security/Makefile.am
-+++ b/src/wireless-security/Makefile.am
-@@ -29,12 +29,14 @@ libwireless_security_la_SOURCES = \
- 	helpers.c
- 
- libwireless_security_la_CPPFLAGS = \
-+	$(GTK_CFLAGS) \
- 	$(NMA_CFLAGS) \
- 	$(DISABLE_DEPRECATED) \
- 	-I${top_srcdir}/src/utils \
- 	-I${top_srcdir}/src/gconf-helpers
- 
- libwireless_security_la_LIBADD = \
-+	$(GTK_LIBS) \
- 	$(NMA_LIBS) \
- 	${top_builddir}/src/utils/libutils.la \
- 	${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
-
--- a/gtk3-6.patch
+++ b/gtk3-6.patch
@ -1,12 +0,0 @@
-diff -up a/src/applet.c.gtk3-6 b/src/applet.c
--- a/src/applet.c.gtk3-6	2010-11-17 18:57:59.150709005 -0600
-+++ b/src/applet.c	2010-11-17 18:58:03.384709001 -0600
-@@ -515,7 +515,7 @@ menu_title_item_expose (GtkWidget *widge
- #else
- 	allocation = widget->allocation;
- #endif
-	cairo_translate (cr, widget->allocation.x, widget->allocation.y);
-+	cairo_translate (cr, allocation.x, allocation.y);
- 
- 	text = gtk_label_get_text (GTK_LABEL (label));
- 
--- a/modem-ip-interface-property-change.patch
+++ b/modem-ip-interface-property-change.patch
@ -1,27 +0,0 @@
-From 2bee736df163b5ee28b13c85f7b63ba55be80415 Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Sun, 02 Jan 2011 00:00:50 +0000
-Subject: modem: handle IP Method changes after modem has been created
-
-Some modems don't know their IP method when they are created, but
-will update it later.  Handle the changed signal for that.
---
-diff --git a/src/modem-manager/nm-modem.c b/src/modem-manager/nm-modem.c
-index e07b818..b3f7eaa 100644
--- a/src/modem-manager/nm-modem.c
-+++ b/src/modem-manager/nm-modem.c
-@@ -876,6 +876,12 @@ modem_properties_changed (DBusGProxy *proxy,
- 		priv->mm_enabled = g_value_get_boolean (value);
- 		g_object_notify (G_OBJECT (self), NM_MODEM_ENABLED);
- 	}
-+
-+	value = g_hash_table_lookup (props, "IpMethod");
-+	if (value && G_VALUE_HOLDS_UINT (value)) {
-+		priv->ip_method = g_value_get_uint (value);
-+		g_object_notify (G_OBJECT (self), NM_MODEM_IP_METHOD);
-+	}
- }
- 
- /*****************************************************************************/
--
-cgit v0.8.3-6-g21f6
--- a/nm-applet-internal-buildfixes.patch
+++ b/nm-applet-internal-buildfixes.patch
@ -1,32 +1,32 @@
-diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/configure.ac.buildfix NetworkManager-0.8.2/network-manager-applet-0.8.2/configure.ac
--- NetworkManager-0.8.2/network-manager-applet-0.8.2/configure.ac.buildfix	2009-07-28 10:01:26.000000000 -0400
-+++ NetworkManager-0.8.2/network-manager-applet-0.8.2/configure.ac	2009-07-28 13:11:39.261718877 -0400
+diff -up NetworkManager-0.8.997/network-manager-applet-0.8.997/configure.ac.buildfix NetworkManager-0.8.997/network-manager-applet-0.8.997/configure.ac
+--- NetworkManager-0.8.997/network-manager-applet-0.8.997/configure.ac.buildfix	2009-07-28 10:01:26.000000000 -0400
+++ NetworkManager-0.8.997/network-manager-applet-0.8.997/configure.ac	2009-07-28 13:11:39.261718877 -0400
@@ -70,10 +70,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0)
 PKG_CHECK_MODULES(NMA,
 		[dbus-glib-1 >= 0.74
 		 glib-2.0 >= 2.16
-		 NetworkManager >= 0.8.2
-		 libnm-glib >= 0.8.2
-		 libnm-util >= 0.8.2
-		 libnm-glib-vpn >= 0.8.2
- 		 gtk+-2.0 >= 2.14
- 		 libglade-2.0
- 		 gmodule-export-2.0
+-		 NetworkManager >= 0.8.996
+-		 libnm-glib >= 0.8.996
+-		 libnm-util >= 0.8.996
+-		 libnm-glib-vpn >= 0.8.996
+ 		 gmodule-export-2.0])
+ 
+ PKG_CHECK_MODULES(GCONF, [gconf-2.0])
@@ -192,9 +188,7 @@ AC_SUBST(DBUS_SYS_DIR)
+ 	*)
 		AC_MSG_CHECKING(for gnome-bluetooth)
 		PKG_CHECK_MODULES(GNOME_BLUETOOTH,
- 				  gconf-2.0
 -				  gnome-bluetooth-1.0 >= 2.27.6
-				  libnm-util >= 0.8.2
-				  libnm-glib >= 0.8.2,
+-				  libnm-util >= 0.8.995
+-				  libnm-glib >= 0.8.995,
 +				  gnome-bluetooth-1.0 >= 2.27.6,
 				  have_gbt=yes, have_gbt=no)
 		;;
 esac
 
-diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/connection-editor/Makefile.am.buildfix NetworkManager-0.8.2/network-manager-applet-0.8.2/src/connection-editor/Makefile.am
--- NetworkManager-0.8.2/network-manager-applet-0.8.2/src/connection-editor/Makefile.am.buildfix	2009-07-23 10:51:39.000000000 -0400
-+++ NetworkManager-0.8.2/network-manager-applet-0.8.2/src/connection-editor/Makefile.am	2009-07-28 11:29:11.685841724 -0400
+diff -up NetworkManager-0.8.997/network-manager-applet-0.8.997/src/connection-editor/Makefile.am.buildfix NetworkManager-0.8.997/network-manager-applet-0.8.997/src/connection-editor/Makefile.am
+--- NetworkManager-0.8.997/network-manager-applet-0.8.997/src/connection-editor/Makefile.am.buildfix	2009-07-23 10:51:39.000000000 -0400
+++ NetworkManager-0.8.997/network-manager-applet-0.8.997/src/connection-editor/Makefile.am	2009-07-28 11:29:11.685841724 -0400
@@ -1,5 +1,9 @@
 bin_PROGRAMS = nm-connection-editor
 
@ -35,11 +35,11 @@ diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/connection-editor
 +           -I${top_srcdir}/../libnm-glib
 +
 nm_connection_editor_CPPFLAGS = \
+ 	$(GTK_CFLAGS) \
 	$(NMA_CFLAGS) \
- 	-DICONDIR=\""$(datadir)/icons"\" \
@@ -63,7 +67,10 @@ nm_connection_editor_LDADD = \
- 	${top_builddir}/src/utils/libutils.la \
 	${top_builddir}/src/marshallers/libmarshallers.la \
+ 	$(GTK_LIBS) \
 	$(NMA_LIBS) \
 -	-lm
 +	-lm \
@ -47,31 +47,56 @@ diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/connection-editor
 +	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la \
 +	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib-vpn.la
 
- gladedir = $(datadir)/nm-applet
- glade_DATA = \
-diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.8.2/network-manager-applet-0.8.2/src/gconf-helpers/Makefile.am
--- NetworkManager-0.8.2/network-manager-applet-0.8.2/src/gconf-helpers/Makefile.am.buildfix	2009-04-20 07:09:10.000000000 -0400
-+++ NetworkManager-0.8.2/network-manager-applet-0.8.2/src/gconf-helpers/Makefile.am	2009-07-28 11:29:11.686841642 -0400
-@@ -1,3 +1,7 @@
+ uidir = $(datadir)/nm-applet
+ ui_DATA = \
+diff -up NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gconf-helpers/Makefile.am
+--- NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gconf-helpers/Makefile.am.buildfix	2009-04-20 07:09:10.000000000 -0400
+++ NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gconf-helpers/Makefile.am	2009-07-28 11:29:11.686841642 -0400
+@@ -1,5 +1,9 @@
+ SUBDIRS=. tests
+ 
 +INCLUDES = -I${top_srcdir}/../include \
 +           -I${top_srcdir}/../libnm-util \
 +           -I${top_srcdir}/../libnm-glib
 +
- noinst_LTLIBRARIES = libgconf-helpers.la
- 
- libgconf_helpers_la_SOURCES =	\
-@@ -19,5 +23,7 @@ libgconf_helpers_la_CPPFLAGS = \
- libgconf_helpers_la_LIBADD = \
+ noinst_LTLIBRARIES = \
+ 	libgconf-helpers.la \
+ 	libgconf-helpers-test.la
+@@ -23,7 +27,9 @@ libgconf_helpers_la_LIBADD = \
+ 	$(GTK_LIBS) \
 	$(NMA_LIBS) \
- 	${top_builddir}/src/marshallers/libmarshallers.la \
-	${top_builddir}/src/utils/libutils.la
-+	${top_builddir}/src/utils/libutils.la \
+ 	$(GCONF_LIBS) \
+-	$(GNOME_KEYRING_LIBS)
+	$(GNOME_KEYRING_LIBS) \
 +	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
 +	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
 
-diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.8.2/network-manager-applet-0.8.2/src/gnome-bluetooth/Makefile.am
--- NetworkManager-0.8.2/network-manager-applet-0.8.2/src/gnome-bluetooth/Makefile.am.buildfix	2009-07-28 13:23:40.282718683 -0400
-+++ NetworkManager-0.8.2/network-manager-applet-0.8.2/src/gnome-bluetooth/Makefile.am	2009-07-28 13:24:56.316719077 -0400
+ #########################
+ # Test library
+@@ -40,5 +46,7 @@ libgconf_helpers_test_la_CPPFLAGS = \
+ 
+ # no keyring or gconf libs since we'll override them
+ libgconf_helpers_test_la_LIBADD = \
+-	$(NMA_LIBS)
+	$(NMA_LIBS) \
+	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
+	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
+ 
+diff -up NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gconf-helpers/tests/Makefile.am.buildfix NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gconf-helpers/tests/Makefile.am
+--- NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gconf-helpers/tests/Makefile.am.buildfix	2011-03-10 02:19:03.664936744 -0600
+++ NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gconf-helpers/tests/Makefile.am	2011-03-10 02:20:10.784097638 -0600
+@@ -1,4 +1,7 @@
+-INCLUDES = -I$(top_srcdir)/src/utils
+INCLUDES = -I$(top_srcdir)/src/utils \
+           -I${top_srcdir}/../include \
+           -I${top_srcdir}/../libnm-util \
+           -I${top_srcdir}/../libnm-glib
+ 
+ noinst_PROGRAMS = test-upgrade
+ 
+diff -up NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gnome-bluetooth/Makefile.am
+--- NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gnome-bluetooth/Makefile.am.buildfix	2009-07-28 13:23:40.282718683 -0400
+++ NetworkManager-0.8.997/network-manager-applet-0.8.997/src/gnome-bluetooth/Makefile.am	2009-07-28 13:24:56.316719077 -0400
@@ -6,6 +6,9 @@ INCLUDES = \
 	-I$(top_builddir) \
 	-I${top_builddir}/src/marshallers \
@ -83,9 +108,9 @@ diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/gnome-bluetooth/M
 	$(DISABLE_DEPRECATED) \
 	$(WARN_CFLAGS)
@@ -14,7 +17,9 @@ plugin_LTLIBRARIES = libnma.la
- 
 libnma_la_LIBADD = \
- 	$(top_builddir)/src/gconf-helpers/libgconf-helpers.la \
+ 	$(top_builddir)/src/marshallers/libmarshallers.la \
+ 	$(top_builddir)/src/utils/libutils.la \
 -	$(GNOME_BLUETOOTH_LIBS)
 +	$(GNOME_BLUETOOTH_LIBS) \
 +	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
@ -93,9 +118,9 @@ diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/gnome-bluetooth/M
 endif
 
 EXTRA_DIST = $(BT_WIDGET_SOURCES)
-diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/Makefile.am.buildfix NetworkManager-0.8.2/network-manager-applet-0.8.2/src/Makefile.am
--- NetworkManager-0.8.2/network-manager-applet-0.8.2/src/Makefile.am.buildfix	2009-07-27 15:26:53.000000000 -0400
-+++ NetworkManager-0.8.2/network-manager-applet-0.8.2/src/Makefile.am	2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.997/network-manager-applet-0.8.997/src/Makefile.am.buildfix NetworkManager-0.8.997/network-manager-applet-0.8.997/src/Makefile.am
+--- NetworkManager-0.8.997/network-manager-applet-0.8.997/src/Makefile.am.buildfix	2009-07-27 15:26:53.000000000 -0400
+++ NetworkManager-0.8.997/network-manager-applet-0.8.997/src/Makefile.am	2009-07-28 11:29:11.686841642 -0400
@@ -2,6 +2,10 @@ SUBDIRS = marshallers utils gconf-helper
 
 bin_PROGRAMS = nm-applet
@ -105,8 +130,8 @@ diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/Makefile.am.build
 +           -I${top_srcdir}/../libnm-glib
 +
 nm_applet_CPPFLAGS = \
+ 	$(GTK_CFLAGS) \
 	$(NMA_CFLAGS) \
- 	$(NOTIFY_CFLAGS) \
@@ -54,7 +58,9 @@ nm_applet_LDADD = \
 	${top_builddir}/src/marshallers/libmarshallers.la \
 	${top_builddir}/src/utils/libutils.la \
@ -116,11 +141,11 @@ diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/Makefile.am.build
 +	-L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
 +	-L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
 
- gladedir = $(datadir)/nm-applet
- glade_DATA = applet.glade keyring.png
-diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/utils/Makefile.am.buildfix NetworkManager-0.8.2/network-manager-applet-0.8.2/src/utils/Makefile.am
--- NetworkManager-0.8.2/network-manager-applet-0.8.2/src/utils/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.8.2/network-manager-applet-0.8.2/src/utils/Makefile.am	2009-07-28 11:29:11.686841642 -0400
+ uidir = $(datadir)/nm-applet
+ ui_DATA = applet.ui keyring.png
+diff -up NetworkManager-0.8.997/network-manager-applet-0.8.997/src/utils/Makefile.am.buildfix NetworkManager-0.8.997/network-manager-applet-0.8.997/src/utils/Makefile.am
+--- NetworkManager-0.8.997/network-manager-applet-0.8.997/src/utils/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
+++ NetworkManager-0.8.997/network-manager-applet-0.8.997/src/utils/Makefile.am	2009-07-28 11:29:11.686841642 -0400
@@ -1,5 +1,9 @@
 SUBDIRS=. tests
 
@ -132,17 +157,17 @@ diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/utils/Makefile.am
 
 libutils_la_SOURCES = \
@@ -18,4 +22,7 @@ libutils_la_CPPFLAGS = \
- 	-I${top_srcdir}/src/gconf-helpers \
+ 	$(DISABLE_DEPRECATED) \
 	-I${top_srcdir}/src
 
-libutils_la_LIBADD = $(NMA_LIBS)
-+libutils_la_LIBADD = $(NMA_LIBS) \
+ libutils_la_LIBADD = $(GTK_LIBS) $(NMA_LIBS) $(GNOME_KEYRING_LIBS)
+libutils_la_LIBADD = $(GTK_LIBS) $(NMA_LIBS) $(GNOME_KEYRING_LIBS) \
 +	-L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
 +	-L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
 +
-diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/utils/tests/Makefile.am.buildfix NetworkManager-0.8.2/network-manager-applet-0.8.2/src/utils/tests/Makefile.am
--- NetworkManager-0.8.2/network-manager-applet-0.8.2/src/utils/tests/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.8.2/network-manager-applet-0.8.2/src/utils/tests/Makefile.am	2009-07-28 11:29:11.686841642 -0400
+diff -up NetworkManager-0.8.997/network-manager-applet-0.8.997/src/utils/tests/Makefile.am.buildfix NetworkManager-0.8.997/network-manager-applet-0.8.997/src/utils/tests/Makefile.am
+--- NetworkManager-0.8.997/network-manager-applet-0.8.997/src/utils/tests/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
+++ NetworkManager-0.8.997/network-manager-applet-0.8.997/src/utils/tests/Makefile.am	2009-07-28 11:29:11.686841642 -0400
@@ -1,4 +1,7 @@
 -INCLUDES = -I$(top_srcdir)/src/utils
 +INCLUDES = -I$(top_srcdir)/src/utils \
@ -152,9 +177,9 @@ diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/utils/tests/Makef
 
 noinst_PROGRAMS = test-utils
 
-diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/wireless-security/Makefile.am.buildfix NetworkManager-0.8.2/network-manager-applet-0.8.2/src/wireless-security/Makefile.am
--- NetworkManager-0.8.2/network-manager-applet-0.8.2/src/wireless-security/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
-+++ NetworkManager-0.8.2/network-manager-applet-0.8.2/src/wireless-security/Makefile.am	2009-07-28 11:29:11.687841490 -0400
+diff -up NetworkManager-0.8.997/network-manager-applet-0.8.997/src/wireless-security/Makefile.am.buildfix NetworkManager-0.8.997/network-manager-applet-0.8.997/src/wireless-security/Makefile.am
+--- NetworkManager-0.8.997/network-manager-applet-0.8.997/src/wireless-security/Makefile.am.buildfix	2009-07-02 16:32:26.000000000 -0400
+++ NetworkManager-0.8.997/network-manager-applet-0.8.997/src/wireless-security/Makefile.am	2009-07-28 11:29:11.687841490 -0400
@@ -1,5 +1,9 @@
 noinst_LTLIBRARIES = libwireless-security.la
 
@ -165,12 +190,15 @@ diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/src/wireless-security
 libwireless_security_la_SOURCES = \
 	wireless-security.h \
 	wireless-security.c \
-@@ -36,5 +40,7 @@ libwireless_security_la_CPPFLAGS = \
- libwireless_security_la_LIBADD = \
+@@ -36,7 +40,9 @@ libwireless_security_la_CPPFLAGS = \
+ 	$(GTK_LIBS) \
 	$(NMA_LIBS) \
- 	${top_builddir}/src/utils/libutils.la \
-	${top_builddir}/src/gconf-helpers/libgconf-helpers.la
-+	${top_builddir}/src/gconf-helpers/libgconf-helpers.la \
+ 	$(GCONF_LIBS) \
+-	${top_builddir}/src/utils/libutils.la
+	${top_builddir}/src/utils/libutils.la \
 +	-L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \
 +	-L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm-glib.la
 
+ uidir = $(datadir)/nm-applet
+ ui_DATA = \
+
--- a/nm-applet-no-notifications.patch
+++ b/nm-applet-no-notifications.patch
@ -1,6 +1,6 @@
-diff -up NetworkManager-0.8.2/network-manager-applet-0.8.2/nm-applet.schemas.in.foo NetworkManager-0.8.2/network-manager-applet-0.8.2/nm-applet.schemas.in
--- NetworkManager-0.8.2/network-manager-applet-0.8.2/nm-applet.schemas.in.foo	2009-10-21 17:23:29.480267635 -0700
-+++ NetworkManager-0.8.2/network-manager-applet-0.8.2/nm-applet.schemas.in	2009-10-21 17:39:42.734142996 -0700
+diff -up NetworkManager-0.8.997/network-manager-applet-0.8.997/nm-applet.schemas.in.foo NetworkManager-0.8.997/network-manager-applet-0.8.997/nm-applet.schemas.in
+--- NetworkManager-0.8.997/network-manager-applet-0.8.997/nm-applet.schemas.in.foo	2009-10-21 17:23:29.480267635 -0700
+++ NetworkManager-0.8.997/network-manager-applet-0.8.997/nm-applet.schemas.in	2009-10-21 17:39:42.734142996 -0700
@@ -6,7 +6,7 @@
       <applyto>/apps/nm-applet/disable-connected-notifications</applyto>
       <owner>nm-applet</owner>
--- a/nm-applet-no-unused-but-set-warning.patch
+++ b/nm-applet-no-unused-but-set-warning.patch
@ -1,12 +0,0 @@
-diff -up network-manager-applet-0.8.2/m4/compiler_warnings.m4.foo network-manager-applet-0.8.2/m4/compiler_warnings.m4
--- network-manager-applet-0.8.2/m4/compiler_warnings.m4.foo	2011-02-01 22:08:26.149336832 -0600
-+++ network-manager-applet-0.8.2/m4/compiler_warnings.m4	2011-02-01 22:08:41.869140307 -0600
-@@ -10,7 +10,7 @@ if test "$GCC" = "yes" -a "$set_more_war
- 	for option in -Wshadow -Wmissing-declarations -Wmissing-prototypes \
- 		      -Wdeclaration-after-statement -Wstrict-prototypes \
- 		      -Wfloat-equal -Wno-unused-parameter -Wno-sign-compare \
-		      -fno-strict-aliasing; do
-+		      -fno-strict-aliasing -Wno-unused-but-set-variable; do
- 		SAVE_CFLAGS="$CFLAGS"
- 		CFLAGS="$CFLAGS $option"
- 		AC_MSG_CHECKING([whether gcc understands $option])
--- a/no-unused-but-set-warning.patch
+++ b/no-unused-but-set-warning.patch
@ -1,12 +0,0 @@
-diff -up NetworkManager-0.8.2/m4/compiler_warnings.m4.blah NetworkManager-0.8.2/m4/compiler_warnings.m4
--- NetworkManager-0.8.2/m4/compiler_warnings.m4.blah	2011-02-01 21:43:21.931142148 -0600
-+++ NetworkManager-0.8.2/m4/compiler_warnings.m4	2011-02-01 21:43:39.053928083 -0600
-@@ -10,7 +10,7 @@ if test "$GCC" = "yes" -a "$set_more_war
- 	for option in -Wshadow -Wmissing-declarations -Wmissing-prototypes \
- 		      -Wdeclaration-after-statement -Wstrict-prototypes \
- 		      -Wfloat-equal -Wno-unused-parameter -Wno-sign-compare \
-		      -fno-strict-aliasing; do
-+		      -fno-strict-aliasing -Wno-unused-but-set-variable; do
- 		SAVE_CFLAGS="$CFLAGS"
- 		CFLAGS="$CFLAGS $option"
- 		AC_MSG_CHECKING([whether gcc understands $option])
--- a/pkauth.patch
+++ b/pkauth.patch
@ -1,22 +0,0 @@
--- NetworkManager-0.8.1/src/system-settings/nm-sysconfig-settings.c	2010-06-30 14:55:33.000000000 -0400
-+++ NetworkManager-0.8.1.hacked/src/system-settings/nm-sysconfig-settings.c	2010-11-02 14:58:13.141180011 -0400
-@@ -1508,7 +1508,7 @@
- 
- 	priv->connections = g_hash_table_new_full (g_direct_hash, g_direct_equal, g_object_unref, NULL);
- 
-	priv->authority = polkit_authority_get ();
-+	priv->authority = polkit_authority_get_sync (NULL, NULL);
- 	if (priv->authority) {
- 		priv->auth_changed_id = g_signal_connect (priv->authority,
- 		                                          "changed",
--- NetworkManager-0.8.1/src/system-settings/nm-sysconfig-connection.c	2010-07-21 19:01:08.000000000 -0400
-+++ NetworkManager-0.8.1.hacked/src/system-settings/nm-sysconfig-connection.c	2010-11-02 14:58:35.397180077 -0400
-@@ -613,7 +613,7 @@
- {
- 	NMSysconfigConnectionPrivate *priv = NM_SYSCONFIG_CONNECTION_GET_PRIVATE (self);
- 
-	priv->authority = polkit_authority_get ();
-+	priv->authority = polkit_authority_get_sync (NULL, NULL);
- 	if (!priv->authority) {
- 		nm_log_err (LOGD_SYS_SET, "%s: error creating PolicyKit authority");
- 	}
--- a/2
+++ b/2
@ -1,2 +0,0 @@
-b31e441cdae725192cb98924d91c989e  NetworkManager-0.8.2.git20101117.tar.bz2
-021de95fc1e943346ceea28fbaddf45f  network-manager-applet-0.8.2.git20101117.tar.bz2