Sync patches with upstream

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2796 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta-extras/packages/networkmanager/files/applet-no-gnome.diff b/meta-extras/packages/networkmanager/files/applet-no-gnome.diff
index 761c3ab7a76096efa6f5a83253f8962bdfe2c5eb..b8f949aa74e02d16243dba96d9efcc34f06a2989 100644 (file)
--- a/meta-extras/packages/networkmanager/files/applet-no-gnome.diff
+++ b/meta-extras/packages/networkmanager/files/applet-no-gnome.diff
@@ -52,15 +52,3 @@ Index: configure.ac
  
  ##### Find out the version of DBUS we're using
  dbus_version=`pkg-config --modversion dbus-1`
-@@ -124,11 +123,6 @@
-       fi
- fi
- 
--PKG_CHECK_EXISTS([libgnome-2.0 >= 2.14.0],[have_libgnome_2_14=yes],[have_libgnome_2_14=no])
--if test "$have_libgnome_2_14" = "yes"; then
--      AC_DEFINE([HAVE_LIBGNOME_2_14],[1],[Define if we have libgnome 2.14])
--fi
--
- AM_CONDITIONAL(WITH_NOTIFY, test x"$enable_notify" != xno) # can't do it from inside 'if'
- AM_CONDITIONAL([HAVE_GTK_2_10],[test "$have_gtk_2_10" = "yes"])
-