Remove outdated example.xfwm4rc

(Old svn revision: 11937)

5 files changed, 9 insertions, 77 deletions

diff --git a/Makefile.am b/Makefile.am
index 96834dc6b..ce549cba8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,11 @@
 @SET_MAKE@
 
-noinst_DATA = example.xfwm4rc
-
-EXTRA_DIST = example.xfwm4rc.in example.gtkrc-2.0 xfwm4.spec
+EXTRA_DIST = example.gtkrc-2.0 xfwm4.spec
 
 SUBDIRS = po doc icons src mcs-plugin defaults themes
 
 distclean-local:
-	rm -rf example.xfwm4rc xfwm4.spec *.cache
-
-example.xfwm4rc: Makefile example.xfwm4rc.in
-	@sed -e "s%_pkgdatadir_%$(pkgdatadir)%g" $(srcdir)/example.xfwm4rc.in > example.xfwm4rc
+	rm -rf xfwm4.spec *.cache
 
 rpm: dist
 	rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
diff --git a/Makefile.in b/Makefile.in
index 384d92e86..6d87739d4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,7 +13,6 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -60,7 +59,6 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	install-recursive installcheck-recursive installdirs-recursive \
 	pdf-recursive ps-recursive uninstall-info-recursive \
 	uninstall-recursive
-DATA = $(noinst_DATA)
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -223,8 +221,7 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-noinst_DATA = example.xfwm4rc
-EXTRA_DIST = example.xfwm4rc.in example.gtkrc-2.0 xfwm4.spec
+EXTRA_DIST = example.gtkrc-2.0 xfwm4.spec
 SUBDIRS = po doc icons src mcs-plugin defaults themes
 ACLOCAL_AMFLAGS = -I m4
 all: config.h
@@ -552,7 +549,7 @@ distcleancheck: distclean
 	       exit 1; } >&2
 check-am: all-am
 check: check-recursive
-all-am: Makefile $(DATA) config.h
+all-am: Makefile config.h
 installdirs: installdirs-recursive
 installdirs-am:
 install: install-recursive
@@ -648,10 +645,7 @@ uninstall-info: uninstall-info-recursive
 @SET_MAKE@
 
 distclean-local:
-	rm -rf example.xfwm4rc xfwm4.spec *.cache
-
-example.xfwm4rc: Makefile example.xfwm4rc.in
-	@sed -e "s%_pkgdatadir_%$(pkgdatadir)%g" $(srcdir)/example.xfwm4rc.in > example.xfwm4rc
+	rm -rf xfwm4.spec *.cache
 
 rpm: dist
 	rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
diff --git a/TODO b/TODO
index a7a3e35be..f032ab359 100644
--- a/TODO
+++ b/TODO
@@ -3,5 +3,6 @@ Things to do
 
 Add your favorite wish list here :
 
-* Multiscreen mode (not Xinerama)
-* Use daemon(3) if available to daemonize the process
+* Multiscreen mode (not Xinerama)                        *done*
+* Use daemon(3) if available to daemonize the process    *done*
+* Add compositor for newer X.org
diff --git a/example.xfwm4rc.in b/example.xfwm4rc.in
deleted file mode 100644
index 04cb79e50..000000000
--- a/example.xfwm4rc.in
+++ /dev/null
@@ -1,58 +0,0 @@
-# This is an example configuration file
-#
-# You can use it as a template for your own configuration file
-
-# theme=name or theme=/full/path/to/themedir
-theme=bbs
-
-# keytheme=name or theme=/full/path/to/keythemedir
-keytheme=default.keys
-
-# title_alignment=left/right/center
-title_alignment=left
-
-# button_layout :
-#    O = Option menu
-#    T = Stick
-#    H = hide
-#    S = shade
-#    M = maximize 
-#    C = close
-#    | = title
-button_layout=OTS|HMC
-
-# double_click_action=shade/hide/maximize/none
-double_click_action=maximize
-
-# box_move=true/false
-box_move=false
-
-# box_resize=true/false
-box_resize=false
-
-# click_to_focus=true/false
-click_to_focus=true
-
-# focus_new=true/false
-focus_new=true
-
-# focus_hint=true/false
-focus_hint=false
-
-# raise_on_focus=true/false
-raise_on_focus=false
-
-# raise_delay=number (milliseconds)
-raise_delay=250
-
-# snap_to_border=true/false
-snap_to_border=true
-
-# snap_width=number
-snap_width=10
-
-# workspace_count=number
-workspace_count=4
-
-# wrap_workspaces=true/false
-wrap_workspaces=true
diff --git a/xfwm4.spec.in b/xfwm4.spec.in
index ef1a6c1d8..1208841b3 100644
--- a/xfwm4.spec.in
+++ b/xfwm4.spec.in
@@ -33,7 +33,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc example.xfwm4rc example.gtkrc-2.0 README INSTALL TODO COPYING AUTHORS
+%doc example.gtkrc-2.0 README INSTALL TODO COPYING AUTHORS
 %{_bindir}
 %{_libdir}/xfce4
 %{_datadir}/applications