[notification-daemon] Remove setup capplet

[William Jon McCann <mccann src gnome org>]

commit 20f82d95590ba84a9f3ad539c941b6af46d6c722
Author: William Jon McCann <jmccann redhat com>
Date:   Wed Oct 6 21:52:54 2010 -0400

    Remove setup capplet

 configure.ac                                    |    8 -
 data/Makefile.am                                |   36 +--
 data/icons/16x16/notification-properties.png    |  Bin 514 -> 0 bytes
 data/icons/22x22/notification-properties.png    |  Bin 560 -> 0 bytes
 data/icons/24x24/notification-properties.png    |  Bin 554 -> 0 bytes
 data/icons/32x32/notification-properties.png    |  Bin 725 -> 0 bytes
 data/icons/48x48/notification-properties.png    |  Bin 938 -> 0 bytes
 data/icons/scalable/notification-properties.svg |  122 -----
 src/Makefile.am                                 |    2 +-
 src/capplet/Makefile.am                         |   26 -
 src/capplet/notification-properties.c           |  576 -----------------------
 src/capplet/notification-properties.desktop.in  |   11 -
 src/capplet/notification-properties.ui          |  261 ----------
 13 files changed, 2 insertions(+), 1040 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 84ef7d7..6d3ca77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,13 +106,6 @@ PKG_CHECK_MODULES(NOTIFICATION_DAEMON, $pkg_modules)
 AC_SUBST(NOTIFICATION_DAEMON_CFLAGS)
 AC_SUBST(NOTIFICATION_DAEMON_LIBS)
 
-dnl ---------------------------------------------------------------------------
-dnl Requirements for the setup tool
-dnl ---------------------------------------------------------------------------
-PKG_CHECK_MODULES(NOTIFICATION_CAPPLET, glib-2.0 >= $REQ_GLIB_VERSION gtk+-2.0 >= $REQ_GTK_VERSION gconf-2.0 libnotify dbus-1 dbus-glib-1)
-AC_SUBST(NOTIFICATION_CAPPLET_CFLAGS)
-AC_SUBST(NOTIFICATION_CAPPLET_LIBS)
-
 gdk_modules="
 	gdk-2.0 >= $REQ_GTK_VERSION, \
 	gdk-pixbuf-2.0 >= $REQ_GTK_VERSION \
@@ -234,7 +227,6 @@ data/org.freedesktop.Notifications.service
 po/Makefile.in
 src/Makefile
 src/daemon/Makefile
-src/capplet/Makefile
 src/themes/Makefile
 src/themes/slider/Makefile
 src/themes/standard/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index c39677a..896f983 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,18 +1,3 @@
-icon16dir = $(datadir)/icons/hicolor/16x16/apps
-icon22dir = $(datadir)/icons/hicolor/22x22/apps
-icon24dir = $(datadir)/icons/hicolor/24x24/apps
-icon32dir = $(datadir)/icons/hicolor/32x32/apps
-icon48dir = $(datadir)/icons/hicolor/48x48/apps
-iconscalabledir = $(datadir)/icons/hicolor/scalable/apps
-
-icon16_DATA = icons/16x16/notification-properties.png
-icon22_DATA = icons/22x22/notification-properties.png
-icon24_DATA = icons/24x24/notification-properties.png
-icon32_DATA = icons/32x32/notification-properties.png
-icon48_DATA = icons/48x48/notification-properties.png
-iconscalable_DATA = icons/scalable/notification-properties.svg
-
-
 servicedir   = $(DBUS_SERVICES_DIR)
 service_DATA = org.freedesktop.Notifications.service
 
@@ -31,28 +16,9 @@ endif
 
 EXTRA_DIST = \
 	$(schemas_in_files) \
-	$(service_DATA) \
-	$(icon16_DATA) \
-	$(icon22_DATA) \
-	$(icon24_DATA) \
-	$(icon32_DATA) \
-	$(icon48_DATA) \
-	$(iconscalable_DATA)
+	$(service_DATA)
 
 CLEANFILES = $(schemas_DATA)
 
 
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-install-data-hook: update-icon-cache
-uninstall-hook: update-icon-cache
-update-icon-cache:
-	@-if test -z "$(DESTDIR)"; then \
-		echo "Updating Gtk icon cache."; \
-		$(gtk_update_icon_cache); \
-	else \
-		echo "*** Icon cache not updated.  After (un)install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)"; \
-	fi
-
 -include $(top_srcdir)/git.mk
diff --git a/src/Makefile.am b/src/Makefile.am
index 98f554e..c9dff41 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = daemon themes capplet
+SUBDIRS = daemon themes
 
 -include $(top_srcdir)/git.mk