1 files changed, 52 insertions, 52 deletions

diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index ccbe10f8d..0c25dafe1 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -46,27 +46,27 @@
 #include <libgnomeui/gnome-uidefs.h>
 #include <libgnomevfs/gnome-vfs.h>
 #include <libnautilus-extensions/nautilus-customization-data.h>
-#include <libnautilus-extensions/nautilus-ellipsizing-label.h>
+#include <eel/eel-ellipsizing-label.h>
 #include <libnautilus-extensions/nautilus-entry.h>
 #include <libnautilus-extensions/nautilus-file-attributes.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gnome-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-icon-factory.h>
-#include <libnautilus-extensions/nautilus-image.h>
+#include <eel/eel-image.h>
 #include <libnautilus-extensions/nautilus-link.h>
 #include <libnautilus-extensions/nautilus-metadata.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-undo-signal-handlers.h>
 #include <libnautilus/nautilus-undo.h>
-#include <libnautilus-extensions/nautilus-wrap-table.h>
-#include <libnautilus-extensions/nautilus-labeled-image.h>
-#include <libnautilus-extensions/nautilus-viewport.h>
+#include <eel/eel-wrap-table.h>
+#include <eel/eel-labeled-image.h>
+#include <eel/eel-viewport.h>
 #include <string.h>
 
 static GHashTable *windows;
@@ -153,7 +153,7 @@ static void remove_pending_file                   (StartupData             *data
 						   gboolean                 cancel_timed_wait,
 						   gboolean                 cancel_destroy_handler);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (FMPropertiesWindow, fm_properties_window, GTK_TYPE_WINDOW)
+EEL_DEFINE_CLASS_BOILERPLATE (FMPropertiesWindow, fm_properties_window, GTK_TYPE_WINDOW)
 
 static void
 fm_properties_window_initialize_class (FMPropertiesWindowClass *class)
@@ -172,7 +172,7 @@ fm_properties_window_initialize (FMPropertiesWindow *window)
 {
 	window->details = g_new0 (FMPropertiesWindowDetails, 1);
 
-	nautilus_gtk_window_set_up_close_accelerator (GTK_WINDOW (window));
+	eel_gtk_window_set_up_close_accelerator (GTK_WINDOW (window));
 }
 
 typedef struct {
@@ -240,12 +240,12 @@ get_pixbuf_for_properties_window (NautilusFile *file)
 }
 
 static void
-update_properties_window_icon (NautilusImage *image)
+update_properties_window_icon (EelImage *image)
 {
 	GdkPixbuf	*pixbuf;
 	NautilusFile	*file;
 
-	g_assert (NAUTILUS_IS_IMAGE (image));
+	g_assert (EEL_IS_IMAGE (image));
 
 	file = gtk_object_get_data (GTK_OBJECT (image), "nautilus_file");
 
@@ -253,7 +253,7 @@ update_properties_window_icon (NautilusImage *image)
 	
 	pixbuf = get_pixbuf_for_properties_window (file);
 
-	nautilus_image_set_pixbuf (image, pixbuf);
+	eel_image_set_pixbuf (image, pixbuf);
 	
 	gdk_pixbuf_unref (pixbuf);
 }
@@ -266,9 +266,9 @@ create_image_widget_for_file (NautilusFile *file)
 	
 	pixbuf = get_pixbuf_for_properties_window (file);
 	
-	image = nautilus_image_new (NULL);
+	image = eel_image_new (NULL);
 
-	nautilus_image_set_pixbuf (NAUTILUS_IMAGE (image), pixbuf);
+	eel_image_set_pixbuf (EEL_IMAGE (image), pixbuf);
 
 	gdk_pixbuf_unref (pixbuf);
 
@@ -316,7 +316,7 @@ name_field_update_to_match_file (NautilusEntry *name_field)
 	 * aspect of the file might have), then don't clobber changes.
 	 */
 	current_name = nautilus_file_get_name (file);
