evolution-jescs r262 - in trunk: . data storage

[jedywang svn gnome org]

Author: jedywang
Date: Fri Aug 15 06:45:09 2008
New Revision: 262
URL: http://svn.gnome.org/viewvc/evolution-jescs?rev=262&view=rev

Log:
2008-08-15  Wang Xin  <jedy wang sun com>

	Update new icons to make jescs work with fix of #467115.



Added:
   trunk/data/
   trunk/data/Makefile.am
   trunk/data/hicolor_apps_16x16_sun-connector.png   (contents, props changed)
   trunk/data/hicolor_apps_22x22_sun-connector.png   (contents, props changed)
   trunk/data/hicolor_apps_24x24_sun-connector.png   (contents, props changed)
   trunk/data/hicolor_apps_32x32_sun-connector.png   (contents, props changed)
   trunk/data/hicolor_apps_48x48_sun-connector.png   (contents, props changed)
   trunk/data/hicolor_categories_16x16_sunone-invitations.png   (contents, props changed)
   trunk/data/hicolor_categories_22x22_sunone-invitations.png   (contents, props changed)
   trunk/data/hicolor_categories_24x24_sunone-invitations.png   (contents, props changed)
   trunk/data/hicolor_categories_32x32_sunone-invitations.png   (contents, props changed)
   trunk/data/hicolor_categories_48x48_sunone-invitations.png   (contents, props changed)
Removed:
   trunk/storage/sun-connector.png
   trunk/storage/sunone-invitations-mini.png
   trunk/storage/sunone-invitations.png
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.in
   trunk/storage/GNOME_Evolution_SunOne_Storage.server.in.in
   trunk/storage/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Fri Aug 15 06:45:09 2008
@@ -1,4 +1,4 @@
-SUBDIRS = lib camel calendar storage po
+SUBDIRS = lib camel calendar data storage po
 
 DISTCLEANFILES =		\
         intltool-extract	\

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Aug 15 06:45:09 2008
@@ -192,6 +192,7 @@
 lib/Makefile
 camel/Makefile
 calendar/Makefile
+data/Makefile
 storage/Makefile
 po/Makefile.in
 ])

Added: trunk/data/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/data/Makefile.am	Fri Aug 15 06:45:09 2008
@@ -0,0 +1,75 @@
+NULL =
+
+CLEANFILES =
+
+public_icons = \
+	hicolor_apps_16x16_sun-connector.png \
+	hicolor_apps_22x22_sun-connector.png \
+	hicolor_apps_24x24_sun-connector.png \
+	hicolor_apps_32x32_sun-connector.png \
+	hicolor_apps_48x48_sun-connector.png \
+	$(NULL)
+
+private_icons = \
+	hicolor_categories_16x16_sunone-invitations.png \
+	hicolor_categories_22x22_sunone-invitations.png \
+	hicolor_categories_24x24_sunone-invitations.png \
+	hicolor_categories_32x32_sunone-invitations.png \
+	hicolor_categories_48x48_sunone-invitations.png \
+	$(NULL)
+
+EXTRA_DIST = \
+	$(public_icons)		\
+	$(private_icons)	\
+	$(NULL)
+
+###############################################################################
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t
+
+update-icon-cache:
+	@-if test -z "$(DESTDIR)"; then \
+		echo "Updating Gtk icon cache."; \
+		$(gtk_update_icon_cache) $(datadir)/icons/hicolor; \
+	else \
+		echo "*** Icon cache not updated.  After (un)install, run this:"; \
+		echo "***   $(gtk_update_icon_cache) $(datadir)/icons/hicolor"; \
+	fi
+
+install-icons:
+	for icon in $(public_icons); do \
+		THEME=`echo $$icon | cut -d_ -f1`; \
+		CONTEXT=`echo $$icon | cut -d_ -f2`; \
+		SIZE=`echo $$icon | cut -d_ -f3`; \
+		ICONFILE=`echo $$icon | cut -d_ -f4`; \
+		mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
+		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+	done; \
+	for icon in $(private_icons); do \
+		THEME=`echo $$icon | cut -d_ -f1`; \
+		CONTEXT=`echo $$icon | cut -d_ -f2`; \
+		SIZE=`echo $$icon | cut -d_ -f3`; \
+		ICONFILE=`echo $$icon | cut -d_ -f4`; \
+		mkdir -p $(DESTDIR)$(datadir)/evolution/$(BASE_VERSION)/icons/$$THEME/$$SIZE/$$CONTEXT; \
+		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/evolution/$(BASE_VERSION)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+	done
+
+uninstall-icons:
+	-for icon in $(public_icons); do \
+		THEME=`echo $$icon | cut -d_ -f1`; \
+		CONTEXT=`echo $$icon | cut -d_ -f2`; \
+		SIZE=`echo $$icon | cut -d_ -f3`; \
+		ICONFILE=`echo $$icon | cut -d_ -f4`; \
+		rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+	done; \
+	for icon in $(private_icons); do \
+		THEME=`echo $$icon | cut -d_ -f1`; \
+		CONTEXT=`echo $$icon | cut -d_ -f2`; \
+		SIZE=`echo $$icon | cut -d_ -f3`; \
+		ICONFILE=`echo $$icon | cut -d_ -f4`; \
+		rm -f $(DESTDIR)$(pkgdatadir)/$(BASE_VERSION)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+	done
+
+install-data-local: install-icons update-icon-cache
+
+uninstall-local: uninstall-icons update-icon-cache

