eel: remove eel-glib-extensions.h

Replace the eel_boolean_bit typedef with a plain guint and remove all
includes.

12 files changed, 43 insertions, 55 deletions

diff --git a/src/nautilus-column-utilities.c b/src/nautilus-column-utilities.c
index 113270548..d65c432b3 100644
--- a/src/nautilus-column-utilities.c
+++ b/src/nautilus-column-utilities.c
@@ -23,7 +23,6 @@
 #include "nautilus-column-utilities.h"
 
 #include <string.h>
-#include <eel/eel-glib-extensions.h>
 #include <glib/gi18n.h>
 #include <nautilus-extension.h>
 #include "nautilus-module.h"
diff --git a/src/nautilus-directory.c b/src/nautilus-directory.c
index 1a9947ff9..47cd222e1 100644
--- a/src/nautilus-directory.c
+++ b/src/nautilus-directory.c
@@ -21,7 +21,6 @@
 
 #include "nautilus-directory-private.h"
 
-#include <eel/eel-glib-extensions.h>
 #include <eel/eel-string.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
diff --git a/src/nautilus-file-operations.c b/src/nautilus-file-operations.c
index 357c627a5..831b6ed39 100644
--- a/src/nautilus-file-operations.c
+++ b/src/nautilus-file-operations.c
@@ -39,7 +39,6 @@
 
 #include "nautilus-progress-info.h"
 
-#include <eel/eel-glib-extensions.h>
 #include <eel/eel-vfs-extensions.h>
 #include <eel/eel-string.h>
 
diff --git a/src/nautilus-file-private.h b/src/nautilus-file-private.h
index d6a8895fa..d5d26c8b3 100644
--- a/src/nautilus-file-private.h
+++ b/src/nautilus-file-private.h
@@ -25,7 +25,6 @@
 #include "nautilus-file.h"
 #include "nautilus-monitor.h"
 #include "nautilus-file-undo-operations.h"
-#include <eel/eel-glib-extensions.h>
 
 #define NAUTILUS_FILE_DEFAULT_ATTRIBUTES				\
 	"standard::*,access::*,mountable::*,time::*,unix::*,owner::*,selinux::*,thumbnail::*,id::filesystem,trash::orig-path,trash::deletion-date,metadata::*,recent::*"
@@ -130,67 +129,67 @@ struct NautilusFileDetails
 	/* boolean fields: bitfield to save space, since there can be
            many NautilusFile objects. */
 
-	eel_boolean_bit unconfirmed                   : 1;
-	eel_boolean_bit is_gone                       : 1;
+	guint unconfirmed                   : 1;
+	guint is_gone                       : 1;
 	/* Set when emitting files_added on the directory to make sure we
 	   add a file, and only once */
-	eel_boolean_bit is_added                      : 1;
+	guint is_added                      : 1;
 	/* Set by the NautilusDirectory while it's loading the file
 	 * list so the file knows not to do redundant I/O.
 	 */
-	eel_boolean_bit loading_directory             : 1;
-	eel_boolean_bit got_file_info                 : 1;
-	eel_boolean_bit get_info_failed               : 1;
-	eel_boolean_bit file_info_is_up_to_date       : 1;
+	guint loading_directory             : 1;
+	guint got_file_info                 : 1;
+	guint get_info_failed               : 1;
+	guint file_info_is_up_to_date       : 1;
 	
-	eel_boolean_bit got_directory_count           : 1;
-	eel_boolean_bit directory_count_failed        : 1;
-	eel_boolean_bit directory_count_is_up_to_date : 1;
+	guint got_directory_count           : 1;
+	guint directory_count_failed        : 1;
+	guint directory_count_is_up_to_date : 1;
 
-	eel_boolean_bit deep_counts_status      : 2; /* NautilusRequestStatus */
+	guint deep_counts_status      : 2; /* NautilusRequestStatus */
 	/* no deep_counts_are_up_to_date field; since we expose
            intermediate values for this attribute, we do actually
            forget it rather than invalidating. */
 
-	eel_boolean_bit got_mime_list                 : 1;
-	eel_boolean_bit mime_list_failed              : 1;
-	eel_boolean_bit mime_list_is_up_to_date       : 1;
+	guint got_mime_list                 : 1;
+	guint mime_list_failed              : 1;
+	guint mime_list_is_up_to_date       : 1;
 
-	eel_boolean_bit mount_is_up_to_date           : 1;
+	guint mount_is_up_to_date           : 1;
 	
-	eel_boolean_bit got_custom_display_name       : 1;
+	guint got_custom_display_name       : 1;
 
-	eel_boolean_bit thumbnail_is_up_to_date       : 1;
-	eel_boolean_bit thumbnailing_failed           : 1;
+	guint thumbnail_is_up_to_date       : 1;
+	guint thumbnailing_failed           : 1;
 	
-	eel_boolean_bit is_thumbnailing               : 1;
+	guint is_thumbnailing               : 1;
 
-	eel_boolean_bit is_symlink                    : 1;
-	eel_boolean_bit is_mountpoint                 : 1;
-	eel_boolean_bit is_hidden                     : 1;
+	guint is_symlink                    : 1;
+	guint is_mountpoint                 : 1;
+	guint is_hidden                     : 1;
 
-	eel_boolean_bit has_permissions               : 1;
+	guint has_permissions               : 1;
 	
