From: Vlad <vlad@gas.by>
Date: Tue, 7 Sep 2010 09:28:02 +0000 (+0300)
Subject: fixed problem with orrery
X-Git-Url: https://vcs.maemo.org/git/?p=livewp;a=commitdiff_plain;h=965a1e21d4d4976ed19aba6bd8a07cc940768efb

fixed problem with orrery
---

diff --git a/applet/data/Makefile.am b/applet/data/Makefile.am
index 405bf62..f1ac73c 100644
--- a/applet/data/Makefile.am
+++ b/applet/data/Makefile.am
@@ -53,7 +53,7 @@ conkythemedir = $(datadir)/livewp/theme/Conky
 conkytheme_DATA = theme/Conky/* 
 
 externalthemedir = $(datadir)/livewp/external_themes
-externaltheme_DATA = external_themes/* 
+externaltheme_DATA = external_themes/*.xml 
 
 dbus_servicedir = $(datadir)/dbus-1/services
 dbus_service_DATA = org.maemo.livewp.service
@@ -89,7 +89,6 @@ EXTRA_DIST = $(berlintheme_DATA) \
 	     $(acceltheme_DATA) \
 	     $(fifteentheme_DATA) \
 	     $(crazytheme_DATA) \
-	     #$(orrerytheme_DATA) \
 	     $(videotheme_DATA) \
 	     $(xshowtheme_DATA) \
 	     $(conkytheme_DATA) \
diff --git a/applet/data/Makefile.in b/applet/data/Makefile.in
index a1791de..02754c2 100644
--- a/applet/data/Makefile.in
+++ b/applet/data/Makefile.in
@@ -267,7 +267,7 @@ colorfloodtheme_DATA = theme/Colorflood/*
 conkythemedir = $(datadir)/livewp/theme/Conky
 conkytheme_DATA = theme/Conky/* 
 externalthemedir = $(datadir)/livewp/external_themes
-externaltheme_DATA = external_themes/* 
+externaltheme_DATA = external_themes/*.xml 
 dbus_servicedir = $(datadir)/dbus-1/services
 dbus_service_DATA = org.maemo.livewp.service
 desktoppaneldir = $(datadir)/applications/hildon-control-panel
@@ -282,7 +282,6 @@ EXTRA_DIST = $(berlintheme_DATA) \
 	     $(acceltheme_DATA) \
 	     $(fifteentheme_DATA) \
 	     $(crazytheme_DATA) \
-	     #$(orrerytheme_DATA) \
 	     $(videotheme_DATA) \
 	     $(xshowtheme_DATA) \
 	     $(conkytheme_DATA) \
@@ -561,7 +560,7 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/theme/Accel $(distdir)/theme/Berlin $(distdir)/theme/CrazyChickens $(distdir)/theme/Fifteen $(distdir)/theme/Matrix $(distdir)/theme/Modern
+	$(mkdir_p) $(distdir)/external_themes $(distdir)/theme/Accel $(distdir)/theme/Berlin $(distdir)/theme/Colorflood $(distdir)/theme/Conky $(distdir)/theme/CrazyChickens $(distdir)/theme/Fifteen $(distdir)/theme/Matrix $(distdir)/theme/Modern $(distdir)/theme/Video
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
diff --git a/applet/data/external_themes/orrery.xml b/applet/data/external_themes/orrery.xml
deleted file mode 100644
index 689a418..0000000
--- a/applet/data/external_themes/orrery.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<theme>
-<name>Orrery</name>
- <exec_path>/usr/bin/orrery -d /usr/share/orrery/</exec_path>
- <window_name>orrery</window_name>
- <category>Unknown</category>
- <icon_on>/usr/share/livewp/theme/Orrery/icon.png</icon_on>       
- <icon_off>/usr/share/livewp/theme/Orrery/icond.png</icon_off>       
-</theme>
diff --git a/applet/data/external_themes/orrery.xml.disable b/applet/data/external_themes/orrery.xml.disable
new file mode 100644
index 0000000..689a418
--- /dev/null
+++ b/applet/data/external_themes/orrery.xml.disable
@@ -0,0 +1,8 @@
+<theme>
+<name>Orrery</name>
+ <exec_path>/usr/bin/orrery -d /usr/share/orrery/</exec_path>
+ <window_name>orrery</window_name>
+ <category>Unknown</category>
+ <icon_on>/usr/share/livewp/theme/Orrery/icon.png</icon_on>       
+ <icon_off>/usr/share/livewp/theme/Orrery/icond.png</icon_off>       
+</theme>