Remove librsvg.

	* Makefile.am:
	Remove librsvg.

	* librsvg/.cvsignore:
	* librsvg/Makefile.am:
	* librsvg/art_render.c:
	* librsvg/art_render.h:
	* librsvg/art_render_gradient.c:
	* librsvg/art_render_gradient.h:
	* librsvg/art_render_mask.c:
	* librsvg/art_render_mask.h:
	* librsvg/art_render_svp.c:
	* librsvg/art_render_svp.h:
	* librsvg/art_rgba.c:
	* librsvg/art_rgba.h:
	* librsvg/example-nested-transform.svg:
	* librsvg/makefile-simple:
	* librsvg/opacity.svg:
	* librsvg/rsvg-bpath-util.c:
	* librsvg/rsvg-bpath-util.h:
	* librsvg/rsvg-css.c:
	* librsvg/rsvg-css.h:
	* librsvg/rsvg-defs.c:
	* librsvg/rsvg-defs.h:
	* librsvg/rsvg-ft.c:
	* librsvg/rsvg-ft.h:
	* librsvg/rsvg-paint-server.c:
	* librsvg/rsvg-paint-server.h:
	* librsvg/rsvg-path.c:
	* librsvg/rsvg-path.h:
	* librsvg/rsvg.c:
	* librsvg/rsvg.h:
	* librsvg/subpixel-text-test:
	* librsvg/test-ft-gtk.c:
	* librsvg/test-ft.c:
	* librsvg/test-rsvg.c:
	* librsvg/test.svg:
	Move librsvg to its own top level GNOME CVS module.

	* configure.in:
	Add librsvg and eel dependencies.
	Remove librsvg and font entries.

	* nautilus.spec.in:
	Remove font entries.  Add librsvg and eel requirements.

	* data/Makefile.am:
	* data/fonts/.cvsignore:
	* data/fonts/Makefile.am:
	* data/fonts/urw/.cvsignore:
	* data/fonts/urw/Makefile.am:
	* data/fonts/urw/README:
	* data/fonts/urw/fonts.dir:
	* data/fonts/urw/n019003l.afm:
	* data/fonts/urw/n019003l.pfb:
	* data/fonts/urw/n019003l.pfm:
	* data/fonts/urw/n019004l.afm:
	* data/fonts/urw/n019004l.pfb:
	* data/fonts/urw/n019004l.pfm:
	* data/fonts/urw/n019023l.afm:
	* data/fonts/urw/n019023l.pfb:
	* data/fonts/urw/n019023l.pfm:
	* data/fonts/urw/n019024l.afm:
	* data/fonts/urw/n019024l.pfb:
	* data/fonts/urw/n019024l.pfm:
	Retire default fonts.  These now live in eel.

	* libnautilus/nautilus-undo-transaction.c:
	(nautilus_undo_transaction_destroy):
	* libnautilus/nautilus-view.c: (nautilus_view_destroy):
	Update for eel changes.  Use eel-gtk-macros.

	* nautilus-installer/src/nautilus-druid-page-eazel.c:
	(nautilus_druid_page_eazel_destroy),
	(nautilus_druid_page_eazel_finalize),
	(nautilus_druid_page_eazel_size_allocate),
	(nautilus_druid_page_eazel_size_request):
	Update for eel changes.  Use eel-gtk-macros.

	* libnautilus-extensions/Makefile.am:
	* libnautilus-extensions/nautilus-bonobo-extensions.c:
	* libnautilus-extensions/nautilus-bonobo-extensions.h:
	* libnautilus-extensions/nautilus-bookmark.c:
	* libnautilus-extensions/nautilus-ctree.c:
	* libnautilus-extensions/nautilus-customization-data.c:
	* libnautilus-extensions/nautilus-dateedit-extensions.c:
	* libnautilus-extensions/nautilus-dateedit-extensions.h:
	* libnautilus-extensions/nautilus-directory-async.c:
	* libnautilus-extensions/nautilus-directory-background.c:
	* libnautilus-extensions/nautilus-directory-background.h:
	* libnautilus-extensions/nautilus-directory-metafile-monitor.c:
	* libnautilus-extensions/nautilus-directory-metafile.c:
	* libnautilus-extensions/nautilus-directory.c:
	* libnautilus-extensions/nautilus-drag-window.c:
	* libnautilus-extensions/nautilus-drag.c:
	* libnautilus-extensions/nautilus-druid-page-eazel.c:
	* libnautilus-extensions/nautilus-druid.c:
	* libnautilus-extensions/nautilus-entry.c:
	* libnautilus-extensions/nautilus-file-changes-queue.c:
	* libnautilus-extensions/nautilus-file-operations-progress.c:
	* libnautilus-extensions/nautilus-file-operations.c:
	* libnautilus-extensions/nautilus-file-private.h:
	* libnautilus-extensions/nautilus-file-utilities.c:
	* libnautilus-extensions/nautilus-file.c:
	* libnautilus-extensions/nautilus-font-factory.c:
	* libnautilus-extensions/nautilus-gconf-extensions.c:
	* libnautilus-extensions/nautilus-generous-bin.c:
	* libnautilus-extensions/nautilus-global-preferences.c:
	* libnautilus-extensions/nautilus-global-preferences.h:
	* libnautilus-extensions/nautilus-horizontal-splitter.c:
	* libnautilus-extensions/nautilus-icon-canvas-item.c:
	* libnautilus-extensions/nautilus-icon-canvas-item.h:
	* libnautilus-extensions/nautilus-icon-container.c:
	* libnautilus-extensions/nautilus-icon-container.h:
	* libnautilus-extensions/nautilus-icon-dnd.c:
	* libnautilus-extensions/nautilus-icon-factory.c:
	* libnautilus-extensions/nautilus-icon-factory.h:
	* libnautilus-extensions/nautilus-icon-private.h:
	* libnautilus-extensions/nautilus-icon-text-item.c:
	* libnautilus-extensions/nautilus-keep-last-vertical-box.c:
	* libnautilus-extensions/nautilus-lib-self-check-functions.c:
	* libnautilus-extensions/nautilus-lib-self-check-functions.h:
	* libnautilus-extensions/nautilus-link-set.c:
	* libnautilus-extensions/nautilus-link.c:
	* libnautilus-extensions/nautilus-list-column-title.c:
	* libnautilus-extensions/nautilus-list.c:
	* libnautilus-extensions/nautilus-medusa-support.c:
	* libnautilus-extensions/nautilus-merged-directory.c:
	* libnautilus-extensions/nautilus-metafile-factory.c:
	* libnautilus-extensions/nautilus-metafile.c:
	* libnautilus-extensions/nautilus-mime-actions.c:
	* libnautilus-extensions/nautilus-preferences-box.c:
	* libnautilus-extensions/nautilus-preferences-dialog.c:
	* libnautilus-extensions/nautilus-preferences-group.c:
	* libnautilus-extensions/nautilus-preferences-item.c:
	* libnautilus-extensions/nautilus-preferences-pane.c:
	* libnautilus-extensions/nautilus-preferences.c:
	* libnautilus-extensions/nautilus-preferences.h:
	* libnautilus-extensions/nautilus-program-chooser.c:
	* libnautilus-extensions/nautilus-program-choosing.c:
	* libnautilus-extensions/nautilus-program-choosing.h:
	* libnautilus-extensions/nautilus-search-uri.c:
	* libnautilus-extensions/nautilus-sidebar-functions.c:
	* libnautilus-extensions/nautilus-tabs.c:
	* libnautilus-extensions/nautilus-theme.c:
	* libnautilus-extensions/nautilus-thumbnails.c:
	* libnautilus-extensions/nautilus-trash-directory.c:
	* libnautilus-extensions/nautilus-trash-file.c:
	* libnautilus-extensions/nautilus-trash-monitor.c:
	* libnautilus-extensions/nautilus-undo-context.c:
	* libnautilus-extensions/nautilus-undo-manager.c:
	* libnautilus-extensions/nautilus-undo-signal-handlers.c:
	* libnautilus-extensions/nautilus-vfs-directory.c:
	* libnautilus-extensions/nautilus-vfs-file.c:
	* libnautilus-extensions/nautilus-view-identifier.c:
	* libnautilus-extensions/nautilus-volume-monitor.c:
	Use new eel library.

	* libnautilus-extensions/nautilus-art-extensions.c:
	* libnautilus-extensions/nautilus-art-extensions.h:
	* libnautilus-extensions/nautilus-art-gtk-extensions.c:
	* libnautilus-extensions/nautilus-art-gtk-extensions.h:
	* libnautilus-extensions/nautilus-background-canvas-group.c:
	* libnautilus-extensions/nautilus-background-canvas-group.h:
	* libnautilus-extensions/nautilus-background.c:
	* libnautilus-extensions/nautilus-background.h:
	* libnautilus-extensions/nautilus-caption-table.c:
	* libnautilus-extensions/nautilus-caption-table.h:
	* libnautilus-extensions/nautilus-caption.c:
	* libnautilus-extensions/nautilus-caption.h:
	* libnautilus-extensions/nautilus-clickable-image.c:
	* libnautilus-extensions/nautilus-clickable-image.h:
	* libnautilus-extensions/nautilus-debug-drawing.c:
	* libnautilus-extensions/nautilus-debug-drawing.h:
	* libnautilus-extensions/nautilus-debug.c:
	* libnautilus-extensions/nautilus-debug.h:
	* libnautilus-extensions/nautilus-ellipsizing-label.c:
	* libnautilus-extensions/nautilus-ellipsizing-label.h:
	* libnautilus-extensions/nautilus-enumeration.c:
	* libnautilus-extensions/nautilus-enumeration.h:
	* libnautilus-extensions/nautilus-font-manager.c:
	* libnautilus-extensions/nautilus-font-manager.h:
	* libnautilus-extensions/nautilus-font-picker.c:
	* libnautilus-extensions/nautilus-font-picker.h:
	* libnautilus-extensions/nautilus-gdk-extensions.c:
	* libnautilus-extensions/nautilus-gdk-extensions.h:
	* libnautilus-extensions/nautilus-gdk-font-extensions.c:
	* libnautilus-extensions/nautilus-gdk-font-extensions.h:
	* libnautilus-extensions/nautilus-gdk-pixbuf-extensions.c:
	* libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h:
	* libnautilus-extensions/nautilus-glib-extensions.c:
	* libnautilus-extensions/nautilus-glib-extensions.h:
	* libnautilus-extensions/nautilus-glyph.c:
	* libnautilus-extensions/nautilus-glyph.h:
	* libnautilus-extensions/nautilus-gnome-extensions.c:
	* libnautilus-extensions/nautilus-gnome-extensions.h:
	* libnautilus-extensions/nautilus-graphic-effects.c:
	* libnautilus-extensions/nautilus-graphic-effects.h:
	* libnautilus-extensions/nautilus-gtk-extensions.c:
	* libnautilus-extensions/nautilus-gtk-extensions.h:
	* libnautilus-extensions/nautilus-gtk-macros.h:
	* libnautilus-extensions/nautilus-image-table.c:
	* libnautilus-extensions/nautilus-image-table.h:
	* libnautilus-extensions/nautilus-image-with-background.c:
	* libnautilus-extensions/nautilus-image-with-background.h:
	* libnautilus-extensions/nautilus-image.c:
	* libnautilus-extensions/nautilus-image.h:
	* libnautilus-extensions/nautilus-label-with-background.c:
	* libnautilus-extensions/nautilus-label-with-background.h:
	* libnautilus-extensions/nautilus-label.c:
	* libnautilus-extensions/nautilus-label.h:
	* libnautilus-extensions/nautilus-labeled-image.c:
	* libnautilus-extensions/nautilus-labeled-image.h:
	* libnautilus-extensions/nautilus-lib-self-check-functions.c:
	* libnautilus-extensions/nautilus-lib-self-check-functions.h:
	* libnautilus-extensions/nautilus-password-dialog.c:
	* libnautilus-extensions/nautilus-password-dialog.h:
	* libnautilus-extensions/nautilus-radio-button-group.c:
	* libnautilus-extensions/nautilus-radio-button-group.h:
	* libnautilus-extensions/nautilus-region.c:
	* libnautilus-extensions/nautilus-region.h:
	* libnautilus-extensions/nautilus-scalable-font-private.h:
	* libnautilus-extensions/nautilus-scalable-font.c:
	* libnautilus-extensions/nautilus-scalable-font.h:
	* libnautilus-extensions/nautilus-self-checks.c:
	* libnautilus-extensions/nautilus-self-checks.h:
	* libnautilus-extensions/nautilus-smooth-text-layout-cache.c:
	* libnautilus-extensions/nautilus-smooth-text-layout-cache.h:
	* libnautilus-extensions/nautilus-smooth-text-layout.c:
	* libnautilus-extensions/nautilus-smooth-text-layout.h:
	* libnautilus-extensions/nautilus-smooth-widget.c:
	* libnautilus-extensions/nautilus-smooth-widget.h:
	* libnautilus-extensions/nautilus-stock-dialogs.c:
	* libnautilus-extensions/nautilus-stock-dialogs.h:
	* libnautilus-extensions/nautilus-string-list.c:
	* libnautilus-extensions/nautilus-string-list.h:
	* libnautilus-extensions/nautilus-string-map.c:
	* libnautilus-extensions/nautilus-string-map.h:
	* libnautilus-extensions/nautilus-string-picker.c:
	* libnautilus-extensions/nautilus-string-picker.h:
	* libnautilus-extensions/nautilus-string.c:
	* libnautilus-extensions/nautilus-string.h:
	* libnautilus-extensions/nautilus-text-caption.c:
	* libnautilus-extensions/nautilus-text-caption.h:
	* libnautilus-extensions/nautilus-viewport.c:
	* libnautilus-extensions/nautilus-viewport.h:
	* libnautilus-extensions/nautilus-wrap-table.c:
	* libnautilus-extensions/nautilus-wrap-table.h:
	* libnautilus-extensions/nautilus-xml-extensions.c:
	* libnautilus-extensions/nautilus-xml-extensions.h:
	Remove these files.  These are all part of eel now.

	* applets/launcher/nautilus-launcher-applet.c:
	* applets/preferences-applet/nautilus-preferences-applet.c:
	* components/adapter/Makefile.am:
	* components/adapter/main.c:
	* components/adapter/nautilus-adapter-control-embed-strategy.c:
	* components/adapter/nautilus-adapter-embed-strategy.c:
	* components/adapter/nautilus-adapter-embeddable-embed-strategy.c:
	* components/adapter/nautilus-adapter-factory-server.c:
	* components/adapter/nautilus-adapter-file-load-strategy.c:
	* components/adapter/nautilus-adapter-load-strategy.c:
	* components/adapter/nautilus-adapter-progressive-load-strategy.c:
	* components/adapter/nautilus-adapter-stream-load-strategy.c:
	* components/adapter/nautilus-adapter.c:
	* components/hardware/Makefile.am:
	* components/hardware/nautilus-hardware-view.c:
	* components/help/Makefile.am:
	* components/help/help-method.c:
	* components/help/hyperbola-filefmt.c:
	* components/help/hyperbola-nav-tree.c:
	* components/history/Makefile.am:
	* components/history/nautilus-history-view.c:
	* components/image-viewer/Makefile.am:
	* components/image-viewer/nautilus-image-view.c:
	* components/loser/content/Makefile.am:
	* components/loser/content/nautilus-content-loser.c:
	* components/loser/sidebar/Makefile.am:
	* components/loser/sidebar/nautilus-sidebar-loser.c:
	* components/mozilla/Makefile.am:
	* components/mozilla/bonobo-extensions.c:
	* components/mozilla/nautilus-mozilla-content-view.c:
	* components/music/Makefile.am:
	* components/music/nautilus-music-view.c:
	* components/notes/Makefile.am:
	* components/notes/nautilus-notes.c:
	* components/rpmview/Makefile.am:
	* components/rpmview/nautilus-rpm-verify-window.c:
	* components/rpmview/nautilus-rpm-view-install.c:
	* components/rpmview/nautilus-rpm-view.c:
	* components/sample/nautilus-sample-content-view.c:
	* components/services/install-view/Makefile.am:
	* components/services/install-view/callbacks.c:
	* components/services/install-view/forms.c:
	* components/services/install-view/nautilus-service-install-view.c:
	* components/services/install/lib/eazel-install-logic2.c:
	* components/services/install/server/main.c:
	* components/services/inventory-view/Makefile.am:
	* components/services/inventory-view/nautilus-inventory-config-page
	.c:
	* components/services/inventory-view/nautilus-inventory-disable-pag
	* components/services/inventory-view/nautilus-inventory-enable-page
	* components/services/inventory-view/nautilus-inventory-view.c:
	* components/services/inventory/Makefile.am:
	* components/services/inventory/eazel-inventory-upload-callback.c:
	* components/services/inventory/eazel-inventory.c:
	* components/services/inventory/main.c:
	* components/services/login/nautilus-view/Makefile.am:
	* components/services/login/nautilus-view/nautilus-change-password-
	view.c:
	* components/services/login/nautilus-view/password-box.c:
	* components/services/nautilus-dependent-shared/Makefile.am:
	* components/services/nautilus-dependent-shared/eazel-services-exte
	nsions.c:
	* components/services/nautilus-dependent-shared/eazel-services-exte
	nsions.h:
	* components/services/nautilus-dependent-shared/eazel-services-foot
	er.c:
	* components/services/nautilus-dependent-shared/eazel-services-head
	er.c:
	* components/services/nautilus-dependent-shared/test-footer-header.
	c:
	* components/services/summary/Makefile.am:
	* components/services/summary/nautilus-summary-callbacks.c:
	* components/services/summary/nautilus-summary-dialogs.c:
	* components/services/summary/nautilus-summary-dialogs.h:
	* components/services/summary/nautilus-summary-footer.c:
	* components/services/summary/nautilus-summary-menu-items.c:
	* components/services/summary/nautilus-summary-view-private.h:
	* components/services/summary/nautilus-summary-view.c:
	* components/services/time/nautilus-view/main.c:
	* components/services/time/nautilus-view/trilobite-eazel-time-view.
	c:
	* components/services/trilobite/sample/nautilus-view/Makefile.am:
	* components/text/Makefile.am:
	* components/text/nautilus-text-view.c:
	* components/throbber/Makefile.am:
	* components/throbber/main.c:
	* components/throbber/nautilus-throbber.c:
	* components/tree/Makefile.am:
	* components/tree/nautilus-tree-change-queue.c:
	* components/tree/nautilus-tree-expansion-state.c:
	* components/tree/nautilus-tree-model.c:
	* components/tree/nautilus-tree-node.c:
	* components/tree/nautilus-tree-view-dnd.c:
	* components/tree/nautilus-tree-view.c:
	* helper-utilities/authenticate/Makefile.am:
	* helper-utilities/authenticate/nautilus-authenticate.c:
	* nautilus-installer/src/nautilus-druid.c:
	* src/Makefile.am:
	* src/file-manager/fm-desktop-icon-view.c:
	* src/file-manager/fm-directory-view.c:
	* src/file-manager/fm-directory-view.h:
	* src/file-manager/fm-error-reporting.c:
	* src/file-manager/fm-icon-text-window.c:
	* src/file-manager/fm-icon-view.c:
	* src/file-manager/fm-list-view.c:
	* src/file-manager/fm-properties-window.c:
	* src/file-manager/fm-search-list-view.c:
	* src/file-manager/nautilus-indexing-info.c:
	* src/nautilus-about.c:
	* src/nautilus-application.c:
	* src/nautilus-bookmark-list.c:
	* src/nautilus-bookmark-parsing.c:
	* src/nautilus-bookmarks-window.c:
	* src/nautilus-complex-search-bar.c:
	* src/nautilus-component-adapter-factory.c:
	* src/nautilus-desktop-window.c:
	* src/nautilus-first-time-druid.c:
	* src/nautilus-link-set-window.c:
	* src/nautilus-location-bar.c:
	* src/nautilus-main.c:
	* src/nautilus-navigation-bar.c:
	* src/nautilus-profiler.c:
	* src/nautilus-property-browser.c:
	* src/nautilus-search-bar-criterion.c:
	* src/nautilus-search-bar.c:
	* src/nautilus-shell.c:
	* src/nautilus-sidebar-tabs.c:
	* src/nautilus-sidebar-title.c:
	* src/nautilus-sidebar.c:
	* src/nautilus-signaller.c:
	* src/nautilus-simple-search-bar.c:
	* src/nautilus-switchable-navigation-bar.c:
	* src/nautilus-switchable-search-bar.c:
	* src/nautilus-theme-selector.c:
	* src/nautilus-view-frame-corba.c:
	* src/nautilus-view-frame.c:
	* src/nautilus-window-manage-views.c:
	* src/nautilus-window-menus.c:
	* src/nautilus-window-toolbars.c:
	* src/nautilus-window.c:
	* src/nautilus-window.h:
	* src/nautilus-zoom-control.c:
	Update for new eel library usage.

	* test/test-nautilus-background.c:
	* test/test-nautilus-clickable-image.c:
	* test/test-nautilus-font-manager.c:
	* test/test-nautilus-font-picker.c:
	* test/test-nautilus-font-simple.c:
	* test/test-nautilus-font.c:
	* test/test-nautilus-glyph-simple.c:
	* test/test-nautilus-glyph.c:
	* test/test-nautilus-image-background.c:
	* test/test-nautilus-image-scrolled.c:
	* test/test-nautilus-image-simple.c:
	* test/test-nautilus-image-table.c:
	* test/test-nautilus-image-tile.c:
	* test/test-nautilus-image.c:
	* test/test-nautilus-label-background.c:
	* test/test-nautilus-label-flavorful.c:
	* test/test-nautilus-label-offset.c:
	* test/test-nautilus-label-scrolled.c:
	* test/test-nautilus-label-simple.c:
	* test/test-nautilus-label-wrapped.c:
	* test/test-nautilus-label.c:
	* test/test-nautilus-labeled-image.c:
	* test/test-nautilus-password-dialog.c:
	* test/test-nautilus-pixbuf-tile.c:
	* test/test-nautilus-smooth-text-layout.c:
	* test/test-nautilus-viewport-constraint.c:
	* test/test-nautilus-widgets.c:
	Remove these.  They live in eel now.

	* test/vsignore:
	* test/kefile.am:
	* test/st-nautilus-preferences-change.c:
	* test/st-nautilus-preferences-display.c:
	* test/st-nautilus-wrap-table.c:
	* test/st.c:
	* test/st.h:
	Update for new eel library usage.

