[Xfce4-commits] <xfdesktop:master> Add new background and remove old ones.

[Nick Schermer]

Updating branch refs/heads/master
         to 29321d7b3ffd94514b3a83192f6679e6f2f05e19 (commit)
       from 6caa4cc93893b16d7b2bf6f951038350074e85ee (commit)

commit 29321d7b3ffd94514b3a83192f6679e6f2f05e19
Author: Nick Schermer <nick at xfce.org>
Date:   Thu Apr 12 18:33:09 2012 +0200

    Add new background and remove old ones.
    
    Also move the background to the more common location
    $datadir/backgrounds/xfce/.

 Makefile.am                      |    2 +-
 backdrops/Makefile.am            |   16 ----------------
 backdrops/xfce-in-a-grid.png     |  Bin 21797 -> 0 bytes
 backdrops/xfce-in-the-moon.png   |  Bin 206593 -> 0 bytes
 backdrops/xfce-smoke.png         |  Bin 130670 -> 0 bytes
 backdrops/xfce-stellar-tile.png  |  Bin 365 -> 0 bytes
 backdrops/xfce-stripes.png       |  Bin 120652 -> 0 bytes
 backdrops/xfce-turbulence.png    |  Bin 359913 -> 0 bytes
 backdrops/xfce4gradientcurve.png |  Bin 89171 -> 0 bytes
 backdrops/xfce4logo.png          |  Bin 46408 -> 0 bytes
 backgrounds/Makefile.am          |    8 ++++++++
 backgrounds/xfce-blue.jpg        |  Bin 0 -> 152462 bytes
 common/xfdesktop-common.h        |    2 +-
 configure.ac.in                  |    2 +-
 14 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index c03ae9c..9731cfa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 @SET_MAKE@
 
 SUBDIRS = \
-	backdrops \
+	backgrounds \
 	common \
 	doc \
 	po \
diff --git a/backdrops/Makefile.am b/backdrops/Makefile.am
deleted file mode 100644
index 879d8e6..0000000
--- a/backdrops/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-# backdrops/Makefile.am
-#
-
-backdropsdir = $(datadir)/xfce4/backdrops
-
-backdrops_DATA =							\
-	xfce4gradientcurve.png						\
-	xfce4logo.png							\
-	xfce-in-a-grid.png						\
-	xfce-in-the-moon.png						\
-	xfce-stripes.png						\
-	xfce-smoke.png							\
-	xfce-turbulence.png						\
-	xfce-stellar-tile.png
-        
-EXTRA_DIST = $(backdrops_DATA)
diff --git a/backdrops/xfce-in-a-grid.png b/backdrops/xfce-in-a-grid.png
deleted file mode 100644
index 9a0e015..0000000
Binary files a/backdrops/xfce-in-a-grid.png and /dev/null differ
diff --git a/backdrops/xfce-in-the-moon.png b/backdrops/xfce-in-the-moon.png
deleted file mode 100644
index afa67be..0000000
Binary files a/backdrops/xfce-in-the-moon.png and /dev/null differ
diff --git a/backdrops/xfce-smoke.png b/backdrops/xfce-smoke.png
deleted file mode 100644
index 2463fbb..0000000
Binary files a/backdrops/xfce-smoke.png and /dev/null differ
diff --git a/backdrops/xfce-stellar-tile.png b/backdrops/xfce-stellar-tile.png
deleted file mode 100644
index 3ba6b46..0000000
Binary files a/backdrops/xfce-stellar-tile.png and /dev/null differ
diff --git a/backdrops/xfce-stripes.png b/backdrops/xfce-stripes.png
deleted file mode 100644
index 587fb55..0000000
Binary files a/backdrops/xfce-stripes.png and /dev/null differ
diff --git a/backdrops/xfce-turbulence.png b/backdrops/xfce-turbulence.png
deleted file mode 100644
index fec4e94..0000000
Binary files a/backdrops/xfce-turbulence.png and /dev/null differ
diff --git a/backdrops/xfce4gradientcurve.png b/backdrops/xfce4gradientcurve.png
deleted file mode 100644
index 5cc5762..0000000
Binary files a/backdrops/xfce4gradientcurve.png and /dev/null differ
diff --git a/backdrops/xfce4logo.png b/backdrops/xfce4logo.png
deleted file mode 100644
index 606013c..0000000
Binary files a/backdrops/xfce4logo.png and /dev/null differ
diff --git a/backgrounds/Makefile.am b/backgrounds/Makefile.am
new file mode 100644
index 0000000..dfaf0ca
--- /dev/null
+++ b/backgrounds/Makefile.am
@@ -0,0 +1,8 @@
+# backdrops/Makefile.am
+#
+
+backgroundsdir = $(datadir)/backgrounds/xfce
+
+backgrounds_DATA = xfce-blue.jpg
+
+EXTRA_DIST = $(backdrops_DATA)
diff --git a/backgrounds/xfce-blue.jpg b/backgrounds/xfce-blue.jpg
new file mode 100644
index 0000000..fd962e7
Binary files /dev/null and b/backgrounds/xfce-blue.jpg differ
diff --git a/common/xfdesktop-common.h b/common/xfdesktop-common.h
index 151487e..df767f0 100644
--- a/common/xfdesktop-common.h
+++ b/common/xfdesktop-common.h
@@ -32,7 +32,7 @@
 #include <X11/Xlib.h>
 
 #define XFDESKTOP_CHANNEL        "xfce4-desktop"
-#define DEFAULT_BACKDROP         DATADIR "/xfce4/backdrops/xfce-stripes.png"
+#define DEFAULT_BACKDROP         DATADIR "/backgrounds/xfce/xfce-blue.jpg"
 #define DEFAULT_BACKDROP_LIST    "xfce4/desktop/backdrop.list"
 #define DEFAULT_ICON_FONT_SIZE   12
 #define DEFAULT_ICON_SIZE        32
diff --git a/configure.ac.in b/configure.ac.in
index f9300fe..0ddd399 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -195,7 +195,7 @@ XDT_FEATURE_DEBUG
 
 AC_OUTPUT([
 Makefile
-backdrops/Makefile
+backgrounds/Makefile
 common/Makefile
 doc/Makefile
 pixmaps/Makefile