Added new files.

2003-05-15  Alexander Larsson  <alexl@redhat.com>

	* libnautilus-private/Makefile.am:
	Added new files.

	* libnautilus-private/apps_nautilus_preferences.schemas.in:
	* libnautilus-private/nautilus-global-preferences.[ch]:
	New prefs for home and trash links.

	* libnautilus-private/nautilus-desktop-directory.[ch]:
	New files. Implements the NautilusDesktop object for the
	virtual x-nautilus-desktop: uri. The directory merges the contents
	of the directory with the real desktop directory.

	* libnautilus-private/nautilus-desktop-directory-file.[ch]:
	New files. Implements the Nautilusfile corresponding to
	NautilusDestkopDirectory.

	* libnautilus-private/nautilus-desktop-icon-file.[ch]:
	New files.
	Implement NautilusFile for a virtual file in a NautilusDesktopDirectory.
	Gets all the actual file data from a NautilusDesktopLink.

	* libnautilus-private/nautilus-desktop-link-monitor.[ch]:
	New files.
	Keep track of home and trash visibility prefs and mounted volumes and
	create/destroy corresponding NautilusDesktopLink object.

	* libnautilus-private/nautilus-desktop-link.[ch]:
	New files.
	Keeps track of all the real information in a desktop icon link.
	These are home, trash and volume links at the moment.

	* libnautilus-private/nautilus-directory-async.c:
	Indentation correction.

	* libnautilus-private/nautilus-directory.c:
	(nautilus_directory_new):
	Create NautilusDesktopDirectory objects for x-nautilus-desktop: uris

	* libnautilus-private/nautilus-dnd.c: (nautilus_drag_items_local):
	Handle NULL GnomeVFSURIs.
	(nautilus_drag_items_on_desktop): New function to check if items
	are on the desktop.
	(nautilus_drag_default_drop_action_for_icons):
	Special case desktop uris.
	(nautilus_drag_selection_includes_special_link):
	Convert from old-style special links to current.

	* libnautilus-private/nautilus-dnd.h:
	New function nautilus_drag_items_on_desktop.

	* libnautilus-private/nautilus-file-operations.c:
	(is_special_link), (nautilus_file_operations_copy_move):
	Convert from old-style special links to current.
	(nautilus_file_operations_delete):
	Special case desktop links

	* libnautilus-private/nautilus-file-utilities.[ch]:
	(nautilus_get_desktop_directory):
	(nautilus_get_gmc_desktop_directory):
	Change desktop dir to ~/Desktop
	(nautilus_get_desktop_directory_uri):
	New function to return desktop dir as a uri.


	* libnautilus-private/nautilus-file.c:
	(nautilus_file_new_from_relative_uri),
	(nautilus_file_get_internal):
	Handle creation of desktop icon files.
	(nautilus_file_can_rename), (rename_guts),
	(nautilus_file_get_drop_target_uri):
	Update for new special links.
	(nautilus_file_is_in_desktop):
	Update for new desktop dir.
	(nautilus_file_get_uri):
	Fix uris for self owned files. This changed due to
	the new canonicalization rules for foo:


	* libnautilus-private/nautilus-icon-dnd.c:
	(nautilus_icon_container_selection_items_local),
	(handle_nonlocal_move):
	Handle desktop uri.

	* src/Nautilus_shell.server.in:
	icon view handles x-nautilus-desktop: uris

	* src/nautilus-application.c: (finish_startup):
	Initialize the desktop link monitor

	* src/nautilus-desktop-window.c:
	(nautilus_desktop_window_update_directory):
	Show x-nautilus-desktop:

	* src/file-manager/fm-desktop-icon-view.c:
	(fm_desktop_icon_view_finalize), (fm_desktop_icon_view_init),
	(volume_ops_callback), (trash_link_is_selection),
	(volume_link_is_selection), (volume_link_device_type),
	(real_supports_zooming):

	* src/file-manager/fm-directory-view.c:
	Remove lots of old support for desktop icon.
	Reimplement some of it with the new desktop icon support.

	* src/file-manager/fm-directory-view.h:
	New function fm_directory_view_get_backing_uri

	* src/file-manager/fm-icon-container.c:
	(fm_icon_container_get_icon_text):
	Don't show extra text for desktop icons
	(get_sort_category): Update for new desktop icons

	* src/file-manager/fm-icon-view.c: (icon_view_handle_uri_list):
	Use get_backing_uri()

	* src/file-manager/fm-properties-window.c: (get_target_file):
	Use the new desktop icon support.

	* libnautilus-private/nautilus-icon-container.c:
	(lay_down_icons_tblr):
	Don't loop forever if icon doesn't in the height of the container.