1 files changed, 94 insertions, 94 deletions

diff --git a/libnautilus-extensions/nautilus-preferences-item.c b/libnautilus-extensions/nautilus-preferences-item.c
index acfa2784a..725da2853 100644
--- a/libnautilus-extensions/nautilus-preferences-item.c
+++ b/libnautilus-extensions/nautilus-preferences-item.c
@@ -25,18 +25,18 @@
 #include <config.h>
 #include "nautilus-preferences-item.h"
 
-#include "nautilus-enumeration.h"
+#include <eel/eel-enumeration.h>
 #include "nautilus-file-utilities.h"
-#include "nautilus-font-picker.h"
-#include "nautilus-glib-extensions.h"
+#include <eel/eel-font-picker.h>
+#include <eel/eel-glib-extensions.h>
 #include "nautilus-global-preferences.h"
-#include "nautilus-gtk-extensions.h"
-#include "nautilus-gtk-macros.h"
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include "nautilus-preferences.h"
-#include "nautilus-radio-button-group.h"
-#include "nautilus-string-picker.h"
-#include "nautilus-string.h"
-#include "nautilus-text-caption.h"
+#include <eel/eel-radio-button-group.h>
+#include <eel/eel-string-picker.h>
+#include <eel/eel-string.h>
+#include <eel/eel-text-caption.h>
 
 #include <libgnomevfs/gnome-vfs.h>
 
