Remove some unused bonobo extensions.BONOBO_SLAY_STEP1_DONE

2004-11-09  Alexander Larsson  <alexl@redhat.com>

	* libnautilus-private/nautilus-bonobo-extensions.[ch]:
	Remove some unused bonobo extensions.

	* libnautilus-private/Makefile.am:
	* src/nautilus-navigation-window.c:
	* src/nautilus-property-browser.c:
	* src/nautilus-spatial-window.c:
	* src/nautilus-window.c:
	* libnautilus-private/nautilus-drag-window.[ch]:
	Remove NautilusDragWindow (not used anyway)

10 files changed, 13 insertions, 663 deletions

diff --git a/ChangeLog b/ChangeLog
index 05dbc313a..28ae01af6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2004-11-09  Alexander Larsson  <alexl@redhat.com>
 
+	* libnautilus-private/nautilus-bonobo-extensions.[ch]:
+	Remove some unused bonobo extensions.
+	
+	* libnautilus-private/Makefile.am:
+	* src/nautilus-navigation-window.c:
+	* src/nautilus-property-browser.c:
+	* src/nautilus-spatial-window.c:
+	* src/nautilus-window.c:
+	* libnautilus-private/nautilus-drag-window.[ch]:
+	Remove NautilusDragWindow (not used anyway)
+
+2004-11-09  Alexander Larsson  <alexl@redhat.com>
+
 	* configure.in:
 	* libnautilus-private/Makefile.am:
 	* libnautilus-private/nautilus-directory-async.c:
diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am
index 8a29c7833..705ca8da5 100644
--- a/libnautilus-private/Makefile.am
+++ b/libnautilus-private/Makefile.am
@@ -94,8 +94,6 @@ libnautilus_private_la_SOURCES = \
 	nautilus-directory.h \
 	nautilus-dnd.c \
 	nautilus-dnd.h \
-	nautilus-drag-window.c \
-	nautilus-drag-window.h \
 	nautilus-emblem-utils.c \
 	nautilus-emblem-utils.h \
 	nautilus-entry.c \
diff --git a/libnautilus-private/nautilus-bonobo-extensions.c b/libnautilus-private/nautilus-bonobo-extensions.c
index 9aacb5201..4353b1415 100644
--- a/libnautilus-private/nautilus-bonobo-extensions.c
+++ b/libnautilus-private/nautilus-bonobo-extensions.c
@@ -659,216 +659,6 @@ nautilus_bonobo_add_extension_toolbar_item (BonoboUIComponent *ui,
 	g_free (item_xml);
 }
 
