Fix overeager search and replace of eel with nautilus. These functions got

	* libnautilus-extensions/nautilus-bookmark.c:
	(nautilus_bookmark_get_pixbuf), (nautilus_bookmark_get_icon),
	(nautilus_bookmark_icon_is_different),
	(nautilus_bookmark_update_icon),
	(nautilus_bookmark_set_icon_to_default),
	(nautilus_bookmark_disconnect_file),
	(nautilus_bookmark_new_with_icon):
	* libnautilus-extensions/nautilus-dateedit-extensions.c:
	(nautilus_gnome_date_edit_get_date_as_string):
	* libnautilus-extensions/nautilus-dateedit-extensions.h:
	* libnautilus-extensions/nautilus-icon-container.c:
	(nautilus_icon_container_update_icon):
	* libnautilus-extensions/nautilus-icon-factory.c:
	(cache_key_destroy), (nautilus_scalable_icon_get_text_pieces),
	(nautilus_scalable_icon_new_from_text_pieces),
	(nautilus_scalable_icon_ref), (nautilus_scalable_icon_unref),
	(nautilus_icon_factory_get_icon_for_file),
	(nautilus_icon_factory_get_emblem_icon_by_name),
	(get_icon_from_cache), (nautilus_icon_factory_get_pixbuf_for_file),
	(nautilus_icon_factory_get_pixbuf_from_name),
	(load_icon_with_embedded_text), (nautilus_scalable_icon_list_free):
	* libnautilus-extensions/nautilus-icon-factory.h:
	* libnautilus-extensions/nautilus-program-chooser.c:
	(launch_mime_capplet):
	* libnautilus-extensions/nautilus-program-choosing.c:
	(nautilus_launch_application),
	(nautilus_launch_application_from_command):
	* libnautilus-extensions/nautilus-program-choosing.h:
	* src/file-manager/fm-desktop-icon-view.c:
	(change_background_callback):
	* src/file-manager/fm-directory-view.c: (run_script_callback),
	(activate_callback):
	* src/file-manager/fm-list-view.c:
	(fm_list_view_get_emblem_pixbufs_for_file):
	* src/nautilus-bookmark-list.c: (append_bookmark_node):
	* src/nautilus-bookmark-parsing.c:
	(nautilus_bookmark_new_from_node):
	* src/nautilus-search-bar-criterion.c:
	(nautilus_search_bar_criterion_get_location):
	* src/nautilus-sidebar-title.c: (update_emblems):
	Fix overeager search and replace of eel with nautilus.  These
	functions got accidentally eel-ized.

9 files changed, 42 insertions, 42 deletions

diff --git a/libnautilus-private/nautilus-bookmark.c b/libnautilus-private/nautilus-bookmark.c
index 9c383e0ab..90774a74a 100644
--- a/libnautilus-private/nautilus-bookmark.c
+++ b/libnautilus-private/nautilus-bookmark.c
@@ -240,7 +240,7 @@ nautilus_bookmark_get_pixbuf (NautilusBookmark *bookmark,
 	
 	result = nautilus_icon_factory_get_pixbuf_for_icon
 		(icon, icon_size, icon_size, icon_size, icon_size, NULL, TRUE);
-	eel_scalable_icon_unref (icon);
+	nautilus_scalable_icon_unref (icon);
 	
 	return result;
 }
@@ -254,7 +254,7 @@ nautilus_bookmark_get_icon (NautilusBookmark *bookmark)
 	nautilus_bookmark_connect_file (bookmark);
 
 	if (bookmark->details->icon != NULL) {
-		eel_scalable_icon_ref (bookmark->details->icon);
+		nautilus_scalable_icon_ref (bookmark->details->icon);
 	}
 	return bookmark->details->icon;
 }