@@ -64,7 +64,7 @@ struct _NautilusPreferencesItemDetails
 	guint change_signal_ID;
 	char *control_preference_name;
 	NautilusPreferencesItemControlAction control_action;
-	NautilusEnumeration *constrained_integer_values;
+	EelEnumeration *constrained_integer_values;
 };
 
 /* GtkObjectClass methods */
@@ -104,12 +104,12 @@ static void editable_string_changed_callback                          (GtkWidget
 								       gpointer                      user_data);
 static void editable_integer_changed_callback                         (GtkWidget                    *caption,
 								       gpointer                      user_data);
-static void constrained_integer_changed_callback                      (NautilusStringPicker         *string_picker,
+static void constrained_integer_changed_callback                      (EelStringPicker         *string_picker,
 								       NautilusPreferencesItem      *item);
 static void font_item_changed_callback                                (GtkWidget                    *caption,
 								       gpointer                      user_data);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusPreferencesItem, nautilus_preferences_item, GTK_TYPE_VBOX)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusPreferencesItem, nautilus_preferences_item, GTK_TYPE_VBOX)
 
 /* NautilusPreferencesItemClass methods */
 static void
@@ -146,11 +146,11 @@ preferences_item_destroy (GtkObject *object)
 
 	g_free (item->details->preference_name);
 	g_free (item->details->control_preference_name);
