Get rid of small cursor, we don't use them. Integrate Eben standard cursor. Rename the theme to olpc. Add cursor name/size to the matchbox theme.

26 files changed, 34 insertions, 48 deletions

diff --git a/.gitignore b/.gitignore
index 197a8fc..aa97c84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,9 +24,8 @@ mkinstalldirs
 Makefile.in.in
 po/POTFILES
 po/stamp-it
-art/cursor/Bluecurve/Bluecurve
 art/cursor/cursorthemegen/cursorthemegen
-art/cursor/Bluecurve/theme
+art/cursor/olpc/theme
 art/icon-theme/index.theme
 .deps
 .libs
diff --git a/art/cursor/Bluecurve/Bluecurve-24-1.png b/art/cursor/Bluecurve/Bluecurve-24-1.png
deleted file mode 100644
index b5e4303..0000000
--- a/art/cursor/Bluecurve/Bluecurve-24-1.png
+++ /dev/null
diff --git a/art/cursor/Bluecurve/Bluecurve-24-10.png b/art/cursor/Bluecurve/Bluecurve-24-10.png
deleted file mode 100644
index ce3012e..0000000
--- a/art/cursor/Bluecurve/Bluecurve-24-10.png
+++ /dev/null
diff --git a/art/cursor/Bluecurve/Bluecurve-24-11.png b/art/cursor/Bluecurve/Bluecurve-24-11.png
deleted file mode 100644
index 423dcc3..0000000
--- a/art/cursor/Bluecurve/Bluecurve-24-11.png
+++ /dev/null
diff --git a/art/cursor/Bluecurve/Bluecurve-24-12.png b/art/cursor/Bluecurve/Bluecurve-24-12.png
deleted file mode 100644
index 0bf4d57..0000000
--- a/art/cursor/Bluecurve/Bluecurve-24-12.png
+++ /dev/null
diff --git a/art/cursor/Bluecurve/Bluecurve-24-2.png b/art/cursor/Bluecurve/Bluecurve-24-2.png
deleted file mode 100644
index 5321bb1..0000000
--- a/art/cursor/Bluecurve/Bluecurve-24-2.png
+++ /dev/null
diff --git a/art/cursor/Bluecurve/Bluecurve-24-3.png b/art/cursor/Bluecurve/Bluecurve-24-3.png
deleted file mode 100644
index 1f31fd3..0000000
--- a/art/cursor/Bluecurve/Bluecurve-24-3.png
+++ /dev/null
diff --git a/art/cursor/Bluecurve/Bluecurve-24-4.png b/art/cursor/Bluecurve/Bluecurve-24-4.png
deleted file mode 100644
index 1e1c7d0..0000000
--- a/art/cursor/Bluecurve/Bluecurve-24-4.png
+++ /dev/null
diff --git a/art/cursor/Bluecurve/Bluecurve-24-5.png b/art/cursor/Bluecurve/Bluecurve-24-5.png
deleted file mode 100644
index 6201a75..0000000
--- a/art/cursor/Bluecurve/Bluecurve-24-5.png
+++ /dev/null
diff --git a/art/cursor/Bluecurve/Bluecurve-24-6.png b/art/cursor/Bluecurve/Bluecurve-24-6.png
deleted file mode 100644
index 4e2350b..0000000
--- a/art/cursor/Bluecurve/Bluecurve-24-6.png
+++ /dev/null
diff --git a/art/cursor/Bluecurve/Bluecurve-24-7.png b/art/cursor/Bluecurve/Bluecurve-24-7.png
deleted file mode 100644
index e6d48c7..0000000
--- a/art/cursor/Bluecurve/Bluecurve-24-7.png
+++ /dev/null
diff --git a/art/cursor/Bluecurve/Bluecurve-24-8.png b/art/cursor/Bluecurve/Bluecurve-24-8.png
deleted file mode 100644
index 30fe07f..0000000
--- a/art/cursor/Bluecurve/Bluecurve-24-8.png
+++ /dev/null
diff --git a/art/cursor/Bluecurve/Bluecurve-24-9.png b/art/cursor/Bluecurve/Bluecurve-24-9.png
deleted file mode 100644
index 5bf0a41..0000000
--- a/art/cursor/Bluecurve/Bluecurve-24-9.png
+++ /dev/null
diff --git a/art/cursor/Bluecurve/Bluecurve-24-hotspot.png b/art/cursor/Bluecurve/Bluecurve-24-hotspot.png
deleted file mode 100644
index f51c5d8..0000000
--- a/art/cursor/Bluecurve/Bluecurve-24-hotspot.png
+++ /dev/null
diff --git a/art/cursor/Bluecurve/Bluecurve-36-1.png b/art/cursor/Bluecurve/Bluecurve-36-1.png
deleted file mode 100644
index 1649cad..0000000
--- a/art/cursor/Bluecurve/Bluecurve-36-1.png
+++ /dev/null
diff --git a/art/cursor/Bluecurve/Bluecurve-36-hotspot.png b/art/cursor/Bluecurve/Bluecurve-36-hotspot.png
deleted file mode 100644
index 6ccd76b..0000000
--- a/art/cursor/Bluecurve/Bluecurve-36-hotspot.png
+++ /dev/null
diff --git a/art/cursor/Bluecurve/Bluecurve-48-1.png b/art/cursor/Bluecurve/Bluecurve-48-1.png
deleted file mode 100644
index 6f5305a..0000000
--- a/art/cursor/Bluecurve/Bluecurve-48-1.png
+++ /dev/null
diff --git a/art/cursor/Bluecurve/Makefile.am b/art/cursor/Bluecurve/Makefile.am
deleted file mode 100644
index 3f9dff3..0000000
--- a/art/cursor/Bluecurve/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-THEMEGEN = $(top_builddir)/art/cursor/cursorthemegen/cursorthemegen
-THEME_DIR = $(top_builddir)/art/cursor/Bluecurve/theme
-
-all-local: Bluecurve.stamp
-
-bluecurve_images =				\
-	Bluecurve-24-hotspot.png		\
-	Bluecurve-24-1.png			\
-	Bluecurve-24-2.png			\
-	Bluecurve-24-3.png			\
-	Bluecurve-24-4.png			\
-	Bluecurve-24-5.png			\
-	Bluecurve-24-6.png			\
-	Bluecurve-24-7.png			\
-	Bluecurve-24-8.png			\
-	Bluecurve-24-9.png			\
-	Bluecurve-24-10.png			\
-	Bluecurve-24-11.png			\
-	Bluecurve-24-12.png			\
-	Bluecurve-36-hotspot.png		\
-	Bluecurve-36-1.png			\
-	Bluecurve-48-hotspot.png		\
-	Bluecurve-48-1.png
-
-Bluecurve.stamp: $(bluecurve_images) $(THEMEGEN) Bluecurve.cursortheme
-	rm -rf Bluecurve &&                                     	\
-	BDIR=`pwd` && cd $(srcdir) &&                           	\
-	$$BDIR/$(THEMEGEN) Bluecurve.cursortheme $$BDIR/theme &&    	\
-	cd $$BDIR && touch Bluecurve.stamp
-
-clean-local:
-	rm -rf $(THEME_DIR)
-	rm -rf $(top_builddir)/art/cursor/Bluecurve/Bluecurve.stamp
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(datadir)/icons/Bluecurve/cursors/
-	for i in `cd $(THEME_DIR) && echo *` ; do						\
-	  $(INSTALL) $(THEME_DIR)/$$i $(DESTDIR)$(datadir)/icons/Bluecurve/cursors/$$i ;	\
-	done
-
-uninstall-local:
-	rm -rf $(DESTDIR)$(datadir)/icons/Bluecurve/cursors
-
-EXTRA_DIST=$(bluecurve_images) Bluecurve.cursortheme
diff --git a/art/cursor/Makefile.am b/art/cursor/Makefile.am
index f35a497..5c25cf3 100644
--- a/art/cursor/Makefile.am
+++ b/art/cursor/Makefile.am
@@ -1 +1 @@
-SUBDIRS = cursorthemegen Bluecurve
+SUBDIRS = cursorthemegen olpc
diff --git a/art/cursor/olpc/Bluecurve-48-1.png b/art/cursor/olpc/Bluecurve-48-1.png
new file mode 100644
index 0000000..abf8ac6
--- /dev/null
+++ b/art/cursor/olpc/Bluecurve-48-1.png
diff --git a/art/cursor/Bluecurve/Bluecurve-48-hotspot.png b/art/cursor/olpc/Bluecurve-48-hotspot.png
index 4852623..4852623 100644
--- a/art/cursor/Bluecurve/Bluecurve-48-hotspot.png
+++ b/art/cursor/olpc/Bluecurve-48-hotspot.png
diff --git a/art/cursor/Bluecurve/Bluecurve.cursortheme b/art/cursor/olpc/Bluecurve.cursortheme
index 1550a5d..1550a5d 100644
--- a/art/cursor/Bluecurve/Bluecurve.cursortheme
+++ b/art/cursor/olpc/Bluecurve.cursortheme
diff --git a/art/cursor/Bluecurve/ChangeLog b/art/cursor/olpc/ChangeLog
index ac10780..ac10780 100644
--- a/art/cursor/Bluecurve/ChangeLog
+++ b/art/cursor/olpc/ChangeLog
diff --git a/art/cursor/olpc/Makefile.am b/art/cursor/olpc/Makefile.am
new file mode 100644
index 0000000..6ef95f3
--- /dev/null
+++ b/art/cursor/olpc/Makefile.am
@@ -0,0 +1,29 @@
+THEMEGEN = $(top_builddir)/art/cursor/cursorthemegen/cursorthemegen
+THEME_DIR = $(top_builddir)/art/cursor/olpc/theme
+
+all-local: Bluecurve.stamp
+
+bluecurve_images =				\
+	Bluecurve-48-hotspot.png		\
+	Bluecurve-48-1.png
+
+Bluecurve.stamp: $(bluecurve_images) $(THEMEGEN) Bluecurve.cursortheme
+	rm -rf olpc &&     	                                	\
+	BDIR=`pwd` && cd $(srcdir) &&                           	\
+	$$BDIR/$(THEMEGEN) Bluecurve.cursortheme $$BDIR/theme &&    	\
+	cd $$BDIR && touch Bluecurve.stamp
+
+clean-local:
+	rm -rf $(THEME_DIR)
+	rm -rf $(top_builddir)/art/cursor/olpc/Bluecurve.stamp
+
+install-data-local:
+	$(mkinstalldirs) $(DESTDIR)$(datadir)/icons/olpc/cursors/
+	for i in `cd $(THEME_DIR) && echo *` ; do					\
+	  $(INSTALL) $(THEME_DIR)/$$i $(DESTDIR)$(datadir)/icons/olpc/cursors/$$i ;	\
+	done
+
+uninstall-local:
+	rm -rf $(DESTDIR)$(datadir)/icons/olpc/cursors
+
+EXTRA_DIST=$(bluecurve_images) Bluecurve.cursortheme
diff --git a/configure.in b/configure.in
index 964e341..5774789 100644
--- a/configure.in
+++ b/configure.in
@@ -45,7 +45,7 @@ Makefile
 art/Makefile
 art/cursor/Makefile
 art/cursor/cursorthemegen/Makefile
-art/cursor/Bluecurve/Makefile
+art/cursor/olpc/Makefile
 art/icon-theme/Makefile
 art/icon-theme/16x16/Makefile
 art/icon-theme/16x16/stock/Makefile
diff --git a/matchbox/theme.xml b/matchbox/theme.xml
index 2a570f3..a0ce047 100644
--- a/matchbox/theme.xml
+++ b/matchbox/theme.xml
@@ -149,4 +149,6 @@
 
 <shadow style="none"/>
 
+<cursor theme="olpc" size="48" />
+
 </theme>