@@ -311,14 +311,14 @@ nautilus_bookmark_icon_is_different (NautilusBookmark *bookmark,
 	g_assert (new_icon != NULL);
 
 	/* Bookmarks only care about the uri and name. */
-	eel_scalable_icon_get_text_pieces 
+	nautilus_scalable_icon_get_text_pieces 
 		(new_icon, &new_uri, &new_name, NULL, NULL);
 
 	if (bookmark->details->icon == NULL) {
 		result = !eel_str_is_empty (new_uri)
 			|| !eel_str_is_empty (new_name);
 	} else {
-		eel_scalable_icon_get_text_pieces 
+		nautilus_scalable_icon_get_text_pieces 
 			(bookmark->details->icon, &old_uri, &old_name, NULL, NULL);
 
 		result = eel_strcmp (old_uri, new_uri) != 0
@@ -354,12 +354,12 @@ nautilus_bookmark_update_icon (NautilusBookmark *bookmark)
 								    NULL, FALSE);
 		if (nautilus_bookmark_icon_is_different (bookmark, new_icon)) {
 			if (bookmark->details->icon != NULL) {
-				eel_scalable_icon_unref (bookmark->details->icon);
+				nautilus_scalable_icon_unref (bookmark->details->icon);
 			}
 			bookmark->details->icon = new_icon;
 			return TRUE;
 		}
-		eel_scalable_icon_unref (new_icon);
+		nautilus_scalable_icon_unref (new_icon);
 	}
 
 	return FALSE;
@@ -426,7 +426,7 @@ nautilus_bookmark_set_icon_to_default (NautilusBookmark *bookmark)
 	const char *icon_name;
 
 	if (bookmark->details->icon != NULL) {
-		eel_scalable_icon_unref (bookmark->details->icon);
+		nautilus_scalable_icon_unref (bookmark->details->icon);
 	}
 
 	if (nautilus_bookmark_uri_known_not_to_exist (bookmark)) {
@@ -434,7 +434,7 @@ nautilus_bookmark_set_icon_to_default (NautilusBookmark *bookmark)
 	} else {
 		icon_name = GENERIC_BOOKMARK_ICON_NAME;
 	}
-	bookmark->details->icon = eel_scalable_icon_new_from_text_pieces 
+	bookmark->details->icon = nautilus_scalable_icon_new_from_text_pieces 
 		(NULL, icon_name, NULL, NULL, FALSE);
 }
 
@@ -472,7 +472,7 @@ nautilus_bookmark_disconnect_file (NautilusBookmark *bookmark)
 	}
 
 	if (bookmark->details->icon != NULL) {
-		eel_scalable_icon_unref (bookmark->details->icon);
+		nautilus_scalable_icon_unref (bookmark->details->icon);
 		bookmark->details->icon = NULL;
 	}
 }
@@ -520,7 +520,7 @@ nautilus_bookmark_new_with_icon (const char *uri, const char *name,
 	new_bookmark->details->uri = g_strdup (uri);
 
 	if (icon != NULL) {
-		eel_scalable_icon_ref (icon);
+		nautilus_scalable_icon_ref (icon);
 	}
 	new_bookmark->details->icon = icon;
 
diff --git a/libnautilus-private/nautilus-dateedit-extensions.c b/libnautilus-private/nautilus-dateedit-extensions.c
index 32080e679..0b0288ffd 100644
--- a/libnautilus-private/nautilus-dateedit-extensions.c
+++ b/libnautilus-private/nautilus-dateedit-extensions.c
@@ -31,7 +31,7 @@
 #include "nautilus-dateedit-extensions.h"
 
 char *
-eel_gnome_date_edit_get_date_as_string (GnomeDateEdit *dateedit)
+nautilus_gnome_date_edit_get_date_as_string (GnomeDateEdit *dateedit)
 {
 	struct tm *time_struct;
 	time_t selected_time;
diff --git a/libnautilus-private/nautilus-dateedit-extensions.h b/libnautilus-private/nautilus-dateedit-extensions.h
index 25176491e..01bc6ef66 100644
--- a/libnautilus-private/nautilus-dateedit-extensions.h
+++ b/libnautilus-private/nautilus-dateedit-extensions.h
@@ -28,4 +28,4 @@
 #include <time.h>
 #include <libgnomeui/gnome-dateedit.h>
 
-char *      eel_gnome_date_edit_get_date_as_string        (GnomeDateEdit *dateedit);
+char *      nautilus_gnome_date_edit_get_date_as_string        (GnomeDateEdit *dateedit);
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c
index 9daecc782..6bda841d1 100644
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@@ -3752,7 +3752,7 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container,
 		 &attach_points,
 		 TRUE);
 	
-	eel_scalable_icon_unref (scalable_icon);
+	nautilus_scalable_icon_unref (scalable_icon);
 
 	/*  in the rare case an image is too small, scale it up */
 	
@@ -3792,7 +3792,7 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container,
 		}
 	}
 	emblem_pixbufs = g_list_reverse (emblem_pixbufs);