-	if (nautilus_strcmp (original_name, current_name) != 0) {
+	if (eel_strcmp (original_name, current_name) != 0) {
 		gtk_object_set_data_full (GTK_OBJECT (name_field),
 					  "original_name",
 					  current_name,
@@ -503,11 +503,11 @@ property_button_toggled (GtkToggleButton *button)
 	} else {
 		if (word != NULL) {
 			keywords = g_list_remove_link (keywords, word);
-			nautilus_g_list_free_deep (word);
+			eel_g_list_free_deep (word);
 		}
 	}
 	nautilus_file_set_keywords (file, keywords);
-	nautilus_g_list_free_deep (keywords);
+	eel_g_list_free_deep (keywords);
 }
 
 static void
@@ -549,13 +549,13 @@ value_field_update_internal (GtkLabel *label,
 
 	g_assert (GTK_IS_LABEL (label));
 	g_assert (NAUTILUS_IS_FILE (file));
-	g_assert (!ellipsize_text || NAUTILUS_IS_ELLIPSIZING_LABEL (label));
+	g_assert (!ellipsize_text || EEL_IS_ELLIPSIZING_LABEL (label));
 
 	attribute_name = gtk_object_get_data (GTK_OBJECT (label), "file_attribute");
 	attribute_value = nautilus_file_get_string_attribute_with_default (file, attribute_name);
 
 	if (ellipsize_text) {
-		nautilus_ellipsizing_label_set_text (NAUTILUS_ELLIPSIZING_LABEL (label), 
+		eel_ellipsizing_label_set_text (EEL_ELLIPSIZING_LABEL (label), 
 						     attribute_value);
 	} else {
 		gtk_label_set_text (label, attribute_value);
@@ -587,11 +587,11 @@ attach_label (GtkTable *table,
 	GtkWidget *label_field;
 
 	label_field = ellipsize_text
-		? nautilus_ellipsizing_label_new (initial_text)
+		? eel_ellipsizing_label_new (initial_text)
 		: gtk_label_new (initial_text);	
 
 	if (bold) {
-		nautilus_gtk_label_make_bold (GTK_LABEL (label_field));
+		eel_gtk_label_make_bold (GTK_LABEL (label_field));
 	}
 	gtk_misc_set_alignment (GTK_MISC (label_field), right_aligned ? 1 : 0, 0.5);
 	gtk_widget_show (label_field);
@@ -689,7 +689,7 @@ group_change_callback (NautilusFile *file, GnomeVFSResult result, gpointer callb
 	g_assert (callback_data == NULL);
 	
 	/* Report the error if it's an error. */
-	nautilus_timed_wait_stop (cancel_group_change_callback, file);
+	eel_timed_wait_stop (cancel_group_change_callback, file);
 	fm_report_error_setting_group (file, result, NULL);
 	nautilus_file_unref (file);
 }
@@ -711,7 +711,7 @@ activate_group_callback (GtkMenuItem *menu_item, FileNamePair *pair)
 
 	/* Try to change file group. If this fails, complain to user. */
 	nautilus_file_ref (pair->file);
-	nautilus_timed_wait_start
+	eel_timed_wait_start
 		(cancel_group_change_callback,
 		 pair->file,
 		 _("Cancel Group Change?"),
@@ -733,7 +733,7 @@ create_group_menu_item (NautilusFile *file, const char *group_name)
 	menu_item = gtk_menu_item_new_with_label (group_name);
 	gtk_widget_show (menu_item);
 
-	nautilus_gtk_signal_connect_free_data_custom (GTK_OBJECT (menu_item),
+	eel_gtk_signal_connect_free_data_custom (GTK_OBJECT (menu_item),
 			    		       	      "activate",
 			    		       	      activate_group_callback,
 			    		       	      file_name_pair_new (file, group_name),
@@ -795,7 +795,7 @@ synch_groups_menu (GtkOptionMenu *option_menu, NautilusFile *file)
 	gtk_option_menu_set_history (option_menu, current_group_index);
 
 	g_free (current_group_name);
-	nautilus_g_list_free_deep (groups);
+	eel_g_list_free_deep (groups);
 }
 
 static GtkOptionMenu *
@@ -848,7 +848,7 @@ owner_change_callback (NautilusFile *file, GnomeVFSResult result, gpointer callb
 	g_assert (callback_data == NULL);
 	
 	/* Report the error if it's an error. */
-	nautilus_timed_wait_stop (cancel_owner_change_callback, file);
+	eel_timed_wait_stop (cancel_owner_change_callback, file);
 	fm_report_error_setting_owner (file, result, NULL);
 	nautilus_file_unref (file);
 }
@@ -873,7 +873,7 @@ activate_owner_callback (GtkMenuItem *menu_item, FileNamePair *pair)
 
 	/* Try to change file owner. If this fails, complain to user. */
 	nautilus_file_ref (pair->file);
-	nautilus_timed_wait_start
+	eel_timed_wait_start
 		(cancel_owner_change_callback,
 		 pair->file,
 		 _("Cancel Owner Change?"),
@@ -906,7 +906,7 @@ create_owner_menu_item (NautilusFile *file, const char *user_name)
 
 	gtk_widget_show (menu_item);
 
-	nautilus_gtk_signal_connect_free_data_custom (GTK_OBJECT (menu_item),
+	eel_gtk_signal_connect_free_data_custom (GTK_OBJECT (menu_item),
 			    		       	      "activate",
 			    		       	      activate_owner_callback,
 			    		       	      file_name_pair_new (file, name_array[0]),
@@ -968,7 +968,7 @@ synch_user_menu (GtkOptionMenu *option_menu, NautilusFile *file)
 	gtk_option_menu_set_history (option_menu, owner_index);
 
 	g_free (owner_name);
-	nautilus_g_list_free_deep (users);
+	eel_g_list_free_deep (users);
 }	
 
 static void
@@ -1552,13 +1552,13 @@ create_basic_page (FMPropertiesWindow *window)
 	 	temp_button = gtk_button_new_with_label (_("Select Custom Icon..."));
 		gtk_widget_show (temp_button);
 		gtk_box_pack_start (GTK_BOX (button_box), temp_button, FALSE, FALSE, 4);  
-		nautilus_gtk_button_set_standard_padding (GTK_BUTTON (temp_button));
+		eel_gtk_button_set_standard_padding (GTK_BUTTON (temp_button));
 		gtk_signal_connect(GTK_OBJECT (temp_button), "clicked", GTK_SIGNAL_FUNC (select_image_button_callback), window);
 	 	
 	 	temp_button = gtk_button_new_with_label (_("Remove Custom Icon"));
 		gtk_widget_show (temp_button);
 		gtk_box_pack_start (GTK_BOX(button_box), temp_button, FALSE, FALSE, 4);  
-		nautilus_gtk_button_set_standard_padding (GTK_BUTTON (temp_button));
+		eel_gtk_button_set_standard_padding (GTK_BUTTON (temp_button));
 	 	gtk_signal_connect (GTK_OBJECT (temp_button), "clicked", GTK_SIGNAL_FUNC (remove_image_button_callback), window);
 
 		window->details->remove_image_button = temp_button;
@@ -1592,7 +1592,7 @@ create_emblems_page (FMPropertiesWindow *window)
 	file = window->details->target_file;
 
 	/* The emblems wrapped table */
-	emblems_table = nautilus_wrap_table_new (TRUE);
+	emblems_table = eel_wrap_table_new (TRUE);
 
 	gtk_widget_show (emblems_table);
 	gtk_container_set_border_width (GTK_CONTAINER (emblems_table), GNOME_PAD);
@@ -1642,9 +1642,9 @@ create_emblems_page (FMPropertiesWindow *window)
 			continue;
 		}
 		
-		button = nautilus_labeled_image_check_button_new (label, pixbuf);
-		nautilus_labeled_image_set_fixed_image_height (NAUTILUS_LABELED_IMAGE (GTK_BIN (button)->child), STANDARD_EMBLEM_HEIGHT);
-		nautilus_labeled_image_set_spacing (NAUTILUS_LABELED_IMAGE (GTK_BIN (button)->child), EMBLEM_LABEL_SPACING);
+		button = eel_labeled_image_check_button_new (label, pixbuf);
+		eel_labeled_image_set_fixed_image_height (EEL_LABELED_IMAGE (GTK_BIN (button)->child), STANDARD_EMBLEM_HEIGHT);
+		eel_labeled_image_set_spacing (EEL_LABELED_IMAGE (GTK_BIN (button)->child), EMBLEM_LABEL_SPACING);
 		
 		g_free (label);
 		gdk_pixbuf_unref (pixbuf);
@@ -1689,7 +1689,7 @@ add_permissions_column_label (GtkTable *table,
 	GtkWidget *label;
 
 	label = gtk_label_new (title_text);
-	nautilus_gtk_label_make_bold (GTK_LABEL (label));
+	eel_gtk_label_make_bold (GTK_LABEL (label));
 	gtk_widget_set_sensitive (GTK_WIDGET (label), 
 				  nautilus_file_can_set_permissions (file));
 
@@ -2238,7 +2238,7 @@ create_properties_window_callback (NautilusFile *file, gpointer callback_data)
 	nautilus_undo_share_undo_manager (GTK_OBJECT (new_window),
 					  GTK_OBJECT (callback_data));
 #endif	
-	nautilus_gtk_window_present (GTK_WINDOW (new_window));
+	eel_gtk_window_present (GTK_WINDOW (new_window));
 }
 
 static void
@@ -2266,7 +2266,7 @@ remove_pending_file (StartupData *startup_data,
 			(startup_data->target_file, create_properties_window_callback, startup_data);
 	}
 	if (cancel_timed_wait) {
-		nautilus_timed_wait_stop 
+		eel_timed_wait_stop 
 			(cancel_create_properties_window_callback, startup_data);
 	}
 	if (cancel_destroy_handler) {
@@ -2292,19 +2292,19 @@ fm_properties_window_present (NautilusFile *original_file, FMDirectoryView *dire
 
 	/* Create the hash tables first time through. */
 	if (windows == NULL) {
-		windows = nautilus_g_hash_table_new_free_at_exit
+		windows = eel_g_hash_table_new_free_at_exit
 			(NULL, NULL, "property windows");
 	}
 	
 	if (pending_files == NULL) {
-		pending_files = nautilus_g_hash_table_new_free_at_exit
+		pending_files = eel_g_hash_table_new_free_at_exit
 			(NULL, NULL, "pending property window files");
 	}
 	
 	/* Look to see if there's already a window for this file. */
 	existing_window = g_hash_table_lookup (windows, original_file);
 	if (existing_window != NULL) {
-		nautilus_gtk_window_present (existing_window);
+		eel_gtk_window_present (existing_window);
 		return;
 	}
 
@@ -2328,7 +2328,7 @@ fm_properties_window_present (NautilusFile *original_file, FMDirectoryView *dire
 			    startup_data);
 
 	parent_window = gtk_widget_get_ancestor (GTK_WIDGET (directory_view), GTK_TYPE_WINDOW);
-	nautilus_timed_wait_start
+	eel_timed_wait_start
 		(cancel_create_properties_window_callback,
 		 startup_data,
 		 _("Cancel Showing Properties Window?"),
@@ -2355,7 +2355,7 @@ real_shutdown (GtkObject *object)
 	gtk_signal_disconnect (GTK_OBJECT (window->details->target_file), 
 			       window->details->file_changed_handler_id);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, shutdown, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, shutdown, (object));
 }
 
 static void
@@ -2384,7 +2384,7 @@ real_destroy (GtkObject *object)
 	/* Note that file_changed_handler_id is disconnected in shutdown,
 	 * and details are freed in finalize 
 	 */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void
@@ -2398,7 +2398,7 @@ real_finalize (GtkObject *object)
 	g_free (window->details->pending_name);
 	g_free (window->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, finalize, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, finalize, (object));
 }
 
 /* icon selection callback to set the image of the file object to the selected file */
@@ -2432,10 +2432,10 @@ select_image_button_callback (GtkWidget *widget, FMPropertiesWindow *properties_
 
 	g_assert (FM_IS_PROPERTIES_WINDOW (properties_window));
 
-	dialog = nautilus_gnome_icon_selector_new (_("Select an icon:"),
+	dialog = eel_gnome_icon_selector_new (_("Select an icon:"),
 						   NULL,
 						   GTK_WINDOW (properties_window),
-						   (NautilusIconSelectionFunction) set_icon_callback,
+						   (EelIconSelectionFunction) set_icon_callback,
 						   properties_window);						   
 }