From c5e472d42ff726ade6fbdec7b6d790ed3a236732 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 2 Feb 2007 21:28:03 +0000 Subject: [PATCH] 2007-02-02 Dan Williams * configure.in gnome/Makefile.am nm-applet.desktop Makefile.am - Remove last bits referencing gnome applet git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2268 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 8 ++++++++ Makefile.am | 10 ---------- configure.in | 32 -------------------------------- gnome/Makefile.am | 2 +- nm-applet.desktop | 14 -------------- 5 files changed, 9 insertions(+), 57 deletions(-) delete mode 100644 nm-applet.desktop diff --git a/ChangeLog b/ChangeLog index 670ebeb9ce..f4b609add9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-02-02 Dan Williams + + * configure.in + gnome/Makefile.am + nm-applet.desktop + Makefile.am + - Remove last bits referencing gnome applet + 2007-02-02 Dan Williams * src/vpn-manager/nm-vpn-service.c diff --git a/Makefile.am b/Makefile.am index 3e0401773f..420b2ba3c1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,17 +17,7 @@ EXTRA_DIST = \ intltool-merge.in \ intltool-update.in -if WITH_GNOME -EXTRA_DIST += \ - nm-applet.desktop -endif - DISTCLEANFILES = intltool-extract intltool-merge intltool-update pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = NetworkManager.pc - -if WITH_GNOME -autostartdir = $(datadir)/gnome/autostart -autostart_DATA = nm-applet.desktop -endif diff --git a/configure.in b/configure.in index 27d478a3b6..5b8678fc24 100644 --- a/configure.in +++ b/configure.in @@ -170,17 +170,11 @@ PKG_CHECK_MODULES(HAL, hal >= 0.5.0) AC_SUBST(HAL_CFLAGS) AC_SUBST(HAL_LIBS) -AC_ARG_WITH(notify, AC_HELP_STRING([--with-notify], [Use libnotify]), enable_notify=$withval, enable_notify=auto) - if test x"$with_gnome" != xno; then PKG_CHECK_MODULES(GTK, gtk+-2.0) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) - PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0) - AC_SUBST(GDK_PIXBUF_CFLAGS) - AC_SUBST(GDK_PIXBUF_LIBS) - PKG_CHECK_MODULES(GLADE, libglade-2.0) AC_SUBST(GLADE_CFLAGS) AC_SUBST(GLADE_LIBS) @@ -193,27 +187,6 @@ if test x"$with_gnome" != xno; then AC_SUBST(GNOME_KEYRING_CFLAGS) AC_SUBST(GNOME_KEYRING_LIBS) - LIBNOTIFY_REQUIRED=0.3.0 - - # Building with GTK+ >= 2.10 will use the GtkStatusIcon applet - # implementation. Earlier versions of GTK+ will use the EggTrayIcon - # applet implementation. - - PKG_CHECK_EXISTS([gtk+-2.0 >= 2.10],[have_gtk_2_10=yes LIBNOTIFY_REQUIRED=0.4.3],[have_gtk_2_10=no]) - if test x"$have_gtk_2_10" != xno; then - AC_DEFINE_UNQUOTED([HAVE_STATUS_ICON], [1], - [Use GtkStatusIcon for the applet's icon rather than an EggTrayIcon]) - fi - - if test x"$enable_notify" != xno; then - PKG_CHECK_MODULES([NOTIFY], [libnotify >= $LIBNOTIFY_REQUIRED], [enable_notify=yes], - [enable_notify=no]) - if test "x$enable_notify" != "xno"; then - AC_DEFINE_UNQUOTED([ENABLE_NOTIFY], [1], - [Enable notifications with libnotify]) - fi - fi - PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0) AC_SUBST(LIBGNOMEUI_CFLAGS) AC_SUBST(LIBGNOMEUI_LIBS) @@ -224,9 +197,6 @@ if test x"$with_gnome" != xno; then fi 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"]) - PKG_CHECK_MODULES(LIBNL, libnl-1) AC_SUBST(LIBNL_CFLAGS) AC_SUBST(LIBNL_LIBS) @@ -385,8 +355,6 @@ libnm-util/libnm-util.pc libnm-util/Makefile dispatcher-daemon/Makefile gnome/Makefile -gnome/applet/Makefile -gnome/applet/icons/Makefile gnome/libnm_glib/libnm_glib.pc gnome/libnm_glib/Makefile gnome/vpn-properties/Makefile diff --git a/gnome/Makefile.am b/gnome/Makefile.am index 1f6ce0833d..d7d5c54e18 100644 --- a/gnome/Makefile.am +++ b/gnome/Makefile.am @@ -1,5 +1,5 @@ if WITH_GNOME -SUBDIRS = applet libnm_glib vpn-properties +SUBDIRS = libnm_glib vpn-properties else SUBDIRS = libnm_glib endif diff --git a/nm-applet.desktop b/nm-applet.desktop deleted file mode 100644 index d1fbfae194..0000000000 --- a/nm-applet.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Network Manager -Comment=Network Manager applet -Icon=nm-device-wireless -Exec=nm-applet --sm-disable -Terminal=false -Type=Application -Categories= -OnlyShowIn=GNOME; -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=NetworkManager -X-GNOME-Bugzilla-Component=general -X-GNOME-Autostart-enabled=true