-	eel_boolean_bit can_read                      : 1;
-	eel_boolean_bit can_write                     : 1;
-	eel_boolean_bit can_execute                   : 1;
-	eel_boolean_bit can_delete                    : 1;
-	eel_boolean_bit can_trash                     : 1;
-	eel_boolean_bit can_rename                    : 1;
-	eel_boolean_bit can_mount                     : 1;
-	eel_boolean_bit can_unmount                   : 1;
-	eel_boolean_bit can_eject                     : 1;
-	eel_boolean_bit can_start                     : 1;
-	eel_boolean_bit can_start_degraded            : 1;
-	eel_boolean_bit can_stop                      : 1;
-	eel_boolean_bit start_stop_type               : 3; /* GDriveStartStopType */
-	eel_boolean_bit can_poll_for_media            : 1;
-	eel_boolean_bit is_media_check_automatic      : 1;
-
-	eel_boolean_bit filesystem_readonly           : 1;
-	eel_boolean_bit filesystem_use_preview        : 2; /* GFilesystemPreviewType */
-	eel_boolean_bit filesystem_info_is_up_to_date : 1;
-	eel_boolean_bit filesystem_remote             : 1;
+	guint can_read                      : 1;
+	guint can_write                     : 1;
+	guint can_execute                   : 1;
+	guint can_delete                    : 1;
+	guint can_trash                     : 1;
+	guint can_rename                    : 1;
+	guint can_mount                     : 1;
+	guint can_unmount                   : 1;
+	guint can_eject                     : 1;
+	guint can_start                     : 1;
+	guint can_start_degraded            : 1;
+	guint can_stop                      : 1;
+	guint start_stop_type               : 3; /* GDriveStartStopType */
+	guint can_poll_for_media            : 1;
+	guint is_media_check_automatic      : 1;
+
+	guint filesystem_readonly           : 1;
+	guint filesystem_use_preview        : 2; /* GFilesystemPreviewType */
+	guint filesystem_info_is_up_to_date : 1;
+	guint filesystem_remote             : 1;
 	GRefString     *filesystem_type;
 
 	time_t trash_time; /* 0 is unknown */
diff --git a/src/nautilus-file-utilities.c b/src/nautilus-file-utilities.c
index 6c2919a04..dd3367d49 100644
--- a/src/nautilus-file-utilities.c
+++ b/src/nautilus-file-utilities.c
@@ -32,7 +32,6 @@
 #include "nautilus-search-directory.h"
 #include "nautilus-starred-directory.h"
 #include "nautilus-ui-utilities.h"
-#include <eel/eel-glib-extensions.h>
 #include <eel/eel-string.h>
 #include <eel/eel-debug.h>
 #include <eel/eel-vfs-extensions.h>
diff --git a/src/nautilus-file.c b/src/nautilus-file.c
index 255ff285c..ab5074802 100644
--- a/src/nautilus-file.c
+++ b/src/nautilus-file.c
@@ -27,7 +27,6 @@
 #include <libnautilus-extension/nautilus-extension-private.h>
 
 #include <eel/eel-debug.h>
-#include <eel/eel-glib-extensions.h>
 #include <eel/eel-string.h>
 #include <eel/eel-vfs-extensions.h>
 #include <gdesktop-enums.h>
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index 9f5f2dbc3..84d8a855e 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -25,7 +25,6 @@
 
 #include "nautilus-files-view.h"
 
-#include <eel/eel-glib-extensions.h>
 #include <eel/eel-stock-dialogs.h>
 #include <eel/eel-string.h>
 #include <eel/eel-vfs-extensions.h>
diff --git a/src/nautilus-global-preferences.c b/src/nautilus-global-preferences.c
index 6bc991908..299d32717 100644
--- a/src/nautilus-global-preferences.c
+++ b/src/nautilus-global-preferences.c
@@ -26,7 +26,6 @@
 #include "nautilus-file-utilities.h"
 #include "nautilus-file.h"
 #include "src/nautilus-files-view.h"
-#include <eel/eel-glib-extensions.h>
 #include <eel/eel-stock-dialogs.h>
 #include <eel/eel-string.h>
 #include <glib/gi18n.h>
diff --git a/src/nautilus-progress-info.c b/src/nautilus-progress-info.c
index 521bd71ee..94c354fba 100644
--- a/src/nautilus-progress-info.c
+++ b/src/nautilus-progress-info.c
@@ -23,7 +23,6 @@
 #include <math.h>
 #include <glib/gi18n.h>
 #include <eel/eel-string.h>
-#include <eel/eel-glib-extensions.h>
 #include "nautilus-progress-info.h"
 #include "nautilus-progress-info-manager.h"
 #include "nautilus-icon-info.h"
diff --git a/src/nautilus-query.c b/src/nautilus-query.c
index e3b64c913..1a1b4cb2b 100644
--- a/src/nautilus-query.c
+++ b/src/nautilus-query.c
@@ -21,7 +21,6 @@
 
 #include "nautilus-query.h"
 
-#include <eel/eel-glib-extensions.h>
 #include <glib/gi18n.h>
 
 #include "nautilus-enum-types.h"
diff --git a/src/nautilus-search-directory-file.c b/src/nautilus-search-directory-file.c
index d118bab61..3725ed504 100644
--- a/src/nautilus-search-directory-file.c
+++ b/src/nautilus-search-directory-file.c
@@ -22,7 +22,6 @@
 
 #include "nautilus-search-directory-file.h"
 
-#include <eel/eel-glib-extensions.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <string.h>
diff --git a/src/nautilus-search-directory.c b/src/nautilus-search-directory.c
index 24545fa68..c1fb11c59 100644
--- a/src/nautilus-search-directory.c
+++ b/src/nautilus-search-directory.c
@@ -19,7 +19,6 @@
 
 #include "nautilus-search-directory.h"
 
-#include <eel/eel-glib-extensions.h>
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 #include <string.h>