1 files changed, 344 insertions, 0 deletions

diff --git a/libnautilus-private/nautilus-desktop-icon-file.c b/libnautilus-private/nautilus-desktop-icon-file.c
new file mode 100644
index 000000000..79a4cf195
--- /dev/null
+++ b/libnautilus-private/nautilus-desktop-icon-file.c
@@ -0,0 +1,344 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
+
+   nautilus-desktop-icon-file.c: Subclass of NautilusFile to help implement the
+   virtual desktop icons.
+ 
+   Copyright (C) 2003 Red Hat, Inc.
+  
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+  
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+  
+   You should have received a copy of the GNU General Public
+   License along with this program; if not, write to the
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+  
+   Author: Alexander Larsson <alexl@redhat.com>
+*/
+
+#include <config.h>
+#include "nautilus-desktop-icon-file.h"
+
+#include "nautilus-directory-notify.h"
+#include "nautilus-directory-private.h"
+#include "nautilus-file-attributes.h"
+#include "nautilus-file-private.h"
+#include "nautilus-file-utilities.h"
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include "nautilus-desktop-directory.h"
+#include <gtk/gtksignal.h>
+#include <libgnome/gnome-i18n.h>
+#include <libgnomevfs/gnome-vfs.h>
+#include <string.h>
+
+struct NautilusDesktopIconFileDetails {
+	NautilusDesktopLink *link;
+};
+
+static void nautilus_desktop_icon_file_init       (gpointer   object,
+						   gpointer   klass);
+static void nautilus_desktop_icon_file_class_init (gpointer   klass);
+
+EEL_CLASS_BOILERPLATE (NautilusDesktopIconFile,
+		       nautilus_desktop_icon_file,
+		       NAUTILUS_TYPE_FILE)
+
+static void
+desktop_icon_file_monitor_add (NautilusFile *file,
+			       gconstpointer client,
+			       NautilusFileAttributes attributes)
+{
+	nautilus_directory_monitor_add_internal
+		(file->details->directory, file,
+		 client, TRUE, TRUE, attributes, NULL, NULL);
+}
+
+static void
+desktop_icon_file_monitor_remove (NautilusFile *file,
+				  gconstpointer client)
+{
+	nautilus_directory_monitor_remove_internal
+		(file->details->directory, file, client);
+}
+
+
+static void
+desktop_icon_file_call_when_ready (NautilusFile *file,
+				   NautilusFileAttributes attributes,
+				   NautilusFileCallback callback,
+				   gpointer callback_data)
+
+{
+	nautilus_directory_call_when_ready_internal
+		(file->details->directory, file,
+		 attributes, FALSE, NULL, callback, callback_data);
+}
+
+static void
+desktop_icon_file_cancel_call_when_ready (NautilusFile *file,
+					  NautilusFileCallback callback,
+					  gpointer callback_data)
+{
+	nautilus_directory_cancel_callback_internal
+		(file->details->directory, file,
+		 NULL, callback, callback_data);
+}
+
+static gboolean
+desktop_icon_file_check_if_ready (NautilusFile *file,
+				  NautilusFileAttributes attributes)
+{
+	return nautilus_directory_check_if_ready_internal
+		(file->details->directory, file,
+		 attributes);
+}
+
+static GnomeVFSFileType
+desktop_icon_file_get_file_type (NautilusFile *file)
+{
+	return GNOME_VFS_FILE_TYPE_REGULAR;
+}			      
+
+static gboolean
+desktop_icon_file_get_item_count (NautilusFile *file, 
+				  guint *count,
+				  gboolean *count_unreadable)
+{
+	if (count != NULL) {
+		*count = 0;
+	}
+	if (count_unreadable != NULL) {
+		*count_unreadable = FALSE;
+	}
+	return TRUE;
+}
+
+static NautilusRequestStatus
+desktop_icon_file_get_deep_counts (NautilusFile *file,
+				   guint *directory_count,
+				   guint *file_count,
+				   guint *unreadable_directory_count,
+				   GnomeVFSFileSize *total_size)
+{
+	if (directory_count != NULL) {
+		*directory_count = 0;
+	}
+	if (file_count != NULL) {
+		*file_count = 0;
+	}
+	if (unreadable_directory_count != NULL) {
+		*unreadable_directory_count = 0;
+	}
+	if (total_size != NULL) {
+		*total_size = 0;
+	}
+
+	return NAUTILUS_REQUEST_DONE;
+}
+
+static gboolean
+desktop_icon_file_get_date (NautilusFile *file,
+			    NautilusDateType date_type,
+			    time_t *date)
+{
+	NautilusDesktopIconFile *desktop_file;
+
+	desktop_file = NAUTILUS_DESKTOP_ICON_FILE (file);
+
+	return nautilus_desktop_link_get_date (desktop_file->details->link,
+					       date_type, date);
+}
+
+static char *
+desktop_icon_file_get_where_string (NautilusFile *file)
+{
+	return g_strdup (_("on the desktop"));
+}
+
+static void
+nautilus_desktop_icon_file_init (gpointer object, gpointer klass)
+{
+	NautilusDesktopIconFile *desktop_file;
+
+	desktop_file = NAUTILUS_DESKTOP_ICON_FILE (object);
+
+	desktop_file->details = g_new0 (NautilusDesktopIconFileDetails, 1);
+}	
+
+static void
+update_info_from_link (NautilusDesktopIconFile *icon_file)
+{
+	NautilusFile *file;
+	GnomeVFSFileInfo *file_info;
+	NautilusDesktopLink *link;
+	
+	file = NAUTILUS_FILE (icon_file);
+	
+	link = icon_file->details->link;
+
+	if (link == NULL) {
+		return;
+	}
+	
+	file_info = file->details->info;
+
+	gnome_vfs_file_info_clear (file_info);
+
+	file_info->name = nautilus_desktop_link_get_file_name (link);
+	file_info->mime_type = g_strdup ("application/x-nautilus-link");
+	file_info->type = GNOME_VFS_FILE_TYPE_REGULAR;
+	file_info->flags = GNOME_VFS_FILE_FLAGS_NONE;
+	file_info->link_count = 1;
+	file_info->size = 0;
+	
+	file_info->valid_fields = GNOME_VFS_FILE_INFO_FIELDS_TYPE |
+		GNOME_VFS_FILE_INFO_FIELDS_FLAGS |
+		GNOME_VFS_FILE_INFO_FIELDS_MIME_TYPE |
+		GNOME_VFS_FILE_INFO_FIELDS_SIZE |
+		GNOME_VFS_FILE_INFO_FIELDS_LINK_COUNT;
+	
+	file->details->file_info_is_up_to_date = TRUE;
+
+	g_free (file->details->display_name);
+	file->details->display_name = nautilus_desktop_link_get_display_name (link);
+	g_free (file->details->custom_icon);
+	file->details->custom_icon = nautilus_desktop_link_get_icon (link);
+	g_free (file->details->activation_uri);
+	file->details->activation_uri = nautilus_desktop_link_get_activation_uri (link);
+	file->details->got_link_info = TRUE;
+	file->details->link_info_is_up_to_date = TRUE;
+
+	file->details->directory_count = 0;
+	file->details->got_directory_count = TRUE;
+	file->details->directory_count_is_up_to_date = TRUE;
+}
+
+void
+nautilus_desktop_icon_file_update (NautilusDesktopIconFile *icon_file)
+{
+	NautilusFile *file;
+	
+	update_info_from_link (icon_file);
+	file = NAUTILUS_FILE (icon_file);
+	nautilus_file_clear_cached_display_name (file);
+	nautilus_file_changed (file);
+}
+
+void
+nautilus_desktop_icon_file_remove (NautilusDesktopIconFile *icon_file)
+{
+	NautilusFile *file;
+	GList list;
+
+	icon_file->details->link = NULL;
+
+	file = NAUTILUS_FILE (icon_file);
+	
+	/* ref here because we might be removing the last ref when we
+	 * mark the file gone below, but we need to keep a ref at
+	 * least long enough to send the change notification. 
+	 */
+	nautilus_file_ref (file);
+	
+	file->details->is_gone = TRUE;
+	
+	list.data = file;
+	list.next = NULL;
+	list.prev = NULL;
+	
+	nautilus_directory_remove_file (file->details->directory, file);
+	nautilus_directory_emit_change_signals (file->details->directory, &list);
+	
+	nautilus_file_unref (file);
+}
+
+
+NautilusDesktopIconFile *
+nautilus_desktop_icon_file_new (NautilusDesktopLink *link)
+{
+	NautilusFile *file;
+	NautilusDirectory *directory;
+	NautilusDesktopIconFile *icon_file;
+	char *name;
+	GList list;
+	
+	directory = nautilus_directory_get (EEL_DESKTOP_URI);
+
+	file = NAUTILUS_FILE (g_object_new (NAUTILUS_TYPE_DESKTOP_ICON_FILE, NULL));
+
+#ifdef NAUTILUS_FILE_DEBUG_REF
+	printf("%10p ref'd\n", file);
+	eazel_dump_stack_trace ("\t", 10);
+#endif
+
+	nautilus_directory_ref (directory);
+	file->details->directory = directory;
+
+	icon_file = NAUTILUS_DESKTOP_ICON_FILE (file);
+	icon_file->details->link = link;
+
+	file->details->info = gnome_vfs_file_info_new ();
+	name = nautilus_desktop_link_get_file_name (link);
+	file->details->relative_uri = gnome_vfs_escape_string (name);
+	g_free (name);
+
+	update_info_from_link (icon_file);
+	
+	nautilus_directory_add_file (directory, file);
+
+	list.data = file;
+	list.next = NULL;
+	list.prev = NULL;
+	nautilus_directory_emit_files_added (directory, &list);
+
+	return icon_file;
+}
+
+NautilusDesktopLink *
+nautilus_desktop_icon_file_get_link (NautilusDesktopIconFile *icon_file)
+{
+	return g_object_ref (icon_file->details->link);
+}
+
+static void
+desktop_finalize (GObject *object)
+{
+	NautilusDesktopIconFile *desktop_file;
+
+	desktop_file = NAUTILUS_DESKTOP_ICON_FILE (object);
+
+	g_free (desktop_file->details);
+
+	EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
+}
+
+static void
+nautilus_desktop_icon_file_class_init (gpointer klass)
+{
+	GObjectClass *object_class;
+	NautilusFileClass *file_class;
+
+	object_class = G_OBJECT_CLASS (klass);
+	file_class = NAUTILUS_FILE_CLASS (klass);
+	
+	object_class->finalize = desktop_finalize;
+
+	file_class->monitor_add = desktop_icon_file_monitor_add;
+	file_class->monitor_remove = desktop_icon_file_monitor_remove;
+	file_class->call_when_ready = desktop_icon_file_call_when_ready;
+	file_class->cancel_call_when_ready = desktop_icon_file_cancel_call_when_ready;
+	file_class->check_if_ready = desktop_icon_file_check_if_ready;
+	file_class->get_file_type = desktop_icon_file_get_file_type;
+	file_class->get_item_count = desktop_icon_file_get_item_count;
+	file_class->get_deep_counts = desktop_icon_file_get_deep_counts;
+	file_class->get_date = desktop_icon_file_get_date;
+	file_class->get_where_string = desktop_icon_file_get_where_string;
+}