Get rid of code that passes around the "optimize for AA" flag.

	* components/tree/nautilus-tree-view.c:
	(nautilus_tree_view_insert_model_node),
	(nautilus_tree_view_update_model_node):
	* libnautilus-private/nautilus-bookmark.c:
	(nautilus_bookmark_get_pixbuf):
	* libnautilus-private/nautilus-find-icon-image.c: (read_details),
	(get_themed_icon_file_path), (theme_has_icon),
	(nautilus_get_icon_file_name):
	* libnautilus-private/nautilus-find-icon-image.h:
	* libnautilus-private/nautilus-icon-container.c:
	(nautilus_icon_container_update_icon):
	* libnautilus-private/nautilus-icon-factory-private.h:
	* libnautilus-private/nautilus-icon-factory.c:
	(load_thumbnail_frame), (nautilus_icon_factory_init),
	(nautilus_icon_factory_destroy), (icon_theme_changed_callback),
	(should_display_image_file_as_itself),
	(nautilus_icon_factory_get_icon_for_file), (load_icon_from_path),
	(load_named_icon), (load_specific_icon), (load_icon_for_scaling),
	(load_icon_scale_if_necessary), (get_icon_from_cache),
	(nautilus_icon_factory_get_pixbuf_for_icon), (cache_key_hash),
	(cache_key_equal), (nautilus_icon_factory_get_pixbuf_for_file),
	(nautilus_icon_factory_get_pixbuf_from_name),
	(nautilus_icon_factory_get_thumbnail_frame):
	* libnautilus-private/nautilus-icon-factory.h:
	* libnautilus-private/nautilus-thumbnails.c:
	(nautilus_thumbnail_load_framed_image):
	* libnautilus-private/nautilus-thumbnails.h:
	* src/file-manager/fm-directory-view.c:
	(add_script_to_script_menus), (add_submenu_to_script_menus):
	* src/file-manager/fm-list-model.c: (fm_list_model_get_value):
	* src/file-manager/fm-properties-window.c:
	(get_pixbuf_for_properties_window):
	* src/nautilus-sidebar-title.c: (update_icon), (update_emblems):
	Get rid of code that passes around the "optimize for AA" flag.

	* cut-n-paste-code/widgets/gimphwrapbox/gtkhwrapbox.c:
	* cut-n-paste-code/widgets/gimphwrapbox/gtkhwrapbox.h:
	* cut-n-paste-code/widgets/gimphwrapbox/gtkwrapbox.c:
	* cut-n-paste-code/widgets/gimphwrapbox/gtkwrapbox.h:
	Roll in the latest version from gimp source tree.

	* icons: Overwrite all the non-aa versions with the aa versions.
	Remove all the aa versions.

26 files changed, 0 insertions, 17 deletions

diff --git a/icons/gnome/Makefile.am b/icons/gnome/Makefile.am
index 4d567b2ca..9daa530ec 100644
--- a/icons/gnome/Makefile.am
+++ b/icons/gnome/Makefile.am
@@ -14,43 +14,26 @@ gnome_DATA =				\
 	emblem-nowrite.png		\
 	i-core.png			\
 	i-dirclosed.png			\
-	i-directory-12-aa.png		\
 	i-directory-12.png		\
-	i-directory-192-aa.png		\
 	i-directory-192.png		\
-	i-directory-20-aa.png		\
 	i-directory-20.png		\
-	i-directory-24-aa.png		\
 	i-directory-24.png		\
-	i-directory-36-aa.png		\
 	i-directory-36.png		\
-	i-directory-72-aa.png		\
 	i-directory-72.png		\
-	i-directory-96-aa.png		\
 	i-directory-96.png		\
-	i-directory-aa.png		\
-	i-directory-accept-12-aa.png	\
 	i-directory-accept-12.png	\
-	i-directory-accept-192-aa.png	\
 	i-directory-accept-192.png	\
-	i-directory-accept-20-aa.png	\
 	i-directory-accept-20.png	\
-	i-directory-accept-24-aa.png	\
 	i-directory-accept-24.png	\
-	i-directory-accept-36-aa.png	\
 	i-directory-accept-36.png	\
-	i-directory-accept-72-aa.png	\
 	i-directory-accept-72.png	\
-	i-directory-accept-96-aa.png	\
 	i-directory-accept-96.png	\
-	i-directory-accept-aa.png	\
 	i-directory-accept.png		\
 	i-directory.png			\
 	i-executable.png		\
 	i-music-192.png			\
 	i-music.png			\
 	i-nfs.png			\
-	i-regular-96-aa.png		\
 	i-regular.png			\
 	i-regular.xml			\
 	i-stalled.png			\