-static void
-activation_handle_done (NautilusBonoboActivationHandle *handle)
-{
-	if (handle->early_completion_hook != NULL) {
-		g_assert (*handle->early_completion_hook == handle);
-		*handle->early_completion_hook = NULL;
-	}
-}
-
-static void
-activation_handle_free (NautilusBonoboActivationHandle *handle)
-{
-	activation_handle_done (handle);
-	
-	if (handle->activated_object != NULL) {
-		bonobo_object_release_unref (handle->activated_object, NULL);
-	}
-	
-	g_free (handle);
-}
-
-static GHashTable *nautilus_activation_shortcuts = NULL;
-
-struct CreateObjectData {
-	NautilusBonoboCreateObject create_object;
-	gpointer callback_data;
-};
-
-void
-nautilus_bonobo_register_activation_shortcut (const char                       *iid,
-					      NautilusBonoboCreateObject        create_object_callback,
-					      gpointer                          callback_data)
-{
-	struct CreateObjectData *data;
-	
-	if (nautilus_activation_shortcuts == NULL) {
-		nautilus_activation_shortcuts = g_hash_table_new_full
-			(g_str_hash, g_str_equal, g_free, g_free);
-		eel_debug_call_at_shutdown_with_data ((GFreeFunc)g_hash_table_destroy,
-						      nautilus_activation_shortcuts);
-	}
-
-	data = g_new (struct CreateObjectData, 1);
-	data->create_object = create_object_callback;
-	data->callback_data = callback_data;
-	g_hash_table_insert (nautilus_activation_shortcuts,
-			     g_strdup (iid), data);
-}
-
-void
-nautilus_bonobo_unregister_activation_shortcut (const char *iid)
-{
-	if (nautilus_activation_shortcuts == NULL) {
-		g_assert_not_reached ();
-		return;
-	}
-	g_hash_table_remove (nautilus_activation_shortcuts, iid);
-}
-
-static gboolean
-activation_idle_callback (gpointer callback_data)
-{
-	NautilusBonoboActivationHandle *handle;
-	
-	handle = (NautilusBonoboActivationHandle *) callback_data;
-
-	(* handle->callback) (handle,
-			      handle->activated_object,
-			      handle->callback_data);
-
-	activation_handle_free (handle);
-
-	return FALSE;
-}
-
-static void
-activation_cancel (NautilusBonoboActivationHandle *handle)
-{
-	activation_handle_free (handle);
-}
-
-static void
-bonobo_activation_activation_callback (Bonobo_Unknown activated_object, 
-				       const char *error_reason, 
-				       gpointer callback_data)
-{
-	NautilusBonoboActivationHandle *handle;
-
-	handle = (NautilusBonoboActivationHandle *) callback_data;
-
-	if (handle->timeout_id != 0) {
-		g_source_remove (handle->timeout_id);
-	}
-
-	if (activated_object == NULL) {
-		g_warning ("activation failed: %s", error_reason);
-	}
-
-	handle->activated_object = activated_object;
-
-	if (handle->cancel) {
-		activation_cancel (handle);
-	} else {
-		handle->idle_id = g_idle_add (activation_idle_callback,
-					      handle);
-	}
-}
-
-static gboolean
-activation_timed_out (gpointer callback_data)
-{
-	NautilusBonoboActivationHandle *handle = callback_data;
-
-	(* handle->callback) (handle,
-			      NULL,
-			      handle->callback_data);
-	
-	handle->timeout_id = 0;
-	nautilus_bonobo_activate_cancel (handle);
-	return FALSE;
-}
-
-/**
- * nautilus_bonobo_activate_from_id:
- * @iid: iid of component to activate.
- * @callback: callback to call when activation finished.
- * @user_data: data to pass to callback when activation finished.
- *
- * This function will return NULL if something bad happened during 
- * activation.
- */
-NautilusBonoboActivationHandle *
-nautilus_bonobo_activate_from_id (const char *iid,
-				  NautilusBonoboActivationCallback callback,
-				  gpointer callback_data)
-{
-	NautilusBonoboActivationHandle *handle;
-	struct CreateObjectData *data;
-	CORBA_Object activated_object;
-	
-	g_return_val_if_fail (iid != NULL, NULL);
-	g_return_val_if_fail (callback != NULL, NULL);
-
-	handle = g_new0 (NautilusBonoboActivationHandle, 1);
-
-	handle->early_completion_hook = &handle;
-	handle->callback = callback;
-	handle->callback_data = callback_data;
-
-	handle->activated_object = CORBA_OBJECT_NIL;
-	
-	if (nautilus_activation_shortcuts != NULL) {
-		data = g_hash_table_lookup (nautilus_activation_shortcuts, iid);
-		if (data != NULL) {
-			activated_object = (*data->create_object) (iid, data->callback_data);
-			if (activated_object != CORBA_OBJECT_NIL) {
-				handle->activated_object = activated_object;
-				handle->early_completion_hook = NULL;
-				handle->idle_id = g_idle_add (activation_idle_callback,
-							      handle);
-				return handle;
-			}
-		}
-	}
-
-	handle->timeout_id = g_timeout_add (4*1000, activation_timed_out, handle);
-	
-	bonobo_activation_activate_from_id_async ((char *) iid, 0,
-				    bonobo_activation_activation_callback, 
-				    handle, NULL);
-
-	if (handle != NULL) {
-		handle->early_completion_hook = NULL;
-	}
-	
-	return handle;
-}
-
-/**
- * nautilus_bonobo_activate_stop:
- * @iid: iid of component to activate.
- * @callback: callback to call when activation finished.
- * @user_data: data to pass to callback when activation finished.
- *
- * Stops activation of a component. Your callback will not be called
- * after this call.
- */
-void 
-nautilus_bonobo_activate_cancel (NautilusBonoboActivationHandle *handle)
-{
-	if (handle == NULL) {
-		return;
-	}
-
-	if (handle->timeout_id != 0) {
-		g_source_remove (handle->timeout_id);
-		handle->timeout_id = 0;
-	}
-	
-	activation_handle_done (handle);
-
-	if (handle->idle_id == 0) {
-		/* no way to cancel the underlying bonobo-activation call, so we just set a flag */
-		handle->cancel = TRUE;
-	} else {
-		g_source_remove (handle->idle_id);
-		activation_cancel (handle);
-	}
-}
-
 Bonobo_RegistrationResult
 nautilus_bonobo_activation_register_for_display (const char    *iid,
 						 Bonobo_Unknown ref)
