fixed bug 7019, emblem names are not aligned vertically in show properties

	fixed bug 7019, emblem names are not aligned vertically in
	show properties or the property browser.  Fixed by adding
	a "fixed image height" attribute to nautilus-labeled-image, and
	set it in the properties window and properties browser.

	* libnautilus-extensions/nautilus-labeled-image.c:
	(nautilus_labeled_image_initialize), (is_fixed_height),
	(labeled_image_get_image_dimensions),
	(nautilus_labeled_image_get_image_bounds),
	(nautilus_labeled_image_get_show_image),
	(nautilus_labeled_image_set_fixed_image_height):
	added a fixed_image_height instance variable, and used it
	when appropriate
	* libnautilus-extensions/nautilus-labeled-image.h:
	added setter for the fixed image height attribute

	* src/file-manager/fm-properties-window.c: (create_emblems_page):
	set the fixed image height attribute on the emblems
	* src/nautilus-property-browser.c:
	(make_properties_from_directories),
	(property_browser_category_button_new):
	set the fixed image height attribute for the emblems and also
	the category buttons

	fixed bug 7022, users are confused by the "shared" and "secret"
	emblems; fixed by removing them.

	* data/browser.xml:
	removed secret and shared emblem references
	* data/emblems/Makefile.am:
	removed the emblem .pngs from the makefile
	* data/emblems/secret.png:
	* data/emblems/shared.png:
	removed the emblem .pngs
	* icons/Makefile.am:
	removed the emblem .svgs from the makefile
	* icons/emblem-secret.svg:
	* icons/emblem-shared.svg:
	removed the .svgs

4 files changed, 0 insertions, 4 deletions

diff --git a/data/browser.xml b/data/browser.xml
index e57b1598d..4b8c165f4 100644
--- a/data/browser.xml
+++ b/data/browser.xml
@@ -78,9 +78,7 @@
  	<emblem _display_name="Oh No" filename="ohno"/>
  	<emblem _display_name="OK" filename="OK"/>
  	<emblem _display_name="Personal" filename="personal"/>
- 	<emblem _display_name="Secret" filename="secret"/>
  	<emblem _display_name="Special" filename="special"/>
- 	<emblem _display_name="Shared" filename="shared"/>
  	<emblem _display_name="Urgent" filename="urgent"/>
  	<emblem _display_name="Danger" filename="danger"/>
  	<emblem _display_name="Erase" filename="erase"/>
diff --git a/data/emblems/Makefile.am b/data/emblems/Makefile.am
index a8b6101d7..f4cf42807 100644
--- a/data/emblems/Makefile.am
+++ b/data/emblems/Makefile.am
@@ -15,9 +15,7 @@ emblems_DATA = \
 	ohno.png \
 	OK.png \
 	personal.png \
-	secret.png \
 	special.png \
-	shared.png \
 	urgent.png \
 	$(NULL)
 
diff --git a/data/emblems/secret.png b/data/emblems/secret.png
deleted file mode 100644
index b25780673..000000000
--- a/data/emblems/secret.png
+++ /dev/null
diff --git a/data/emblems/shared.png b/data/emblems/shared.png
deleted file mode 100644
index e94bdaa25..000000000
--- a/data/emblems/shared.png
+++ /dev/null