From 4e04c0a008356c211468a44a3a15a43fd9fe4dbd Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Wed, 2 Apr 2003 11:51:14 +0000
Subject: Convert file attributes from list of strings to a bitmask. Patch from

2003-04-02  Alexander Larsson  <alexl@redhat.com>

	* components/notes/nautilus-notes.c:
	* components/tree/nautilus-tree-model.c:
	* components/tree/nautilus-tree-view.c:
	* libnautilus-private/nautilus-directory-async.c:
	* libnautilus-private/nautilus-directory-background.c:
	* libnautilus-private/nautilus-directory-private.h:
	* libnautilus-private/nautilus-directory.c:
	* libnautilus-private/nautilus-directory.h:
	* libnautilus-private/nautilus-file-attributes.h:
	* libnautilus-private/nautilus-file-private.h:
	* libnautilus-private/nautilus-file.c: (rename_callback),
	* libnautilus-private/nautilus-file.h:
	* libnautilus-private/nautilus-icon-factory.c:
	* libnautilus-private/nautilus-icon-factory.h:
	* libnautilus-private/nautilus-link.c:
	* libnautilus-private/nautilus-merged-directory.c:
	* libnautilus-private/nautilus-mime-actions.c:
	* libnautilus-private/nautilus-mime-actions.h:
	* libnautilus-private/nautilus-program-choosing.c:
	* libnautilus-private/nautilus-trash-file.c:
	* libnautilus-private/nautilus-trash-monitor.c:
	* libnautilus-private/nautilus-vfs-directory.c:
	* libnautilus-private/nautilus-vfs-file.c:
	* src/file-manager/fm-directory-view.c:
	* src/file-manager/fm-icon-container.c:
	* src/file-manager/fm-properties-window.c:
	* src/nautilus-applicable-views.c:
	* src/nautilus-information-panel.c:
	* src/nautilus-sidebar-title.c:
	* src/nautilus-window-manage-views.c:
	* src/nautilus-window.c:
	* test/test-nautilus-mime-actions-set.c:
	* test/test-nautilus-mime-actions.c:

	Convert file attributes from list of strings to a bitmask.
	Patch from andersca@codefactory.se.
---
 test/test-nautilus-mime-actions-set.c | 5 ++---
 test/test-nautilus-mime-actions.c     | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'test')

diff --git a/test/test-nautilus-mime-actions-set.c b/test/test-nautilus-mime-actions-set.c
index 4b2ed3234..e2f63ac0d 100644
--- a/test/test-nautilus-mime-actions-set.c
+++ b/test/test-nautilus-mime-actions-set.c
@@ -108,8 +108,8 @@ main (int argc, char **argv)
 	const char *field;
 	const char *value;
 	NautilusFile *file;
-	GList *attributes;
-
+	NautilusFileAttributes attributes;
+	
 	gnome_program_init ("test-nautilus-mime-actions-set", "0.0",
 			    LIBGNOMEUI_MODULE, argc, argv, NULL);
 
@@ -125,7 +125,6 @@ main (int argc, char **argv)
 
 	attributes = nautilus_mime_actions_get_full_file_attributes ();
 	nautilus_file_call_when_ready (file, attributes, ready_callback, NULL);
-	g_list_free (attributes);
 
 	while (!ready) {
 		gtk_main_iteration ();
diff --git a/test/test-nautilus-mime-actions.c b/test/test-nautilus-mime-actions.c
index 2cc31d8fe..1552f04fd 100644
--- a/test/test-nautilus-mime-actions.c
+++ b/test/test-nautilus-mime-actions.c
@@ -152,7 +152,7 @@ main (int argc, char **argv)
 	GList *short_list_components;
 	GList *short_list_applications;
 	NautilusFile *file;
-	GList *attributes;
+	NautilusFileAttributes attributes;
 
 	gnome_program_init ("test-nautilus-mime-actions", "0.0",
 			    LIBGNOMEUI_MODULE, argc, argv, NULL);
@@ -167,7 +167,6 @@ main (int argc, char **argv)
 
 	attributes = nautilus_mime_actions_get_full_file_attributes ();
 	nautilus_file_call_when_ready (file, attributes, ready_callback, NULL);
-	g_list_free (attributes);
 
 	while (!ready) {
 		gtk_main_iteration ();
-- 
cgit v1.2.1