diff --git a/libnautilus-private/nautilus-bonobo-extensions.h b/libnautilus-private/nautilus-bonobo-extensions.h
index 46c985150..19e180b04 100644
--- a/libnautilus-private/nautilus-bonobo-extensions.h
+++ b/libnautilus-private/nautilus-bonobo-extensions.h
@@ -115,14 +115,6 @@ void                            nautilus_bonobo_add_extension_item
 void                            nautilus_bonobo_add_extension_toolbar_item         (BonoboUIComponent                *ui,
 										    const char                       *path,
 										    NautilusMenuItem                 *item);
-void                            nautilus_bonobo_register_activation_shortcut       (const char                       *iid,
-										    NautilusBonoboCreateObject        create_object_callback,
-										    gpointer                          callback_data);
-void                            nautilus_bonobo_unregister_activation_shortcut     (const char                       *iid);
-NautilusBonoboActivationHandle *nautilus_bonobo_activate_from_id                   (const char                       *iid,
-										    NautilusBonoboActivationCallback  callback,
-										    gpointer                          callback_data);
-void                            nautilus_bonobo_activate_cancel                    (NautilusBonoboActivationHandle   *handle);
 Bonobo_RegistrationResult       nautilus_bonobo_activation_register_for_display    (const char                       *iid,
 										    Bonobo_Unknown                    ref);
 
