[mousetweaks] Remove gnome-panel applets

[Gerd Kohlberger <gerdk src gnome org>]

commit 1817783d6d782bc356402173b5fd9b4391ea33c8
Author: Gerd Kohlberger <gerdk src gnome org>
Date:   Sun Feb 19 04:17:57 2012 +0100

    Remove gnome-panel applets

 Makefile.am                                        |    4 +-
 configure.ac                                       |   32 -
 data/Makefile.am                                   |   47 +--
 data/dwell-click-applet.ui                         |  343 ----------
 ...ome.applets.DwellClickApplet.panel-applet.in.in |   16 -
 ...applets.PointerCaptureApplet.panel-applet.in.in |   16 -
 ...panel.applet.DwellClickAppletFactory.service.in |    3 -
 ...l.applet.PointerCaptureAppletFactory.service.in |    3 -
 data/org.gnome.pointer-capture.gschema.xml.in      |   26 -
 data/pointer-capture-applet.ui                     |  380 -----------
 man/Makefile.am                                    |   13 +-
 man/dwell-click-applet.1                           |   24 -
 man/pointer-capture-applet.1                       |   22 -
 src/Makefile.am                                    |   35 +-
 src/dwell-click-applet.c                           |  698 --------------------
 src/pointer-capture-applet.c                       |  517 ---------------
 16 files changed, 5 insertions(+), 2174 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 9286bc1..a1ffe53 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,9 +2,7 @@ SUBDIRS = src data pixmaps po help man
 
 DISTCHECK_CONFIGURE_FLAGS =         \
     --disable-schemas-compile       \
-    --disable-scrollkeeper          \
-    --enable-dwell-click            \
-    --enable-pointer-capture
+    --disable-scrollkeeper
 
 EXTRA_DIST =                        \
     $(srcdir)/m4                    \
diff --git a/configure.ac b/configure.ac
index 3475022..d992300 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,32 +58,6 @@ PKG_CHECK_MODULES(DEPENDENCIES,
     xfixes
     xtst)
 
-dnl *** arguments ***
-
-AC_ARG_ENABLE(pointer-capture,
-  [  --enable-pointer-capture     Enable pointer-capture applet],
-  [build_pca=$enableval], [build_pca=no])
-
-AM_CONDITIONAL(BUILD_PCA, test "x$build_pca" = "xyes")
-if test "$build_pca" = yes; then
-  AC_DEFINE(BUILD_PCA, 1, [Build pointer-capture applet])
-fi
-
-AC_ARG_ENABLE(dwell-click,
-  [  --enable-dwell-click         Enable dwell-click applet],
-  [build_dca=$enableval], [build_dca=no])
-
-AM_CONDITIONAL(BUILD_DCA, test "x$build_dca" = "xyes")
-if test "$build_dca" = yes; then
-  AC_DEFINE(BUILD_DCA, 1, [Build dwell-click applet])
-fi
-
-dnl *** libpanelapplet (OPTIONAL) ***
-
-if test "$build_dca" = yes -o "$build_pca" = yes; then
-	PKG_CHECK_MODULES(PANELAPPLET, libpanelapplet-3.0)
-fi
-
 dnl *** GLib tools ***
 
 GLIB_MKENUMS="$($PKG_CONFIG --variable=glib_mkenums glib-2.0)"