Added: trunk/data/hicolor_apps_16x16_sun-connector.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/hicolor_apps_22x22_sun-connector.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/hicolor_apps_24x24_sun-connector.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/hicolor_apps_32x32_sun-connector.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/hicolor_apps_48x48_sun-connector.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/hicolor_categories_16x16_sunone-invitations.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/hicolor_categories_22x22_sunone-invitations.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/hicolor_categories_24x24_sunone-invitations.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/hicolor_categories_32x32_sunone-invitations.png
==============================================================================
Binary file. No diff available.

Added: trunk/data/hicolor_categories_48x48_sunone-invitations.png
==============================================================================
Binary file. No diff available.

Modified: trunk/storage/GNOME_Evolution_SunOne_Storage.server.in.in
==============================================================================
--- trunk/storage/GNOME_Evolution_SunOne_Storage.server.in.in	(original)
+++ trunk/storage/GNOME_Evolution_SunOne_Storage.server.in.in	Fri Aug 15 06:45:09 2008
@@ -29,7 +29,7 @@
     <oaf_attribute name="evolution:menu_accelerator" type="string"
                _value="*Control*F6"/>
 	<oaf_attribute name="evolution:button_icon" type="string"
-                       value="@IMAGESDIR@/sun-connector.png"/>
+                       value="sun-connector"/>
 	<oaf_attribute name="evolution:button_label" type="string"
 		       _value="JESCS"/>
 	<oaf_attribute name="evolution:button_tooltips" type="string"

Modified: trunk/storage/Makefile.am
==============================================================================
--- trunk/storage/Makefile.am	(original)
+++ trunk/storage/Makefile.am	Fri Aug 15 06:45:09 2008
@@ -74,12 +74,6 @@
 
 @INTLTOOL_SERVER_RULE@
 
-#imagesdir = $(datadir)/images/evolution
-images_DATA = 				\
-	sunone-invitations-mini.png	\
-	sunone-invitations.png	\
-	sun-connector.png
-
 gladedir = $(datadir)/evolution-jescs/glade
 glade_DATA = \
 	sunone-permissions-dialog.glade	\
@@ -89,7 +83,6 @@
 EXTRA_DIST = 		\
 	$(server_DATA)	\
 	$(server_in_files) \
-	$(images_DATA)	\
 	$(glade_DATA)	
 
 BUILT_SOURCES += $(server_DATA)