diff --git a/libnautilus-private/nautilus-drag-window.c b/libnautilus-private/nautilus-drag-window.c
deleted file mode 100644
index 67771c35c..000000000
--- a/libnautilus-private/nautilus-drag-window.c
+++ /dev/null
@@ -1,393 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
-
-/*
- *  Nautilus
- *
- *  Copyright (C) 2001 Eazel, Inc.
- *
- *  Nautilus 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.
- *
- *  Nautilus 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *  Author: John Harper <jsh@eazel.com>
- *
- */
-
-/* Registering that a window may be used as a drag 'n drop source */
-
-#include <config.h>
-#include "nautilus-drag-window.h"
-
-#include <eel/eel-gdk-extensions.h>
-#include <gtk/gtk.h>
-#include <X11/Xatom.h>
-#include <gdk/gdkx.h>
-#include <gdk/gdkprivate.h>
-
-/* State for handling focus/raise */
-typedef struct NautilusDragWindowDetails NautilusDragWindowDetails;
-struct NautilusDragWindowDetails {
-	gboolean in_button_press;
-	gboolean pending_focus;
-	gboolean pending_raise;
-
-	Time focus_timestamp;
-
-	guint focus_timeout_tag;
-};
-	
-/* Delay in milliseconds between receiving a TAKE_FOCUS or RAISE_WINDOW
- * client message, and assuming that there's no following button-press
- * event. This seems to be large enough to work, but small enough to be
- * unnoticeable to the user.
- */
-#define WINDOW_FOCUS_TIMEOUT 50
-
-/* Key used to store a NautilusDragWindowDetails structure in each
- * registered window's object data hash
- */
-#define NAUTILUS_DRAG_WINDOW_DETAILS_KEY "nautilus-drag-window-details"
-
-/* Return the nearest ancestor of WIDGET that has type WIDGET_TYPE. But only
- * if there's no widget between the two with type BLOCKING_TYPE.
- */
-static GtkWidget *
-get_ancestor_blocked_by (GtkWidget *widget,
-			 GType      widget_type,
-			 GType      blocking_type)
-{
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
-
-	while (widget != NULL)
-	{
-		if (g_type_is_a (GTK_WIDGET_TYPE (widget), widget_type))
-			return widget;
-
-		else if (g_type_is_a (GTK_WIDGET_TYPE (widget), blocking_type))
-			return NULL;
-
-		widget = widget->parent;
-	}
-
-	return NULL;
-}
-
-/* Returns the details structure associated with WINDOW, or a null pointer
- * if no such structure exists
- */
-static NautilusDragWindowDetails *
-get_details (GtkWindow *window)
-{
-	NautilusDragWindowDetails *details;
-
-	details = g_object_get_data (G_OBJECT (window),
-				       NAUTILUS_DRAG_WINDOW_DETAILS_KEY);
-	return details;
-}
-
-/* Commit any pending focus/raise requests for WINDOW. */
-static void
-execute_pending_requests (GtkWindow *window,
-			  NautilusDragWindowDetails *details)
-{
-	if (GTK_WIDGET_REALIZED (window)) {
-		if (details->pending_focus) {
-			eel_gdk_window_focus (GTK_WIDGET (window)->window,
-						   details->focus_timestamp);
-			details->pending_focus = FALSE;
-		}
-		if (details->pending_raise) {
-			gdk_window_raise (GTK_WIDGET (window)->window);
-			details->pending_raise = FALSE;
-		}
-	}
-}
-
-/* Called when no button-press event arrived occurred shortly after
- * receiving a TAKE_FOCUS or RAISE_WINDOW request. So just commit
- * the pending requests.
- */
-static gint
-focus_timeout_callback (gpointer data)
-{
-	GtkWindow *window;
-	NautilusDragWindowDetails *details;
-
-	window = GTK_WINDOW (data);
-	details = get_details (window);
-
-	if (details != NULL) {
-		execute_pending_requests (window, details);
-
-		details->focus_timeout_tag = 0;
-	}
-
-	/* Only ever a one-shot timeout */
-	return FALSE;
-}
-
-
-static void
-remove_focus_timeout (GtkWindow *window)
-{
-	NautilusDragWindowDetails *details;
-
-	details = get_details (window);
-
-	if (details != NULL && details->focus_timeout_tag != 0) {
-		g_source_remove (details->focus_timeout_tag);
-		details->focus_timeout_tag = 0;
-	}
-}
-
-static void
-set_focus_timeout (GtkWindow *window)
-{
-	NautilusDragWindowDetails *details;
-
-	details = get_details (window);
-
-	if (details != NULL) {
-		remove_focus_timeout (window);
-		details->focus_timeout_tag
-		    = g_timeout_add (WINDOW_FOCUS_TIMEOUT,
-                                     focus_timeout_callback, window);
-	}
-}
-
-/* Called for all button-press events; sets the `in_button_press' flag */
-static gboolean
-button_press_emission_callback (GSignalInvocationHint *ihint,
-				guint n_params, const GValue *params,
-				gpointer data)
-{
-	GtkWidget *window;
-	NautilusDragWindowDetails *details;
-
-	/* This blocking is kind of a hack. But it seems necessary,
-	 * otherwise we can get duped into counting unbalanced
-	 * press/release events, which isn't healthy
-	 */
-        window = get_ancestor_blocked_by (GTK_WIDGET (g_value_get_object (&params[0])),
-					  GTK_TYPE_WINDOW,
-					  GTK_TYPE_MENU_SHELL);
-	if (window != NULL) {
-		details = get_details (GTK_WINDOW (window));
-		if (details != NULL) {
-			remove_focus_timeout (GTK_WINDOW (window));
-
-			if (!details->in_button_press) {
-				details->in_button_press = TRUE;
-			} else {
-				/* We never got the last button
-				 * release. Adapt.
-				 */
-				execute_pending_requests (GTK_WINDOW (window),
-							  details);
-				details->in_button_press = FALSE;
-			}
-		}
-	}
-
-	return TRUE;
-}
-
-/* Called for button-release events; commits any pending focus/raise */
-static gboolean
-button_release_emission_callback (GSignalInvocationHint *ihint,
-				  guint n_params, const GValue *params,
-				  gpointer data)
-{
-	GtkWidget *window;
-	NautilusDragWindowDetails *details;
-
-	window = get_ancestor_blocked_by (GTK_WIDGET (g_value_get_object (&params[0])),
-					  GTK_TYPE_WINDOW,
-					  GTK_TYPE_MENU_SHELL);
-	if (window != NULL) {
-		details = get_details (GTK_WINDOW (window));
-		if (details != NULL) {
-			execute_pending_requests (GTK_WINDOW (window),
-						  details);
-			details->in_button_press = FALSE;
-		}
-	}
-
-	return TRUE;
-}
-
-/* Called when a drag is started. If a drag-window is found above the
- * widget emitting the signal, cancel any pending focus/raise requests
- */
-static gboolean
-drag_begin_emission_callback (GSignalInvocationHint *ihint,
-			      guint n_params, const GValue *params,
-			      gpointer data)
-{
-	GtkWidget *window;
-	NautilusDragWindowDetails *details;
-
-        window = gtk_widget_get_toplevel (GTK_WIDGET (g_value_get_object (&params[0])));
-
-	if (window != NULL) {
-		details = get_details (GTK_WINDOW (window));
-		if (details != NULL) {
-
-			details->pending_focus = FALSE;
-			details->pending_raise = FALSE;
-		}
-	}
-
-	return TRUE;
-}
-
-/* The process-wide filter for WM_PROTOCOLS client messages */
-static GdkFilterReturn
-wm_protocols_filter (GdkXEvent *xev, GdkEvent *event, gpointer data)
-{
-	XEvent *xevent;
-	GtkWindow *window;
-	NautilusDragWindowDetails *details;
-
-	xevent = (XEvent *)xev;
-
-	gdk_window_get_user_data (event->any.window, (gpointer *) &window);
-	if (window != NULL) {
-		details = get_details (window);
-	} else {
-		details = NULL;
-	}
-
-	if ((Atom) xevent->xclient.data.l[0] == gdk_x11_get_xatom_by_name ("WM_DELETE_WINDOW")) {
-
-		/* (copied from gdkevents.c) */
-
-		/* The delete window request specifies a window
-		 *  to delete. We don't actually destroy the
-		 *  window because "it is only a request". (The
-		 *  window might contain vital data that the
-		 *  program does not want destroyed). Instead
-		 *  the event is passed along to the program,
-		 *  which should then destroy the window.
-		 */
-
-		event->any.type = GDK_DELETE;
-		return GDK_FILTER_TRANSLATE;
-
-	} else if ((Atom) xevent->xclient.data.l[0] == gdk_x11_get_xatom_by_name ("WM_TAKE_FOCUS")) {
-
-		if (details != NULL) {
-			details->pending_focus = TRUE;
-			details->focus_timestamp = xevent->xclient.data.l[1];
-
-			/* Wait to see if a button-press event
-			 * is received in the near future.
-			 */
-			set_focus_timeout (window);
-		}
-		return GDK_FILTER_REMOVE;
-
-	} else if ((Atom) xevent->xclient.data.l[0] == gdk_x11_get_xatom_by_name ("_SAWFISH_WM_RAISE_WINDOW")) {
-
-		if (details != NULL) {
-			details->pending_raise = TRUE;
-
-			/* Wait to see if a button-press event
-			 * is received in the near future.
-			 */
-			set_focus_timeout (window);
-		}
-		return GDK_FILTER_REMOVE;
-	}
-	else {
-		return GDK_FILTER_CONTINUE;
-	}
-}
-
-static void
-nautilus_drag_window_destroy (GtkObject *object, gpointer data)
-{
-	remove_focus_timeout (GTK_WINDOW (object));
-}
-
-static void
-nautilus_drag_window_realize (GtkWidget *widget, gpointer data)
-{
-	GdkAtom protocols[3];
-
-	/* Tell the window manager _not_ to focus this window by itself */
-	eel_gdk_window_set_wm_hints_input (widget->window, FALSE);
-
-	/* Set WM_PROTOCOLS to the usual two atoms plus something that tells
-	 * sawfish to send messages telling us when we might want to raise
-	 * the window. (This won't work with other wm's, but it won't
-	 * break anything either.)
-	 */
-        protocols[0] = gdk_atom_intern ("WM_DELETE_WINDOW", FALSE);
-        protocols[1] = gdk_atom_intern ("WM_TAKE_FOCUS", FALSE);
-        protocols[2] = gdk_atom_intern ("_NET_WM_PING", FALSE);
-	eel_gdk_window_set_wm_protocols (widget->window, protocols, 3);
-}
-
-/* Public entry point */
-
-/* initialize the instance's fields */
-void
-nautilus_drag_window_register (GtkWindow *window)
-{
-	static gboolean initialized = FALSE;
-
-	NautilusDragWindowDetails *details;
-	guint signal_id;
-
-        /* FIXME: This is disabled until we come up with a better
-         * way to do this. Havoc had some ideas.
-         */
-        return;
-        
-	if (!initialized) {
-		/* Add emission hooks for the signals we need to monitor
-		 */
-		signal_id = g_signal_lookup ("button_press_event",
-                                             GTK_TYPE_WIDGET);
-		g_signal_add_emission_hook (signal_id, 0,
-                                            button_press_emission_callback, NULL, NULL);
-		signal_id = g_signal_lookup ("button_release_event",
-                                             GTK_TYPE_WIDGET);
-		g_signal_add_emission_hook (signal_id, 0,
-                                            button_release_emission_callback, NULL, NULL);
-		signal_id = g_signal_lookup ("drag_begin",
-                                             GTK_TYPE_WIDGET);
-		g_signal_add_emission_hook (signal_id, 0,
-                                            drag_begin_emission_callback, NULL, NULL);
-
-		/* Override the standard GTK filter for handling WM_PROTOCOLS
-		 * client messages
-		 */
-		gdk_add_client_message_filter (gdk_atom_intern ("WM_PROTOCOLS", FALSE), 
-					       wm_protocols_filter, NULL);
-
-		initialized = TRUE;
-	}
-
-	details = g_new0 (NautilusDragWindowDetails, 1);
-
-	g_object_set_data_full (G_OBJECT (window),
-                                NAUTILUS_DRAG_WINDOW_DETAILS_KEY,
-                                details, g_free);
-
-	g_signal_connect (window, "realize",
-                          G_CALLBACK (nautilus_drag_window_realize), NULL);
-	g_signal_connect (window, "destroy",
-                          G_CALLBACK (nautilus_drag_window_destroy), NULL);
-}
diff --git a/libnautilus-private/nautilus-drag-window.h b/libnautilus-private/nautilus-drag-window.h
deleted file mode 100644
index 81e7a9c52..000000000
--- a/libnautilus-private/nautilus-drag-window.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
-
-/*
- *  Nautilus
- *
- *  Copyright (C) 2001 Eazel, Inc.
- *
- *  Nautilus 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.
- *
- *  Nautilus 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *  Author: John Harper <jsh@eazel.com>
- *
- */
-
-#ifndef NAUTILUS_DRAG_WINDOW_H
-#define NAUTILUS_DRAG_WINDOW_H
-
-#include <gtk/gtkwindow.h>
-
-/* Call this function before WINDOW has been realized. It will hook
- * into the window so that it automatically supports the correct focus
- * policy when dragging objects from within the window. (This policy is
- * *not* to focus or raise the window when the activating click is used
- * to drag something)
- */
-
-void nautilus_drag_window_register (GtkWindow *window);
-
-#endif /* NAUTILUS_DRAG_WINDOW_H */
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index 4fb227dce..40efce909 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -66,7 +66,6 @@
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libnautilus-private/nautilus-bonobo-extensions.h>
-#include <libnautilus-private/nautilus-drag-window.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
 #include <libnautilus-private/nautilus-file-attributes.h>
 #include <libnautilus-private/nautilus-global-preferences.h>