-	nautilus_enumeration_free (item->details->constrained_integer_values);
+	eel_enumeration_free (item->details->constrained_integer_values);
 	g_free (item->details);
 	
 	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /*
@@ -163,7 +163,7 @@ preferences_item_construct (NautilusPreferencesItem *item,
 {
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
 
-	g_return_if_fail (nautilus_strlen (preference_name) > 0);
+	g_return_if_fail (eel_strlen (preference_name) > 0);
 	g_assert (item_type != PREFERENCES_ITEM_UNDEFINED_ITEM);
 
 	g_assert (item->details->child == NULL);
@@ -238,7 +238,7 @@ preferences_item_update_enum (NautilusPreferencesItem *item)
 
 	for (i = 0; i < nautilus_preferences_enumeration_get_num_entries (preference_name); i++) {
 		if (value == nautilus_preferences_enumeration_get_nth_value (preference_name, i)) {
-			nautilus_radio_button_group_set_active_index (NAUTILUS_RADIO_BUTTON_GROUP (item->details->child), i);
+			eel_radio_button_group_set_active_index (EEL_RADIO_BUTTON_GROUP (item->details->child), i);
 		}
 	}
 }
@@ -261,11 +261,11 @@ preferences_item_create_enum (NautilusPreferencesItem *item,
 	guint	i;
 
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
-	g_return_if_fail (nautilus_strlen (preference_name) > 0);
+	g_return_if_fail (eel_strlen (preference_name) > 0);
 
 	g_assert (item->details->preference_name != NULL);
 
-	item->details->child = nautilus_radio_button_group_new (FALSE);
+	item->details->child = eel_radio_button_group_new (FALSE);
 		
 	for (i = 0; i < nautilus_preferences_enumeration_get_num_entries (preference_name); i++) {
 		char *description;
@@ -274,7 +274,7 @@ preferences_item_create_enum (NautilusPreferencesItem *item,
 		
 		g_assert (description != NULL);
 		
-		nautilus_radio_button_group_insert (NAUTILUS_RADIO_BUTTON_GROUP (item->details->child),
+		eel_radio_button_group_insert (EEL_RADIO_BUTTON_GROUP (item->details->child),
 						    description);
 		
 		g_free (description);
@@ -307,7 +307,7 @@ preferences_item_update_short_enum (NautilusPreferencesItem *item)
 
 	for (i = 0; i < nautilus_preferences_enumeration_get_num_entries (preference_name); i++) {
 		if (value == nautilus_preferences_enumeration_get_nth_value (preference_name, i)) {
-			nautilus_radio_button_group_set_active_index (NAUTILUS_RADIO_BUTTON_GROUP (item->details->child), i);
+			eel_radio_button_group_set_active_index (EEL_RADIO_BUTTON_GROUP (item->details->child), i);
 		}
 	}
 }
@@ -323,11 +323,11 @@ preferences_item_create_short_enum (NautilusPreferencesItem *item,
 	guint	i;
 
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
-	g_return_if_fail (nautilus_strlen (preference_name) > 0);
+	g_return_if_fail (eel_strlen (preference_name) > 0);
 
 	g_assert (item->details->preference_name != NULL);
 
-	item->details->child = nautilus_radio_button_group_new (TRUE);
+	item->details->child = eel_radio_button_group_new (TRUE);
 		
 	for (i = 0; i < nautilus_preferences_enumeration_get_num_entries (preference_name); i++) {
 		char *description;
@@ -336,7 +336,7 @@ preferences_item_create_short_enum (NautilusPreferencesItem *item,
 
 		g_assert (description != NULL);
 
-		nautilus_radio_button_group_insert (NAUTILUS_RADIO_BUTTON_GROUP (item->details->child),
+		eel_radio_button_group_insert (EEL_RADIO_BUTTON_GROUP (item->details->child),
 						    description);
 
 		g_free (description);
@@ -373,7 +373,7 @@ preferences_item_create_boolean (NautilusPreferencesItem *item,
 	char *description;
 
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
-	g_return_if_fail (nautilus_strlen (preference_name) > 0);
+	g_return_if_fail (eel_strlen (preference_name) > 0);
 
 	g_assert (item->details->preference_name != NULL);
 	description = nautilus_preferences_get_description (preference_name);
@@ -408,7 +408,7 @@ preferences_item_update_editable_string (NautilusPreferencesItem *item)
 	current_value = nautilus_preferences_get (item->details->preference_name);
 
 	g_assert (current_value != NULL);
-	nautilus_text_caption_set_text (NAUTILUS_TEXT_CAPTION (item->details->child), current_value);
+	eel_text_caption_set_text (EEL_TEXT_CAPTION (item->details->child), current_value);
 	g_free (current_value);
 }
 
@@ -419,21 +419,21 @@ preferences_item_create_editable_string (NautilusPreferencesItem *item,
 	char	*description;
 	
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
-	g_return_if_fail (nautilus_strlen (preference_name) > 0);
+	g_return_if_fail (eel_strlen (preference_name) > 0);
 
 	description = nautilus_preferences_get_description (preference_name);
 	g_assert (description != NULL);
 	
-	item->details->child = nautilus_text_caption_new ();
+	item->details->child = eel_text_caption_new ();
 
 	/* FIXME This is a special case for the home uri preference,
 	   in the future this should be generalized. */
 	if (g_strcasecmp (preference_name, NAUTILUS_PREFERENCES_HOME_URI) == 0)
 	{
-		nautilus_text_caption_set_expand_tilde (NAUTILUS_TEXT_CAPTION (item->details->child), TRUE);
+		eel_text_caption_set_expand_tilde (EEL_TEXT_CAPTION (item->details->child), TRUE);
 	}
 