-	eel_scalable_icon_list_free (emblem_scalable_icons);
+	nautilus_scalable_icon_list_free (emblem_scalable_icons);
 
 	/* Get both editable and non-editable icon text */
 	gtk_signal_emit (GTK_OBJECT (container),
diff --git a/libnautilus-private/nautilus-icon-factory.c b/libnautilus-private/nautilus-icon-factory.c
index abc1d247e..ebfbc2562 100644
--- a/libnautilus-private/nautilus-icon-factory.c
+++ b/libnautilus-private/nautilus-icon-factory.c
@@ -393,7 +393,7 @@ nautilus_icon_factory_initialize_class (NautilusIconFactoryClass *class)
 static void
 cache_key_destroy (CacheKey *key)
 {
-	eel_scalable_icon_unref (key->scalable_icon);
+	nautilus_scalable_icon_unref (key->scalable_icon);
 	g_free (key);
 }
 
@@ -1177,7 +1177,7 @@ mime_type_data_changed_callback (GnomeVFSMIMEMonitor *monitor, gpointer user_dat
 
 /* Decompose a scalable icon into its text pieces. */
 void
-eel_scalable_icon_get_text_pieces (NautilusScalableIcon *icon,
+nautilus_scalable_icon_get_text_pieces (NautilusScalableIcon *icon,
 				 	char **uri_return,
 				 	char **name_return,
 				 	char **modifier_return,
@@ -1201,7 +1201,7 @@ eel_scalable_icon_get_text_pieces (NautilusScalableIcon *icon,
 
 /* Get or create a scalable icon from text pieces. */
 NautilusScalableIcon *
-eel_scalable_icon_new_from_text_pieces (const char *uri,
+nautilus_scalable_icon_new_from_text_pieces (const char *uri,
 			    	      	     const char *name,
 			    	      	     const char *modifier,
 			    	      	     const char *embedded_text,
@@ -1249,12 +1249,12 @@ eel_scalable_icon_new_from_text_pieces (const char *uri,
 	}
 
 	/* Grab a reference and return it. */
-	eel_scalable_icon_ref (icon);
+	nautilus_scalable_icon_ref (icon);
 	return icon;
 }
 
 void
-eel_scalable_icon_ref (NautilusScalableIcon *icon)
+nautilus_scalable_icon_ref (NautilusScalableIcon *icon)
 {
 	g_return_if_fail (icon != NULL);
 
@@ -1262,7 +1262,7 @@ eel_scalable_icon_ref (NautilusScalableIcon *icon)
 }
 
 void
-eel_scalable_icon_unref (NautilusScalableIcon *icon)
+nautilus_scalable_icon_unref (NautilusScalableIcon *icon)
 {
 	GHashTable *hash_table;
 
@@ -1468,7 +1468,7 @@ nautilus_icon_factory_get_icon_for_file (NautilusFile *file, const char *modifie
 	top_left_text = nautilus_file_get_top_left_text (file);
 	
 	/* Create the icon or find it in the cache if it's already there. */
-	scalable_icon = eel_scalable_icon_new_from_text_pieces 
+	scalable_icon = nautilus_scalable_icon_new_from_text_pieces 
 		(uri, icon_name, modifier, top_left_text, anti_aliased);
 
 	g_free (uri);
@@ -1526,7 +1526,7 @@ nautilus_icon_factory_get_emblem_icon_by_name (const char *emblem_name, gboolean
 	char *name_with_prefix;
 
 	name_with_prefix = g_strconcat (EMBLEM_NAME_PREFIX, emblem_name, NULL);
-	scalable_icon = eel_scalable_icon_new_from_text_pieces 
+	scalable_icon = nautilus_scalable_icon_new_from_text_pieces 
 		(NULL, name_with_prefix, NULL, NULL, anti_aliased);
 	g_free (name_with_prefix);	
 
@@ -2179,7 +2179,7 @@ get_icon_from_cache (NautilusScalableIcon *scalable_icon,
 
 		/* Create the key and icon for the hash table. */
 		key = g_new (CacheKey, 1);
-		eel_scalable_icon_ref (scalable_icon);
+		nautilus_scalable_icon_ref (scalable_icon);
 		key->scalable_icon = scalable_icon;
 		key->size = *size;
 		
@@ -2323,7 +2323,7 @@ nautilus_icon_factory_get_pixbuf_for_file (NautilusFile *file,
 		 size_in_pixels, size_in_pixels,
 		 size_in_pixels, size_in_pixels,
 		 NULL, TRUE);
-	eel_scalable_icon_unref (icon);
+	nautilus_scalable_icon_unref (icon);
 
 	return pixbuf;
 }
@@ -2365,10 +2365,10 @@ GdkPixbuf * nautilus_icon_factory_get_pixbuf_from_name (const char *icon_name,
 	GdkPixbuf *pixbuf;
 	NautilusScalableIcon *icon;
 	
-	icon = eel_scalable_icon_new_from_text_pieces (NULL, icon_name, modifier, NULL, anti_aliased);
+	icon = nautilus_scalable_icon_new_from_text_pieces (NULL, icon_name, modifier, NULL, anti_aliased);
 	pixbuf = nautilus_icon_factory_get_pixbuf_for_icon (icon, size_in_pixels, size_in_pixels,
 							    size_in_pixels, size_in_pixels, NULL, TRUE); 	
-	eel_scalable_icon_unref (icon);	
+	nautilus_scalable_icon_unref (icon);	
 	return pixbuf;
 }
 									  
@@ -2486,7 +2486,7 @@ load_icon_with_embedded_text (NautilusScalableIcon *scalable_icon,
 	g_assert (scalable_icon->embedded_text != NULL);
 	
 	/* Get the icon without text. */
-	scalable_icon_without_text = eel_scalable_icon_new_from_text_pieces
+	scalable_icon_without_text = nautilus_scalable_icon_new_from_text_pieces
 		(scalable_icon->uri,
 		 scalable_icon->name,
 		 scalable_icon->modifier,
@@ -2495,7 +2495,7 @@ load_icon_with_embedded_text (NautilusScalableIcon *scalable_icon,
 	icon_without_text = get_icon_from_cache
 		(scalable_icon_without_text, size,
 		 FALSE, FALSE);
-	eel_scalable_icon_unref (scalable_icon_without_text);
+	nautilus_scalable_icon_unref (scalable_icon_without_text);
 	
 	/* Create a pixbuf with the text in it. */
 	pixbuf_with_text = embed_text (icon_without_text->pixbuf,
@@ -2521,10 +2521,10 @@ load_icon_with_embedded_text (NautilusScalableIcon *scalable_icon,
 
 /* Convenience function for unrefing and then freeing an entire list. */
 void
-eel_scalable_icon_list_free (GList *icon_list)
+nautilus_scalable_icon_list_free (GList *icon_list)
 {
 	eel_g_list_free_deep_custom
-		(icon_list, (GFunc) eel_scalable_icon_unref, NULL);
+		(icon_list, (GFunc) nautilus_scalable_icon_unref, NULL);
 }
 
 #if ! defined (NAUTILUS_OMIT_SELF_CHECK)
diff --git a/libnautilus-private/nautilus-icon-factory.h b/libnautilus-private/nautilus-icon-factory.h
index c52e0b41c..651eac6b4 100644
--- a/libnautilus-private/nautilus-icon-factory.h
+++ b/libnautilus-private/nautilus-icon-factory.h
@@ -155,22 +155,22 @@ GdkPixbuf *	      nautilus_icon_factory_get_pixbuf_from_name	 (const char
  * icon, you can compare two scalable icons to see if they are the same
  * with ==.
  */
-void                  eel_scalable_icon_ref                         (NautilusScalableIcon        *scalable_icon);
-void                  eel_scalable_icon_unref                       (NautilusScalableIcon        *scalable_icon);
+void                  nautilus_scalable_icon_ref                         (NautilusScalableIcon        *scalable_icon);
+void                  nautilus_scalable_icon_unref                       (NautilusScalableIcon        *scalable_icon);
 
 /* A scalable icon can be decomposed into text and reconstituted later
- * using eel_scalable_icon_new_from_text_pieces. This is the way 
+ * using nautilus_scalable_icon_new_from_text_pieces. This is the way 
  * to store scalable icons in metadata or other files.
  */
-void                  eel_scalable_icon_get_text_pieces             (NautilusScalableIcon        *scalable_icon,
+void                  nautilus_scalable_icon_get_text_pieces             (NautilusScalableIcon        *scalable_icon,
 									  char                       **uri_return,
 									  char                       **name_return,
 									  char                       **modifier_return,
 									  char                       **embedded_text_return);
 /* Get a scalable icon using the earlier results of
- * eel_scalable_icon_get_text_pieces.
+ * nautilus_scalable_icon_get_text_pieces.
  */
-NautilusScalableIcon *eel_scalable_icon_new_from_text_pieces        (const char                  *uri,
+NautilusScalableIcon *nautilus_scalable_icon_new_from_text_pieces        (const char                  *uri,
 									  const char                  *name,
 									  const char                  *modifier,
 									  const char                  *embedded_text,
@@ -179,6 +179,6 @@ NautilusScalableIcon *eel_scalable_icon_new_from_text_pieces        (const char
 /* Convenience function for freeing a list of scalable icons.
  * Unrefs all the icons before freeing the list.
  */
-void                  eel_scalable_icon_list_free                   (GList                       *scalable_icon_list);
+void                  nautilus_scalable_icon_list_free                   (GList                       *scalable_icon_list);
 
 #endif /* NAUTILUS_ICON_FACTORY_H */
diff --git a/libnautilus-private/nautilus-program-chooser.c b/libnautilus-private/nautilus-program-chooser.c
index fd317e998..ad514aa89 100644
--- a/libnautilus-private/nautilus-program-chooser.c
+++ b/libnautilus-private/nautilus-program-chooser.c
@@ -926,7 +926,7 @@ launch_mime_capplet (GtkWidget *button, gpointer callback_data)
 	
 	command = g_strdup_printf ("%s %s", FILE_TYPES_CAPPLET_NAME, (char *)callback_data);
 		
-	eel_launch_application_from_command (command, NULL, FALSE);
+	nautilus_launch_application_from_command (command, NULL, FALSE);
 	
 	g_free (command);
 }
diff --git a/libnautilus-private/nautilus-program-choosing.c b/libnautilus-private/nautilus-program-choosing.c
index d47f7a5ab..43c9cf0ea 100644
--- a/libnautilus-private/nautilus-program-choosing.c
+++ b/libnautilus-private/nautilus-program-choosing.c
@@ -584,7 +584,7 @@ nautilus_launch_application (GnomeVFSMimeApplication *application,
 	}
 	g_free (uri_scheme);
 
-	eel_launch_application_from_command (application->command,
+	nautilus_launch_application_from_command (application->command,
 						  parameter, 
 						  application->requires_terminal);
 
@@ -592,7 +592,7 @@ nautilus_launch_application (GnomeVFSMimeApplication *application,
 }
 
 /**
- * eel_launch_application_from_command:
+ * nautilus_launch_application_from_command:
  * 
  * Fork off a process to launch an application with a given uri as
  * a parameter.
@@ -602,7 +602,7 @@ nautilus_launch_application (GnomeVFSMimeApplication *application,
  * @parameter: Passed as a parameter to the application as is.
  */
 void
-eel_launch_application_from_command (const char *command_string, 
+nautilus_launch_application_from_command (const char *command_string, 
 					  const char *parameter, 
 					  gboolean    use_terminal)
 {
diff --git a/libnautilus-private/nautilus-program-choosing.h b/libnautilus-private/nautilus-program-choosing.h
index bfbeddd63..8d7c07904 100644
--- a/libnautilus-private/nautilus-program-choosing.h
+++ b/libnautilus-private/nautilus-program-choosing.h
@@ -53,7 +53,7 @@ void nautilus_cancel_choose_component_for_file   (NautilusFile
 void nautilus_launch_application                 (GnomeVFSMimeApplication           *application,
 						  NautilusFile                      *file,
 						  GtkWindow                         *parent_window);
-void eel_launch_application_from_command    (const char                        *command_string,
+void nautilus_launch_application_from_command    (const char                        *command_string,
 						  const char                        *parameter,
 						  gboolean                           use_terminal);