diff --git a/icons/gnome/i-directory-12-aa.png b/icons/gnome/i-directory-12-aa.png
deleted file mode 100644
index f84834e37..000000000
--- a/icons/gnome/i-directory-12-aa.png
+++ /dev/null
diff --git a/icons/gnome/i-directory-12.png b/icons/gnome/i-directory-12.png
index 1a1508fb4..f84834e37 100644
--- a/icons/gnome/i-directory-12.png
+++ b/icons/gnome/i-directory-12.png
diff --git a/icons/gnome/i-directory-192-aa.png b/icons/gnome/i-directory-192-aa.png
deleted file mode 100644
index c103e9188..000000000
--- a/icons/gnome/i-directory-192-aa.png
+++ /dev/null
diff --git a/icons/gnome/i-directory-192.png b/icons/gnome/i-directory-192.png
index ff6b0ebeb..c103e9188 100644
--- a/icons/gnome/i-directory-192.png
+++ b/icons/gnome/i-directory-192.png
diff --git a/icons/gnome/i-directory-20-aa.png b/icons/gnome/i-directory-20-aa.png
deleted file mode 100644
index 9237b732c..000000000
--- a/icons/gnome/i-directory-20-aa.png
+++ /dev/null
diff --git a/icons/gnome/i-directory-24-aa.png b/icons/gnome/i-directory-24-aa.png
deleted file mode 100644
index 8cb3f57ff..000000000
--- a/icons/gnome/i-directory-24-aa.png
+++ /dev/null
diff --git a/icons/gnome/i-directory-24.png b/icons/gnome/i-directory-24.png
index 5956dd9b4..8cb3f57ff 100644
--- a/icons/gnome/i-directory-24.png
+++ b/icons/gnome/i-directory-24.png
diff --git a/icons/gnome/i-directory-36-aa.png b/icons/gnome/i-directory-36-aa.png
deleted file mode 100644
index dd86244f8..000000000
--- a/icons/gnome/i-directory-36-aa.png
+++ /dev/null
diff --git a/icons/gnome/i-directory-36.png b/icons/gnome/i-directory-36.png
index 66f4e64c6..dd86244f8 100644
--- a/icons/gnome/i-directory-36.png
+++ b/icons/gnome/i-directory-36.png
diff --git a/icons/gnome/i-directory-72-aa.png b/icons/gnome/i-directory-72-aa.png
deleted file mode 100644
index 683a84d15..000000000
--- a/icons/gnome/i-directory-72-aa.png
+++ /dev/null
diff --git a/icons/gnome/i-directory-72.png b/icons/gnome/i-directory-72.png
index 05b5216ec..683a84d15 100644
--- a/icons/gnome/i-directory-72.png
+++ b/icons/gnome/i-directory-72.png
diff --git a/icons/gnome/i-directory-96-aa.png b/icons/gnome/i-directory-96-aa.png
deleted file mode 100644
index e366311a4..000000000
--- a/icons/gnome/i-directory-96-aa.png
+++ /dev/null
diff --git a/icons/gnome/i-directory-96.png b/icons/gnome/i-directory-96.png
index 153f59101..e366311a4 100644
--- a/icons/gnome/i-directory-96.png
+++ b/icons/gnome/i-directory-96.png
diff --git a/icons/gnome/i-directory-aa.png b/icons/gnome/i-directory-aa.png
deleted file mode 100644
index 943d14663..000000000
--- a/icons/gnome/i-directory-aa.png
+++ /dev/null
diff --git a/icons/gnome/i-directory-accept-12-aa.png b/icons/gnome/i-directory-accept-12-aa.png
deleted file mode 100644
index 99effc446..000000000
--- a/icons/gnome/i-directory-accept-12-aa.png
+++ /dev/null
diff --git a/icons/gnome/i-directory-accept-192-aa.png b/icons/gnome/i-directory-accept-192-aa.png
deleted file mode 100644
index 3355c8776..000000000
--- a/icons/gnome/i-directory-accept-192-aa.png
+++ /dev/null
diff --git a/icons/gnome/i-directory-accept-20-aa.png b/icons/gnome/i-directory-accept-20-aa.png
deleted file mode 100644
index d713746be..000000000
--- a/icons/gnome/i-directory-accept-20-aa.png
+++ /dev/null
diff --git a/icons/gnome/i-directory-accept-24-aa.png b/icons/gnome/i-directory-accept-24-aa.png
deleted file mode 100644
index c393d7449..000000000
--- a/icons/gnome/i-directory-accept-24-aa.png
+++ /dev/null
diff --git a/icons/gnome/i-directory-accept-36-aa.png b/icons/gnome/i-directory-accept-36-aa.png
deleted file mode 100644
index 23d4090c6..000000000
--- a/icons/gnome/i-directory-accept-36-aa.png
+++ /dev/null
diff --git a/icons/gnome/i-directory-accept-72-aa.png b/icons/gnome/i-directory-accept-72-aa.png
deleted file mode 100644
index 1ec83cad2..000000000
--- a/icons/gnome/i-directory-accept-72-aa.png
+++ /dev/null
diff --git a/icons/gnome/i-directory-accept-96-aa.png b/icons/gnome/i-directory-accept-96-aa.png
deleted file mode 100644
index 9b704b671..000000000
--- a/icons/gnome/i-directory-accept-96-aa.png
+++ /dev/null
diff --git a/icons/gnome/i-directory-accept-aa.png b/icons/gnome/i-directory-accept-aa.png
deleted file mode 100644
index 0891a90f0..000000000
--- a/icons/gnome/i-directory-accept-aa.png
+++ /dev/null
diff --git a/icons/gnome/i-directory.png b/icons/gnome/i-directory.png
index 08e704b82..943d14663 100644
--- a/icons/gnome/i-directory.png
+++ b/icons/gnome/i-directory.png
diff --git a/icons/gnome/i-regular-96-aa.png b/icons/gnome/i-regular-96-aa.png
deleted file mode 100644
index e54a769bd..000000000
--- a/icons/gnome/i-regular-96-aa.png
+++ /dev/null
diff --git a/icons/gnome/i-regular-96.png b/icons/gnome/i-regular-96.png
index ff2b03692..e54a769bd 100644
--- a/icons/gnome/i-regular-96.png
+++ b/icons/gnome/i-regular-96.png