-	nautilus_caption_set_title_label (NAUTILUS_CAPTION (item->details->child), description);
+	eel_caption_set_title_label (EEL_CAPTION (item->details->child), description);
 
 	g_free (description);
 	
@@ -460,7 +460,7 @@ preferences_item_update_editable_integer (NautilusPreferencesItem *item)
 	current_value = g_strdup_printf ("%d", nautilus_preferences_get_integer (item->details->preference_name));
 
 	g_assert (current_value != NULL);
-	nautilus_text_caption_set_text (NAUTILUS_TEXT_CAPTION (item->details->child), current_value);
+	eel_text_caption_set_text (EEL_TEXT_CAPTION (item->details->child), current_value);
 	g_free (current_value);
 }
 
@@ -471,15 +471,15 @@ preferences_item_create_editable_integer (NautilusPreferencesItem *item,
 	char *description;
 	
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
-	g_return_if_fail (nautilus_strlen (preference_name) > 0);
+	g_return_if_fail (eel_strlen (preference_name) > 0);
 
 	description = nautilus_preferences_get_description (preference_name);
 	
 	g_assert (description != NULL);
 	
-	item->details->child = nautilus_text_caption_new ();
+	item->details->child = eel_text_caption_new ();
 
-	nautilus_caption_set_title_label (NAUTILUS_CAPTION (item->details->child), description);
+	eel_caption_set_title_label (EEL_CAPTION (item->details->child), description);
 
 	g_free (description);
 
@@ -512,15 +512,15 @@ preferences_item_update_constrained_integer (NautilusPreferencesItem *item)
 
 	current_value = nautilus_preferences_get_integer (item->details->preference_name);
 	
-	position = nautilus_enumeration_get_value_position (item->details->constrained_integer_values,
+	position = eel_enumeration_get_value_position (item->details->constrained_integer_values,
 							    current_value);
-	g_return_if_fail (position != NAUTILUS_STRING_LIST_NOT_FOUND);
+	g_return_if_fail (position != EEL_STRING_LIST_NOT_FOUND);
 
-	current_label = nautilus_enumeration_get_nth_entry (item->details->constrained_integer_values,
+	current_label = eel_enumeration_get_nth_entry (item->details->constrained_integer_values,
 							    position);
 
-	if (nautilus_string_picker_contains (NAUTILUS_STRING_PICKER (item->details->child), current_label)) {
-		nautilus_string_picker_set_selected_string (NAUTILUS_STRING_PICKER (item->details->child),
+	if (eel_string_picker_contains (EEL_STRING_PICKER (item->details->child), current_label)) {
+		eel_string_picker_set_selected_string (EEL_STRING_PICKER (item->details->child),
 							    current_label);
 	} else {
 		g_warning ("Value string for %s is %s, which isn't in the expected set of values",
@@ -538,13 +538,13 @@ preferences_item_create_constrained_integer (NautilusPreferencesItem *item,
 	char *description;
 	
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
-	g_return_if_fail (nautilus_strlen (preference_name) > 0);
+	g_return_if_fail (eel_strlen (preference_name) > 0);
 
 	description = nautilus_preferences_get_description (preference_name);
 	g_return_if_fail (description != NULL);
 	
-	item->details->child = nautilus_string_picker_new ();
-	nautilus_caption_set_title_label (NAUTILUS_CAPTION (item->details->child), description);
+	item->details->child = eel_string_picker_new ();
+	eel_caption_set_title_label (EEL_CAPTION (item->details->child), description);
 	g_free (description);
 
 	item->details->change_signal_ID = gtk_signal_connect (GTK_OBJECT (item->details->child),
@@ -574,8 +574,8 @@ preferences_item_update_font (NautilusPreferencesItem *item)
 	 * it is one of the choice before trying to select it, otherwise we would get
 	 * assertions.
 	 */
-	if (nautilus_string_picker_contains (NAUTILUS_STRING_PICKER (item->details->child), current_value)) {
-		nautilus_string_picker_set_selected_string (NAUTILUS_STRING_PICKER (item->details->child),
+	if (eel_string_picker_contains (EEL_STRING_PICKER (item->details->child), current_value)) {
+		eel_string_picker_set_selected_string (EEL_STRING_PICKER (item->details->child),
 							    current_value);
 	}
 
@@ -587,21 +587,21 @@ preferences_item_create_font (NautilusPreferencesItem *item,
 			      const char *preference_name)
 {
 	char *description;
-	NautilusStringList *font_list;
+	EelStringList *font_list;
 
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
-	g_return_if_fail (nautilus_strlen (preference_name) > 0);
+	g_return_if_fail (eel_strlen (preference_name) > 0);
 
 	description = nautilus_preferences_get_description (preference_name);
 	g_return_if_fail (description != NULL);
 	
-	item->details->child = nautilus_string_picker_new ();
-	nautilus_caption_set_title_label (NAUTILUS_CAPTION (item->details->child), description);
+	item->details->child = eel_string_picker_new ();
+	eel_caption_set_title_label (EEL_CAPTION (item->details->child), description);
 	
 	g_free (description);
 
 	/* FIXME bugzilla.eazel.com 1274: Need to query system for available fonts */
-	font_list = nautilus_string_list_new (TRUE);
+	font_list = eel_string_list_new (TRUE);
 
 	/* Once upon a time we had a bug in Nautilus that caused crashes with the "fixed" 
 	 * font.  That bug (2256) was fixed by removing the "fixed" choice from this menu
@@ -617,15 +617,15 @@ preferences_item_create_font (NautilusPreferencesItem *item,
 	/* FIXME bugzilla.eazel.com 7907: 
 	 * The "GTK System Font" string is hard coded in many places.
 	 */
-	nautilus_string_list_insert (font_list, "GTK System Font");
-	nautilus_string_list_insert (font_list, "fixed");
-	nautilus_string_list_insert (font_list, "helvetica");
-	nautilus_string_list_insert (font_list, "times");
-	nautilus_string_list_insert (font_list, "courier");
-	nautilus_string_list_insert (font_list, "lucida");
+	eel_string_list_insert (font_list, "GTK System Font");
+	eel_string_list_insert (font_list, "fixed");
+	eel_string_list_insert (font_list, "helvetica");
+	eel_string_list_insert (font_list, "times");
+	eel_string_list_insert (font_list, "courier");
+	eel_string_list_insert (font_list, "lucida");
 
-	nautilus_string_picker_set_string_list (NAUTILUS_STRING_PICKER (item->details->child), font_list);
-	nautilus_string_list_free (font_list);
+	eel_string_picker_set_string_list (EEL_STRING_PICKER (item->details->child), font_list);
+	eel_string_list_free (font_list);
 
 	item->details->change_signal_ID = gtk_signal_connect (GTK_OBJECT (item->details->child),
 							      "changed",
@@ -649,23 +649,23 @@ preferences_item_update_smooth_font (NautilusPreferencesItem *item)
  	current_value = nautilus_preferences_get (item->details->preference_name);
  	g_assert (current_value != NULL);
 
- 	nautilus_font_picker_set_selected_font (NAUTILUS_FONT_PICKER (item->details->child),
+ 	eel_font_picker_set_selected_font (EEL_FONT_PICKER (item->details->child),
 						current_value);
  	g_free (current_value);
 }
 
 static void
-preferences_smooth_font_changed_callback (NautilusFontPicker *font_picker,
+preferences_smooth_font_changed_callback (EelFontPicker *font_picker,
 					  gpointer callback_data)
 {
 	NautilusPreferencesItem *item;
  	char *new_value;
 
-	g_return_if_fail (NAUTILUS_IS_FONT_PICKER (font_picker));
+	g_return_if_fail (EEL_IS_FONT_PICKER (font_picker));
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (callback_data));
 
 	item = NAUTILUS_PREFERENCES_ITEM (callback_data);
- 	new_value = nautilus_font_picker_get_selected_font (NAUTILUS_FONT_PICKER (item->details->child));
+ 	new_value = eel_font_picker_get_selected_font (EEL_FONT_PICKER (item->details->child));
  	g_assert (new_value != NULL);
 	nautilus_preferences_set (item->details->preference_name, new_value);
  	g_free (new_value);
@@ -678,13 +678,13 @@ preferences_item_create_smooth_font (NautilusPreferencesItem *item,
 	char *description = NULL;
 
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
-	g_return_if_fail (nautilus_strlen (preference_name) > 0);
+	g_return_if_fail (eel_strlen (preference_name) > 0);
 
 	description = nautilus_preferences_get_description (preference_name);
 	g_return_if_fail (description != NULL);
 	
-	item->details->child = nautilus_font_picker_new ();
-	nautilus_caption_set_title_label (NAUTILUS_CAPTION (item->details->child),
+	item->details->child = eel_font_picker_new ();
+	eel_caption_set_title_label (EEL_CAPTION (item->details->child),
 					  description);
 	
 	g_free (description);
@@ -732,7 +732,7 @@ enum_radio_group_changed_callback (GtkWidget *buttons, GtkWidget * button, gpoin
 
 	g_assert (item->details->preference_name != NULL);
 
-	i = nautilus_radio_button_group_get_active_index (NAUTILUS_RADIO_BUTTON_GROUP (buttons));
+	i = eel_radio_button_group_get_active_index (EEL_RADIO_BUTTON_GROUP (buttons));
 	
 	nautilus_preferences_set_integer (item->details->preference_name,
 					  nautilus_preferences_enumeration_get_nth_value (item->details->preference_name, i));
@@ -760,14 +760,14 @@ font_item_changed_callback (GtkWidget *string_picker, gpointer user_data)
 	NautilusPreferencesItem *item;
 	char *selected_string;
 
-	g_return_if_fail (NAUTILUS_IS_STRING_PICKER (string_picker));
+	g_return_if_fail (EEL_IS_STRING_PICKER (string_picker));
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (user_data));
 
 	item = NAUTILUS_PREFERENCES_ITEM (user_data);
 
 	g_return_if_fail (item->details->preference_name != NULL);
 
-	selected_string = nautilus_string_picker_get_selected_string (NAUTILUS_STRING_PICKER (string_picker));
+	selected_string = eel_string_picker_get_selected_string (EEL_STRING_PICKER (string_picker));
 	g_return_if_fail (selected_string != NULL);
 
 	nautilus_preferences_set (item->details->preference_name, selected_string);
@@ -786,7 +786,7 @@ editable_string_changed_callback (GtkWidget *button, gpointer user_data)
 	item = NAUTILUS_PREFERENCES_ITEM (user_data);
 
 	g_assert (item->details->child != NULL);
-	g_assert (NAUTILUS_IS_TEXT_CAPTION (item->details->child));
+	g_assert (EEL_IS_TEXT_CAPTION (item->details->child));
 
 	preferences_item_update_text_settings_at_idle (item);
 }
@@ -802,33 +802,33 @@ editable_integer_changed_callback (GtkWidget *button, gpointer user_data)
 	item = NAUTILUS_PREFERENCES_ITEM (user_data);
 
 	g_assert (item->details->child != NULL);
-	g_assert (NAUTILUS_IS_TEXT_CAPTION (item->details->child));
+	g_assert (EEL_IS_TEXT_CAPTION (item->details->child));
 
 	preferences_item_update_editable_integer_settings_at_idle (item);
 }
 
 static void
-constrained_integer_changed_callback (NautilusStringPicker *string_picker,
+constrained_integer_changed_callback (EelStringPicker *string_picker,
 				      NautilusPreferencesItem *item)
 {
  	char *selected_label;
 	int position;
 	int new_value;
 
-	g_return_if_fail (NAUTILUS_IS_STRING_PICKER (string_picker));
+	g_return_if_fail (EEL_IS_STRING_PICKER (string_picker));
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
 	g_return_if_fail (item->details->constrained_integer_values != NULL);
-	g_return_if_fail (nautilus_enumeration_get_num_entries (item->details->constrained_integer_values) > 0);
+	g_return_if_fail (eel_enumeration_get_num_entries (item->details->constrained_integer_values) > 0);
 	
- 	selected_label = nautilus_string_picker_get_selected_string (string_picker);
+ 	selected_label = eel_string_picker_get_selected_string (string_picker);
 	g_return_if_fail (selected_label != NULL);
 
-	position = nautilus_enumeration_get_entry_position (item->details->constrained_integer_values,
+	position = eel_enumeration_get_entry_position (item->details->constrained_integer_values,
 							    selected_label);
 	g_free (selected_label);
-	g_return_if_fail (position != NAUTILUS_STRING_LIST_NOT_FOUND);
+	g_return_if_fail (position != EEL_STRING_LIST_NOT_FOUND);
 
-	new_value = nautilus_enumeration_get_nth_value (item->details->constrained_integer_values,
+	new_value = eel_enumeration_get_nth_value (item->details->constrained_integer_values,
 							position);
 	
 	nautilus_preferences_set_integer (item->details->preference_name, new_value);
@@ -906,7 +906,7 @@ update_text_settings_at_idle (NautilusPreferencesItem *preferences_item)
 {
 	char *text;
 
-	text = nautilus_text_caption_get_text (NAUTILUS_TEXT_CAPTION (preferences_item->details->child));
+	text = eel_text_caption_get_text (EEL_TEXT_CAPTION (preferences_item->details->child));
 
 	if (text != NULL) {
 		nautilus_preferences_set (preferences_item->details->preference_name, text);
@@ -935,10 +935,10 @@ update_integer_settings_at_idle (NautilusPreferencesItem *preferences_item)
 	int value = 0;
 	char *text;
 
-	text = nautilus_text_caption_get_text (NAUTILUS_TEXT_CAPTION (preferences_item->details->child));
+	text = eel_text_caption_get_text (EEL_TEXT_CAPTION (preferences_item->details->child));
 
 	if (text != NULL) {
-		nautilus_eat_str_to_int (text, &value);
+		eel_eat_str_to_int (text, &value);
 	}
 	
 	nautilus_preferences_set_integer (preferences_item->details->preference_name, value);
@@ -965,7 +965,7 @@ nautilus_preferences_item_set_control_preference (NautilusPreferencesItem *prefe
 {
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (preferences_item));
 
-	if (nautilus_str_is_equal (preferences_item->details->control_preference_name,
+	if (eel_str_is_equal (preferences_item->details->control_preference_name,
 				   control_preference_name)) {
 		return;
 	}
@@ -1025,32 +1025,32 @@ nautilus_preferences_item_set_constrained_integer_values (NautilusPreferencesIte
 							  const char *values,
 							  const char *labels)
 {
-	NautilusStringList *entry_list;
+	EelStringList *entry_list;
 
 	g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item));
 	g_return_if_fail (item->details->item_type == NAUTILUS_PREFERENCE_ITEM_CONSTRAINED_INTEGER);
-	g_return_if_fail (nautilus_strlen (labels) > 0);
-	g_return_if_fail (nautilus_strlen (values) > 0);
-	g_return_if_fail (nautilus_str_count_characters (labels, ',')
-			  == nautilus_str_count_characters (values, ','));
+	g_return_if_fail (eel_strlen (labels) > 0);
+	g_return_if_fail (eel_strlen (values) > 0);
+	g_return_if_fail (eel_str_count_characters (labels, ',')
+			  == eel_str_count_characters (values, ','));
 
-	nautilus_enumeration_free (item->details->constrained_integer_values);
+	eel_enumeration_free (item->details->constrained_integer_values);
 	
-	item->details->constrained_integer_values = nautilus_enumeration_new_from_tokens (labels,
+	item->details->constrained_integer_values = eel_enumeration_new_from_tokens (labels,
 											  NULL,
 											  values,
 											  ",");
 
- 	g_return_if_fail (nautilus_enumeration_get_num_entries (item->details->constrained_integer_values) > 0);
+ 	g_return_if_fail (eel_enumeration_get_num_entries (item->details->constrained_integer_values) > 0);
 
-	entry_list = nautilus_enumeration_get_entries (item->details->constrained_integer_values);
+	entry_list = eel_enumeration_get_entries (item->details->constrained_integer_values);
 
  	g_return_if_fail (entry_list != NULL);
 
-	nautilus_string_picker_set_string_list (NAUTILUS_STRING_PICKER (item->details->child),
+	eel_string_picker_set_string_list (EEL_STRING_PICKER (item->details->child),
 						entry_list);
 
-	nautilus_string_list_free (entry_list);
+	eel_string_list_free (entry_list);
 
 	preferences_item_update_displayed_value (item);
 }
@@ -1060,7 +1060,7 @@ nautilus_preferences_item_child_is_caption (const NautilusPreferencesItem *item)
 {
 	g_return_val_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item), FALSE);
 
-	return NAUTILUS_IS_CAPTION (item->details->child);
+	return EEL_IS_CAPTION (item->details->child);
 }
 
 int
@@ -1072,7 +1072,7 @@ nautilus_preferences_item_get_caption_title_label_width (const NautilusPreferenc
 		return 0;
 	}
 
-	return nautilus_caption_get_title_label_width (NAUTILUS_CAPTION (item->details->child));
+	return eel_caption_get_title_label_width (EEL_CAPTION (item->details->child));
 }
 
 void
@@ -1086,7 +1086,7 @@ nautilus_preferences_item_set_caption_extra_spacing (NautilusPreferencesItem *it
 		return;
 	}
 
-	nautilus_caption_set_extra_spacing (NAUTILUS_CAPTION (item->details->child), 
+	eel_caption_set_extra_spacing (EEL_CAPTION (item->details->child), 
 					    extra_spacing);
 }
 
@@ -1101,5 +1101,5 @@ nautilus_preferences_item_update_showing (NautilusPreferencesItem *item)
 		shown = nautilus_preferences_item_get_control_showing (item);
 	}
 
-	nautilus_gtk_widget_set_shown (GTK_WIDGET (item), shown);
+	eel_gtk_widget_set_shown (GTK_WIDGET (item), shown);
 }