@@ -103,9 +77,3 @@ AC_CONFIG_FILES([
 
 AC_OUTPUT
 
-AC_MSG_RESULT([
-Building panel applets:
------------------------
-  pointer-capture: $build_pca
-  dwell-click:     $build_dca
-])
diff --git a/data/Makefile.am b/data/Makefile.am
index df4ebd9..ab5fd14 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,43 +1,5 @@
-if BUILD_PCA
-pca_schema  = org.gnome.pointer-capture.gschema.xml.in
-pca_ui      = pointer-capture-applet.ui
-pca_service = org.gnome.panel.applet.PointerCaptureAppletFactory.service.in
-pca_applet  = org.gnome.applets.PointerCaptureApplet.panel-applet.in
-
-org.gnome.panel.applet.PointerCaptureAppletFactory.service: $(pca_service)
-	$(AM_V_GEN) sed -e "s|\ BINDIR\@|$(bindir)|" $< > $@
-
-$(pca_applet): $(pca_applet).in Makefile
-	$(AM_V_GEN) sed -e "s|\ BINDIR\@|$(bindir)|" -e "s|\ VERSION\@|$(VERSION)|" $< > $@
-endif
-
-if BUILD_DCA
-dca_ui      = dwell-click-applet.ui
-dca_service = org.gnome.panel.applet.DwellClickAppletFactory.service.in
-dca_applet  = org.gnome.applets.DwellClickApplet.panel-applet.in
-
-org.gnome.panel.applet.DwellClickAppletFactory.service: $(dca_service)
-	$(AM_V_GEN) sed -e "s|\ BINDIR\@|$(bindir)|" $< > $@
-
-$(dca_applet): $(dca_applet).in Makefile
-	$(AM_V_GEN) sed -e "s|\ BINDIR\@|$(bindir)|" -e "s|\ VERSION\@|$(VERSION)|" $< > $@
-endif
-
-appletdir = $(datadir)/gnome-panel/applets
-applet_in_in_files = $(applet_in_files:.panel-applet.in=.panel-applet.in.in)
-applet_in_files = $(pca_applet) $(dca_applet)
-applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
-
-%.panel-applet: %.panel-applet.in \
-	$(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po);
-	LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-servicedir = $(datadir)/dbus-1/services
-service_in_files = $(pca_service) $(dca_service)
-service_DATA = $(service_in_files:.service.in=.service)
-
 uidir = $(datadir)/mousetweaks
-ui_DATA = mousetweaks.ui $(pca_ui) $(dca_ui)
+ui_DATA = mousetweaks.ui
 
 convertdir = $(datadir)/GConf/gsettings
 convert_DATA = mousetweaks.convert
@@ -45,23 +7,18 @@ convert_DATA = mousetweaks.convert
 gsettings_ENUM_NAMESPACE = org.gnome.mousetweaks
 gsettings_ENUM_FILES = $(top_srcdir)/src/mt-common.h
 
-gsettings_in_files = org.gnome.mousetweaks.gschema.xml.in $(pca_schema)
+gsettings_in_files = org.gnome.mousetweaks.gschema.xml.in
 gsettings_SCHEMAS = $(gsettings_in_files:.xml.in=.xml)
 @INTLTOOL_XML_NOMERGE_RULE@
 @GSETTINGS_RULES@
 
 EXTRA_DIST =                \
-    $(service_in_files)     \
-    $(applet_in_in_files)   \
     $(ui_DATA)              \
     $(gsettings_in_files)   \
     $(gsettings_ENUM_FILES) \
     $(convert_DATA)
 
 DISTCLEANFILES =            \
-    $(service_DATA)         \
-    $(applet_in_files)      \
-    $(applet_DATA)          \
     $(gsettings_SCHEMAS)
 
 -include $(top_srcdir)/git.mk
diff --git a/man/Makefile.am b/man/Makefile.am
index 1356c94..a6c353d 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,15 +1,4 @@
-if BUILD_PCA
-pca_man = pointer-capture-applet.1
-endif
-
-if BUILD_DCA
-dca_man = dwell-click-applet.1
-endif
-
-man_MANS =          \
-    mousetweaks.1   \
-    $(pca_man)      \
-    $(dca_man)
+man_MANS = mousetweaks.1
 
 EXTRA_DIST = $(man_MANS)
 
diff --git a/src/Makefile.am b/src/Makefile.am
index a95f60a..5e17341 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,15 +3,7 @@ AM_CPPFLAGS =                               \
     -DDATADIR=\"$(datadir)/mousetweaks\"    \
     -DGNOMELOCALEDIR=\"$(datadir)/locale\"
 
-if BUILD_PCA
-pca_bin = pointer-capture-applet
-endif
-
-if BUILD_DCA 
-dca_bin = dwell-click-applet
-endif
-
-bin_PROGRAMS = mousetweaks $(pca_bin) $(dca_bin)
+bin_PROGRAMS = mousetweaks
 
 mousetweaks_SOURCES =       \
     $(BUILT_SOURCES)        \
@@ -44,31 +36,6 @@ mousetweaks_CFLAGS =        \
 mousetweaks_LDADD =         \
     $(DEPENDENCIES_LIBS)
 
-dwell_click_applet_SOURCES =    \
-    $(BUILT_SOURCES)            \
-    dwell-click-applet.c        \
-    mt-common.c                 \
-    mt-common.h
-
-dwell_click_applet_CFLAGS =     \
-    $(AM_CPPFLAGS)              \
-    $(PANELAPPLET_CFLAGS)
-
-dwell_click_applet_LDADD =      \
-    $(PANELAPPLET_LIBS)
-
-pointer_capture_applet_SOURCES =    \
-    pointer-capture-applet.c        \
-    mt-common.c                     \
-    mt-common.h
-
-pointer_capture_applet_CFLAGS =     \
-    $(AM_CPPFLAGS)                  \
-    $(PANELAPPLET_CFLAGS)
-
-pointer_capture_applet_LDADD =      \
-    $(PANELAPPLET_LIBS)
-
 BUILT_SOURCES =                     \
     mt-enum-types.c                 \
     mt-enum-types.h