diff --git a/src/nautilus-property-browser.c b/src/nautilus-property-browser.c
index 03548c17c..e880488be 100644
--- a/src/nautilus-property-browser.c
+++ b/src/nautilus-property-browser.c
@@ -78,7 +78,6 @@
 #include <libgnomevfs/gnome-vfs.h>
 #include <libnautilus-private/nautilus-customization-data.h>
 #include <libnautilus-private/nautilus-directory.h>
-#include <libnautilus-private/nautilus-drag-window.h>
 #include <libnautilus-private/nautilus-emblem-utils.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
 #include <libnautilus-private/nautilus-icon-factory.h>
@@ -438,9 +437,6 @@ nautilus_property_browser_init (GtkObject *object)
 
 	/* initially, display the top level */
 	nautilus_property_browser_set_path(property_browser, BROWSER_CATEGORIES_FILE_NAME);
-
-	/* Register that things may be dragged from this window */
-	nautilus_drag_window_register (GTK_WINDOW (property_browser));
 }
 
 /* Destroy the three dialogs for adding patterns/colors/emblems if any of them
diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c
index 761bac4d2..a5f94c07c 100644
--- a/src/nautilus-spatial-window.c
+++ b/src/nautilus-spatial-window.c
@@ -65,7 +65,6 @@
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libnautilus-private/nautilus-bonobo-extensions.h>
-#include <libnautilus-private/nautilus-drag-window.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
 #include <libnautilus-private/nautilus-file-attributes.h>
 #include <libnautilus-private/nautilus-global-preferences.h>
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index d25c18df9..3480c0518 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -65,7 +65,6 @@
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libnautilus-private/nautilus-bonobo-extensions.h>
-#include <libnautilus-private/nautilus-drag-window.h>
 #include <libnautilus-private/nautilus-file-utilities.h>
 #include <libnautilus-private/nautilus-file-attributes.h>
 #include <libnautilus-private/nautilus-global-preferences.h>
@@ -610,9 +609,6 @@ nautilus_window_constructed (NautilusWindow *window)
 	/* Set up undo manager */
 	nautilus_undo_manager_attach (window->application->undo_manager, G_OBJECT (window));	
 
-	/* Register that things may be dragged from this window */
-	nautilus_drag_window_register (GTK_WINDOW (window));
-
 	nautilus_window_ui_thaw (window);
 }