main/nautilus: purge

17 files changed, 0 insertions, 996 deletions

diff --git a/main/nautilus/001-filepeek-crash.patch b/main/nautilus/001-filepeek-crash.patch
deleted file mode 100644
index 82a210dd27..0000000000
--- a/main/nautilus/001-filepeek-crash.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From b10ccbc58d8d7f2ebb9ded079ec2a36e2f4603ad Mon Sep 17 00:00:00 2001
-From: Tomas Bzatek <tbzatek@redhat.com>
-Date: Thu, 27 Jan 2011 10:22:10 +0000
-Subject: Prevent a crash in nautilus_file_peek_display_name() on invalid NautilusFile
-
-This is more a workaround only, expect assert failures at other
-places when something bad happens. There's a race condition somewhere,
-this patch only prevents immediate crash.
-
-Patch by Marcus Husar <marcus.husar@rose.uni-heidelberg.de>
-
-https://bugzilla.gnome.org/show_bug.cgi?id=602500
----
-diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
-index 2c5b868..c854163 100644
---- a/libnautilus-private/nautilus-file.c
-+++ b/libnautilus-private/nautilus-file.c
-@@ -3780,6 +3780,9 @@ nautilus_file_peek_display_name (NautilusFile *file)
- 	const char *name;
- 	char *escaped_name;
- 
-+	if (file == NULL || nautilus_file_is_gone (file))
-+		return "";
-+
- 	/* Default to display name based on filename if its not set yet */
- 	
- 	if (file->details->display_name == NULL) {
---
-cgit v0.9
diff --git a/main/nautilus/002-automounting-locked-screen.patch b/main/nautilus/002-automounting-locked-screen.patch
deleted file mode 100644
index d8c0497ba9..0000000000
--- a/main/nautilus/002-automounting-locked-screen.patch
+++ /dev/null
@@ -1,326 +0,0 @@
-From b7262fa945ef1ea936c15f0d248ad7a024d97dca Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martin.pitt@ubuntu.com>
-Date: Tue, 22 Feb 2011 13:06:14 +0000
-Subject: disable automounting while screen is locked
-
-On the recent Shmoocon there was a presentation by Jon Larimer demonstrating
-how to abuse vulnerabilities and bugs, or even just creating socially or
-security compromising thumbnails in mounting and thumbnailing, which happens o
-automounting USB drives. This is a particular issue when this happens on a
-locked box where the attacker doesn't otherwise have access to the user
-account:
-
-  http://www.net-security.org/secworld.php?id=10544
-
-Disable automounting if the GNOME screen saver is currently locked.
-
-Backported from gnome-settings-daemon trunk commits 71deedf7 and 90c0f8676.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=642020
----
-diff --git a/src/nautilus-application.c b/src/nautilus-application.c
-index 08407a5..dfeaea6 100644
---- a/src/nautilus-application.c
-+++ b/src/nautilus-application.c
-@@ -116,6 +116,9 @@ static void     mount_added_callback              (GVolumeMonitor            *mo
- static void     volume_added_callback              (GVolumeMonitor           *monitor,
- 						    GVolume                  *volume,
- 						    NautilusApplication      *application);
-+static void     volume_removed_callback            (GVolumeMonitor           *monitor,
-+						    GVolume                  *volume,
-+						    NautilusApplication      *application);
- static void     drive_connected_callback           (GVolumeMonitor           *monitor,
- 						    GDrive                   *drive,
- 						    NautilusApplication      *application);
-@@ -347,6 +350,13 @@ nautilus_application_finalize (GObject *object)
- 
- 	g_object_unref (application->unique_app);
- 
-+	g_bus_unwatch_name (application->ss_watch_id);
-+
-+	if (application->volume_queue != NULL) {
-+		g_list_free_full (application->volume_queue, g_object_unref);
-+		application->volume_queue = NULL;
-+	}
-+
- 	if (application->automount_idle_id != 0) {
- 		g_source_remove (application->automount_idle_id);
- 		application->automount_idle_id = 0;
-@@ -357,6 +367,11 @@ nautilus_application_finalize (GObject *object)
- 		application->proxy = NULL;
- 	}
- 
-+	if (application->ss_proxy != NULL) {
-+		g_object_unref (application->ss_proxy);
-+		application->ss_proxy = NULL;
-+	}
-+
-         G_OBJECT_CLASS (nautilus_application_parent_class)->finalize (object);
- }
- 
-@@ -663,6 +678,182 @@ do_initialize_consolekit (NautilusApplication *application)
- }
- 
- static void
-+check_volume_queue (NautilusApplication *application)
-+{
-+        GList *l, *next;
-+        GVolume *volume;
-+
-+        l = application->volume_queue;
-+
-+        if (application->screensaver_active) {
-+                return;
-+        }
-+
-+        while (l != NULL) {
-+		volume = l->data;
-+		next = l->next;
-+
-+		nautilus_file_operations_mount_volume (NULL, volume, TRUE);
-+		application->volume_queue =
-+			g_list_remove (application->volume_queue, volume);
-+
-+		g_object_unref (volume);
-+		l = next;
-+        }
-+
-+        application->volume_queue = NULL;
-+}
-+
-+#define SCREENSAVER_NAME "org.gnome.ScreenSaver"
-+#define SCREENSAVER_PATH "/org/gnome/ScreenSaver"
-+#define SCREENSAVER_INTERFACE "org.gnome.ScreenSaver"
-+
-+static void
-+screensaver_signal_callback (GDBusProxy *proxy,
-+                             const gchar *sender_name,
-+                             const gchar *signal_name,
-+                             GVariant *parameters,
-+                             gpointer user_data)
-+{
-+	NautilusApplication *application = user_data;
-+
-+	if (g_strcmp0 (signal_name, "ActiveChanged") == 0) {
-+		g_variant_get (parameters, "(b)", &application->screensaver_active);
-+		nautilus_debug_log (FALSE, NAUTILUS_DEBUG_LOG_DOMAIN_USER,
-+			            "Screensaver active changed to %d", 
-+				    application->screensaver_active);
-+
-+		check_volume_queue (application);
-+	}
-+}
-+
-+static void
-+screensaver_get_active_ready_cb (GObject *source,
-+				 GAsyncResult *res,
-+				 gpointer user_data)
-+{
-+	NautilusApplication *application = user_data;
-+	GDBusProxy *proxy = application->ss_proxy;
-+	GVariant *result;
-+	GError *error = NULL;
-+
-+	result = g_dbus_proxy_call_finish (proxy,
-+					   res,
-+					   &error);
-+
-+	if (error != NULL) {
-+		g_warning ("Can't call GetActive() on the ScreenSaver object: %s",
-+			   error->message);
-+		g_error_free (error);
-+
-+		return;
-+	}
-+
-+	g_variant_get (result, "(b)", &application->screensaver_active);
-+	g_variant_unref (result);
-+
-+	nautilus_debug_log (FALSE, NAUTILUS_DEBUG_LOG_DOMAIN_USER,
-+			    "Screensaver GetActive() returned %d", 
-+			    application->screensaver_active);
-+}
-+
-+static void
-+screensaver_proxy_ready_cb (GObject *source,
-+			    GAsyncResult *res,
-+			    gpointer user_data)
-+{
-+	NautilusApplication *application = user_data;
-+	GError *error = NULL;
-+	GDBusProxy *ss_proxy;
-+
-+	ss_proxy = g_dbus_proxy_new_finish (res, &error);
-+
-+	if (error != NULL) {
-+		g_warning ("Can't get proxy for the ScreenSaver object: %s",
-+			   error->message);
-+		g_error_free (error);
-+
-+		return;
-+	}
-+
-+	nautilus_debug_log (FALSE, NAUTILUS_DEBUG_LOG_DOMAIN_USER,
-+			    "ScreenSaver proxy ready");
-+
-+	application->ss_proxy = ss_proxy;
-+
-+	g_signal_connect (ss_proxy, "g-signal",
-+			  G_CALLBACK (screensaver_signal_callback), application);
-+
-+	g_dbus_proxy_call (ss_proxy,
-+			   "GetActive",
-+			   NULL,
-+			   G_DBUS_CALL_FLAGS_NO_AUTO_START,
-+			   -1,
-+			   NULL,
-+			   screensaver_get_active_ready_cb,
-+			   application);
-+}
-+
-+static void
-+screensaver_appeared_callback (GDBusConnection *connection,
-+			       const gchar *name,
-+			       const gchar *name_owner,
-+			       gpointer user_data)
-+{
-+	NautilusApplication *application = user_data;
-+
-+	nautilus_debug_log (FALSE, NAUTILUS_DEBUG_LOG_DOMAIN_USER,
-+			    "ScreenSaver name appeared");
-+
-+	application->screensaver_active = FALSE;
-+
-+	g_dbus_proxy_new (connection,
-+			  G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
-+			  NULL,
-+			  name,
-+			  SCREENSAVER_PATH,
-+			  SCREENSAVER_INTERFACE,
-+			  NULL,
-+			  screensaver_proxy_ready_cb,
-+			  application);
-+}
-+
-+static void
-+screensaver_vanished_callback (GDBusConnection *connection,
-+			       const gchar *name,
-+			       gpointer user_data)
-+{
-+	NautilusApplication *application = user_data;
-+
-+	nautilus_debug_log (FALSE, NAUTILUS_DEBUG_LOG_DOMAIN_USER,
-+			    "ScreenSaver name vanished");
-+
-+	application->screensaver_active = FALSE;
-+	g_object_unref (&application->ss_proxy);
-+
-+	/* in this case force a clear of the volume queue, without
-+	 * mounting them.
-+	 */
-+	if (application->volume_queue != NULL) {
-+		g_list_free_full (application->volume_queue, g_object_unref);
-+		application->volume_queue = NULL;
-+	}
-+}
-+
-+static void
-+do_initialize_screensaver (NautilusApplication *application)
-+{
-+	application->ss_watch_id =
-+		g_bus_watch_name (G_BUS_TYPE_SESSION,
-+				  SCREENSAVER_NAME,
-+				  G_BUS_NAME_WATCHER_FLAGS_NONE,
-+				  screensaver_appeared_callback,
-+				  screensaver_vanished_callback,
-+				  application,
-+				  NULL);
-+}
-+
-+static void
- do_upgrades_once (NautilusApplication *application,
- 		  gboolean no_desktop)
- {
-@@ -709,6 +900,10 @@ finish_startup (NautilusApplication *application,
- 	/* Initialize the ConsoleKit listener for active session */
- 	do_initialize_consolekit (application);
- 
-+	/* Initialize GNOME screen saver listener to control automount
-+	 * permission */
-+	do_initialize_screensaver (application);
-+
- 	/* Watch for mounts so we can restore open windows This used
- 	 * to be for showing new window on mount, but is not used
- 	 * anymore */
-@@ -724,6 +919,8 @@ finish_startup (NautilusApplication *application,
- 				 G_CALLBACK (mount_added_callback), application, 0);
- 	g_signal_connect_object (application->volume_monitor, "volume_added",
- 				 G_CALLBACK (volume_added_callback), application, 0);
-+	g_signal_connect_object (application->volume_monitor, "volume_removed",
-+				 G_CALLBACK (volume_removed_callback), application, 0);
- 	g_signal_connect_object (application->volume_monitor, "drive_connected",
- 				 G_CALLBACK (drive_connected_callback), application, 0);
- 
-@@ -1520,6 +1717,35 @@ window_can_be_closed (NautilusWindow *window)
- }
- 
- static void
-+check_screen_lock_and_mount (NautilusApplication *application,
-+                             GVolume *volume)
-+{
-+        if (application->screensaver_active) {
-+                /* queue the volume, to mount it after the screensaver state changed */
-+                nautilus_debug_log (FALSE, NAUTILUS_DEBUG_LOG_DOMAIN_USER,
-+				    "Queuing volume %p", volume);
-+                application->volume_queue = g_list_prepend (application->volume_queue,
-+                                                              g_object_ref (volume));
-+        } else {
-+                /* mount it immediately */
-+		nautilus_file_operations_mount_volume (NULL, volume, TRUE);
-+        }
-+}
-+
-+static void
-+volume_removed_callback (GVolumeMonitor *monitor,
-+                         GVolume *volume,
-+                         NautilusApplication *application)
-+{
-+        nautilus_debug_log (FALSE, NAUTILUS_DEBUG_LOG_DOMAIN_USER,
-+			    "Volume %p removed, removing from the queue", volume);
-+
-+        /* clear it from the queue, if present */
-+        application->volume_queue =
-+                g_list_remove (application->volume_queue, volume);
-+}
-+
-+static void
- volume_added_callback (GVolumeMonitor *monitor,
- 		       GVolume *volume,
- 		       NautilusApplication *application)
-@@ -1527,7 +1753,7 @@ volume_added_callback (GVolumeMonitor *monitor,
- 	if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_MEDIA_AUTOMOUNT) &&
- 	    g_volume_should_automount (volume) &&
- 	    g_volume_can_mount (volume)) {
--		nautilus_file_operations_mount_volume (NULL, volume, TRUE);
-+		check_screen_lock_and_mount (application, volume);
- 	} else {
- 		/* Allow nautilus_autorun() to run. When the mount is later
- 		 * added programmatically (i.e. for a blank CD),
-diff --git a/src/nautilus-application.h b/src/nautilus-application.h
-index 36e53b6..d558932 100644
---- a/src/nautilus-application.h
-+++ b/src/nautilus-application.h
-@@ -68,6 +68,11 @@ typedef struct {
- 	unsigned int automount_idle_id;
- 	GDBusProxy *proxy;
- 	gboolean session_is_active;
-+
-+	gboolean screensaver_active;
-+	guint ss_watch_id;
-+	GDBusProxy *ss_proxy;
-+	GList *volume_queue;
- } NautilusApplication;
- 
- typedef struct {
---
-cgit v0.9
diff --git a/main/nautilus/003-filename-null.patch b/main/nautilus/003-filename-null.patch
deleted file mode 100644
index 56a32d9f44..0000000000
--- a/main/nautilus/003-filename-null.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 1df5a0ceb27f2cb4ef201344a558a3e961094cc4 Mon Sep 17 00:00:00 2001
-From: Rodrigo Moya <rodrigo@gnome-db.org>
-Date: Thu, 24 Feb 2011 16:47:29 +0000
-Subject: Guard against filename being NULL on nautilus_icon_info_lookup
-
----
-diff --git a/libnautilus-private/nautilus-icon-info.c b/libnautilus-private/nautilus-icon-info.c
-index f39ad42..97e88cb 100644
---- a/libnautilus-private/nautilus-icon-info.c
-+++ b/libnautilus-private/nautilus-icon-info.c
-@@ -392,6 +392,9 @@ nautilus_icon_info_lookup (GIcon *icon,
- 		}
- 
- 		filename = gtk_icon_info_get_filename (gtkicon_info);
-+		if (filename == NULL) {
-+			return nautilus_icon_info_new_for_pixbuf (NULL);
-+		}
- 
- 		lookup_key.filename = (char *)filename;
- 		lookup_key.size = size;
---
-cgit v0.9
diff --git a/main/nautilus/004-memory-leak.patch b/main/nautilus/004-memory-leak.patch
deleted file mode 100644
index ae9a069781..0000000000
--- a/main/nautilus/004-memory-leak.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 279509baf4872e58103768a53ca87918254767fc Mon Sep 17 00:00:00 2001
-From: Rodrigo Moya <rodrigo@gnome-db.org>
-Date: Fri, 25 Feb 2011 14:52:58 +0000
-Subject: Plug memory leak
-
----
-diff --git a/libnautilus-private/nautilus-icon-info.c b/libnautilus-private/nautilus-icon-info.c
-index 97e88cb..97f42fd 100644
---- a/libnautilus-private/nautilus-icon-info.c
-+++ b/libnautilus-private/nautilus-icon-info.c
-@@ -393,6 +393,7 @@ nautilus_icon_info_lookup (GIcon *icon,
- 
- 		filename = gtk_icon_info_get_filename (gtkicon_info);
- 		if (filename == NULL) {
-+			gtk_icon_info_free (gtkicon_info);
- 			return nautilus_icon_info_new_for_pixbuf (NULL);
- 		}
- 
---
-cgit v0.9
diff --git a/main/nautilus/005-gbus-assertion.patch b/main/nautilus/005-gbus-assertion.patch
deleted file mode 100644
index 44979d4311..0000000000
--- a/main/nautilus/005-gbus-assertion.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 9142d259dcaa6b011604cbd560b94ce31d314b88 Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martin.pitt@ubuntu.com>
-Date: Tue, 15 Mar 2011 13:59:27 +0000
-Subject: Fix g_bus_unwatch_name assertion
-
-Commit b7262fa9 caused
-
-  GLib-GIO-CRITICAL **: g_bus_unwatch_name: assertion `watcher_id > 0' failed
-
-when starting nautilus while it's already running. Guard the
-g_bus_unwatch_name() call to only run when we actually have set a watcher to
-the screensaver.
-
-https://launchpad.net/bugs/724285
----
-diff --git a/src/nautilus-application.c b/src/nautilus-application.c
-index dfeaea6..ab6ca0d 100644
---- a/src/nautilus-application.c
-+++ b/src/nautilus-application.c
-@@ -350,7 +350,9 @@ nautilus_application_finalize (GObject *object)
- 
- 	g_object_unref (application->unique_app);
- 
--	g_bus_unwatch_name (application->ss_watch_id);
-+	if (application->ss_watch_id > 0) {
-+		g_bus_unwatch_name (application->ss_watch_id);
-+	}
- 
- 	if (application->volume_queue != NULL) {
- 		g_list_free_full (application->volume_queue, g_object_unref);
---
-cgit v0.9
diff --git a/main/nautilus/006-select-extension.patch b/main/nautilus/006-select-extension.patch
deleted file mode 100644
index fc1615e622..0000000000
--- a/main/nautilus/006-select-extension.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 0fa8f53c89b84a47fac33eb923a5fb196ca564ee Mon Sep 17 00:00:00 2001
-From: Cosimo Cecchi <cosimoc@gnome.org>
-Date: Fri, 25 Feb 2011 20:11:46 +0000
-Subject: list-view: make sure not to select the extension on rename
-
-Delay calling gtk_editable_select_region() until after
-gtk_tree_view_set_cursor()
-
-https://bugzilla.gnome.org/show_bug.cgi?id=627110
-(cherry picked from commit 5e2edee2e8dc6b4eababdff993176d591cc2a6e6)
----
-diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c
-index 3f59959..cde5ac6 100644
---- a/src/file-manager/fm-list-view.c
-+++ b/src/file-manager/fm-list-view.c
-@@ -1172,7 +1172,6 @@ cell_renderer_editing_started_cb (GtkCellRenderer *renderer,
- 				  FMListView *list_view)
- {
- 	GtkEntry *entry;
--	gint start_offset, end_offset;
- 
- 	entry = GTK_ENTRY (editable);
- 	list_view->details->editable_widget = editable;
-@@ -1181,9 +1180,6 @@ cell_renderer_editing_started_cb (GtkCellRenderer *renderer,
- 	g_free (list_view->details->original_name);
- 
- 	list_view->details->original_name = g_strdup (gtk_entry_get_text (entry));
--	eel_filename_get_rename_region (list_view->details->original_name,
--					&start_offset, &end_offset);
--	gtk_editable_select_region (GTK_EDITABLE (entry), start_offset, end_offset);
- 
- 	nautilus_clipboard_set_up_editable
- 		(GTK_EDITABLE (entry),
-@@ -2644,6 +2640,7 @@ fm_list_view_start_renaming_file (FMDirectoryView *view,
- 	FMListView *list_view;
- 	GtkTreeIter iter;
- 	GtkTreePath *path;
-+	gint start_offset, end_offset;
- 	
- 	list_view = FM_LIST_VIEW (view);
- 	
-@@ -2679,6 +2676,15 @@ fm_list_view_start_renaming_file (FMDirectoryView *view,
- 				  list_view->details->file_name_column,
- 				  TRUE);
- 
-+	/* set cursor also triggers editing-started, where we save the editable widget */
-+	if (list_view->details->editable_widget != NULL) {
-+		eel_filename_get_rename_region (list_view->details->original_name,
-+						&start_offset, &end_offset);
-+
-+		gtk_editable_select_region (GTK_EDITABLE (list_view->details->editable_widget),
-+					    start_offset, end_offset);
-+	}
-+
- 	gtk_tree_path_free (path);
- }
- 
---
-cgit v0.9
diff --git a/main/nautilus/007-tracker0.10-compat.patch b/main/nautilus/007-tracker0.10-compat.patch
deleted file mode 100644
index fbac659369..0000000000
--- a/main/nautilus/007-tracker0.10-compat.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: nautilus-2.32.2/libnautilus-private/nautilus-search-engine-tracker.c
-===================================================================
---- nautilus-2.32.2.orig/libnautilus-private/nautilus-search-engine-tracker.c
-+++ nautilus-2.32.2/libnautilus-private/nautilus-search-engine-tracker.c
-@@ -122,10 +122,16 @@ open_libtracker (void)
- 		done = TRUE;
- 		flags = G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL;
- 
--		tracker = g_module_open ("libtracker-client-0.8.so.0", flags);
-+		tracker = g_module_open ("libtracker-client-0.10.so.0", flags);
-+		/* we use the same API as in 0.8 */
- 		version = TRACKER_0_8;
- 
- 		if (!tracker) {
-+			tracker = g_module_open ("libtracker-client-0.8.so.0", flags);
-+			version = TRACKER_0_8;
-+		}
-+
-+		if (!tracker) {
- 			tracker = g_module_open ("libtracker-client-0.7.so.0", flags);
- 
- 			if (tracker && !g_module_symbol (tracker, "tracker_resources_sparql_query_async", &x)) {
diff --git a/main/nautilus/009-default-directories.patch b/main/nautilus/009-default-directories.patch
deleted file mode 100644
index 336d3d0ae9..0000000000
--- a/main/nautilus/009-default-directories.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-
-++ nautilus-2.32.2.1/debian/patches/02_dont_set_default.patch
-
-# Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=637264
-# Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/662194
-# Description: hide checkbox to remember selection when opening folders
-diff --git a/libnautilus-private/nautilus-open-with-dialog.c b/libnautilus-private/nautilus-open-with-dialog.c
-index 357e20c..300a92c 100644
---- a/libnautilus-private/nautilus-open-with-dialog.c
-+++ b/libnautilus-private/nautilus-open-with-dialog.c
-@@ -864,7 +864,7 @@ nautilus_open_with_dialog_init (NautilusOpenWithDialog *dialog)
- 
- 	/* Add remember this application checkbox - only visible in open mode */
- 	dialog->details->checkbox = gtk_check_button_new ();
--	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->details->checkbox), TRUE);
-+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->details->checkbox), FALSE);
- 	gtk_button_set_use_underline (GTK_BUTTON (dialog->details->checkbox), TRUE);
- 	gtk_widget_show (GTK_WIDGET (dialog->details->checkbox));
- 	gtk_box_pack_start (GTK_BOX (vbox), dialog->details->checkbox, FALSE, FALSE, 0);
-@@ -1031,6 +1031,12 @@ set_uri_and_type (NautilusOpenWithDialog *dialog,
- 		gtk_label_set_text_with_mnemonic (GTK_LABEL (dialog->details->open_label),
- 						  _("_Add"));
- 		gtk_window_set_title (GTK_WINDOW (dialog), _("Add Application"));
-+	} else {
-+		if (g_str_equal (mime_type, "inode/directory")) {
-+			gtk_widget_hide (dialog->details->checkbox);
-+		} else {
-+			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->details->checkbox), TRUE);
-+		}
- 	}
- 
- 	gtk_label_set_markup (GTK_LABEL (dialog->details->label), label);
diff --git a/main/nautilus/010-localpath-preview.patch b/main/nautilus/010-localpath-preview.patch
deleted file mode 100644
index 736559ad92..0000000000
--- a/main/nautilus/010-localpath-preview.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From ebcbb167876f8b4491af0bc86bc29015c211b3af Mon Sep 17 00:00:00 2001
-From: Olivier Tilloy <olivier@tilloy.net>
-Date: Tue, 17 Aug 2010 11:42:36 +0000
-Subject: icon-view: if possible, use the local path for the preview (#624841)
-
-This solves issues where the audio previewer is not capable of
-understanding some GVfs URIs.
----
-diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c
-index 7277a9b..755ed8c 100644
---- a/src/file-manager/fm-icon-view.c
-+++ b/src/file-manager/fm-icon-view.c
-@@ -2027,6 +2027,8 @@ play_file (gpointer callback_data)
- 	char **argv;
- 	GError *error;
- 	char *uri;
-+	GFile *gfile;
-+	char *path;
- 
- 	icon_view = FM_ICON_VIEW (callback_data);
- 	
-@@ -2034,7 +2036,21 @@ play_file (gpointer callback_data)
- 	icon_view->details->audio_preview_timeout = 0;
- 
- 	file = icon_view->details->audio_preview_file;
--	uri = nautilus_file_get_uri (file);
-+	gfile = nautilus_file_get_location (file);
-+	path = g_file_get_path (gfile);
-+
-+	/* if we have a local path, use that instead of the native URI.
-+	 * this can be useful for special GVfs mounts, such as cdda://
-+	 */
-+	if (path) {
-+		uri = g_filename_to_uri (path, NULL, NULL);
-+	} else {
-+		uri = nautilus_file_get_uri (file);
-+	}
-+
-+	g_object_unref (gfile);
-+	g_free (path);
-+
- 	argv = get_preview_argv (uri);
- 	g_free (uri);
- 	if (argv == NULL) {
---
-cgit v0.9
diff --git a/main/nautilus/011-keyboard-navigation.patch b/main/nautilus/011-keyboard-navigation.patch
deleted file mode 100644
index 34425ac2ac..0000000000
--- a/main/nautilus/011-keyboard-navigation.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-
-++ nautilus-2.32.2.1/debian/patches/97_keyboard_nav_in_sidebar.patch
-
-From: Omer Akram <om26er@ubuntu.com>
-Author: Stefano Teso <stefano.teso@gmail.com>
-Subject: Places-sidebar: allow keyboard navigation with Enter/Space.
-Origin: http://git.gnome.org/browse/nautilus/commit/?id=fd03c910a73ba18459e68baaf15e8dd295acd5c1
-Bug: https://bugs.gnome.org/637768
-Bug-Ubuntu: https://launchpad.net/bugs/649993
-
---- a//src/nautilus-places-sidebar.c	2010-12-28 20:54:38.000000000 +0500
-+++ b//src/nautilus-places-sidebar.c	2011-02-28 12:15:11.096777018 +0500
-@@ -2198,6 +2198,30 @@
- 
-   modifiers = gtk_accelerator_get_default_mod_mask ();
- 
-+  if ((event->keyval == GDK_KEY_Return ||
-+       event->keyval == GDK_KEY_KP_Enter ||
-+       event->keyval == GDK_KEY_ISO_Enter ||
-+       event->keyval == GDK_KEY_space)) {
-+
-+      GtkTreeModel *model;
-+      GtkTreePath *path;
-+      NautilusWindowOpenFlags flags = 0;
-+
-+      if ((event->state & modifiers) == GDK_SHIFT_MASK) {
-+          flags = NAUTILUS_WINDOW_OPEN_FLAG_NEW_TAB;
-+      } else if ((event->state & modifiers) == GDK_CONTROL_MASK) {
-+          flags = NAUTILUS_WINDOW_OPEN_FLAG_NEW_WINDOW;
-+      }
-+
-+      model = gtk_tree_view_get_model (sidebar->tree_view);
-+      gtk_tree_view_get_cursor (sidebar->tree_view, &path, NULL);
-+
-+      open_selected_bookmark (sidebar, model, path, flags);
-+
-+      gtk_tree_path_free (path);
-+      return TRUE;
-+  }
-+
-   if (event->keyval == GDK_Down &&
-       (event->state & modifiers) == GDK_MOD1_MASK) {
-       return eject_or_unmount_selection (sidebar);
diff --git a/main/nautilus/APKBUILD b/main/nautilus/APKBUILD
deleted file mode 100644
index c83e84eaa9..0000000000
--- a/main/nautilus/APKBUILD
+++ /dev/null
@@ -1,121 +0,0 @@
-# Contributor: William Pitcock <nenolod@dereferenced.org>
-# Maintainer: William Pitcock <nenolod@dereferenced.org>
-pkgname=nautilus
-pkgver=2.32.2.1
-pkgrel=3
-pkgdesc="GNOME file manager"
-url="http://projects.gnome.org/nautilus"
-arch="all"
-license="GPL"
-depends="zenity"
-depends_dev="gtk+-dev
-	     gconf-dev
-	     libx11-dev
-	     gnome-doc-utils
-	     libgnome-dev
-	     gnome-desktop-dev
-	     libwnck-dev
-	     librsvg-dev
-	     libunique-dev
-
-	     libxcursor-dev
-	     libxcomposite-dev
-	     libxi-dev
-	     libxau-dev
-	     libxdmcp-dev
-	     libxext-dev
-	     libxcb-dev"
-makedepends="$depends_dev intltool gobject-introspection-dev"
-install="$pkgname.post-install $pkgname.pre-deinstall $pkgname.post-upgrade"
-subpackages="$pkgname-dev $pkgname-lang"
-source="ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2
-001-filepeek-crash.patch
-002-automounting-locked-screen.patch
-003-filename-null.patch
-004-memory-leak.patch
-005-gbus-assertion.patch
-006-select-extension.patch
-007-tracker0.10-compat.patch
-009-default-directories.patch
-010-localpath-preview.patch
-011-keyboard-navigation.patch
-g_const_return.patch
-gmodule-underlinking.patch
-glib-2.36.patch
-"
-
-_builddir="${srcdir}/${pkgname}-${pkgver}"
-prepare() {
-	local i
-	cd "$_builddir"
-	update_config_sub || return 1
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-	sed -i -e '/^DISABLE_DEPRECATED_CFLAGS=/s/=.*/=""/' configure
-}
-
-build() {
-	cd "$_builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		|| return 1
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-	make DESTDIR="$pkgdir" install || return 1
-
-	rm -rf ${pkgdir}/usr/share/mime
-}
-
-md5sums="f75f387d1b439079967581d876009426  nautilus-2.32.2.1.tar.bz2
-87c2769bea06fd209df8e2be8d86c1b7  001-filepeek-crash.patch
-da51f2247159159a2f6233890592a733  002-automounting-locked-screen.patch
-862f0185ff5e0009db62025875364536  003-filename-null.patch
-844a3fa31f6247c4f740e1d5de77f19f  004-memory-leak.patch
-196905aa07cf2a6de523451ec95283c2  005-gbus-assertion.patch
-624d3cf12d5152d947dd1217ff5c1fc9  006-select-extension.patch
-14ff9cb78537873b652c5cc487dce9eb  007-tracker0.10-compat.patch
-14c422dec12c5ca953ec7f6fc91861d1  009-default-directories.patch
-75ea4e2ce64d8220ae82e386a9554d50  010-localpath-preview.patch
-1ca1703fffb82f53b5278b20f86656c0  011-keyboard-navigation.patch
-69329cf155b211d6143fcdc68a8695bf  g_const_return.patch
-7e3c1434d5530a86630cc6c1d43149e3  gmodule-underlinking.patch
-c8554fe2e34028c866df3459dec81813  glib-2.36.patch"
-sha256sums="802dacc98c697afea2e6201dab1c8c800809f235fff39857983efb4340ecc303  nautilus-2.32.2.1.tar.bz2
-be86d21bf1e57ebf9583a8e6c66dbfb202d2b23f84a40f5cb5ee3940cb9aad49  001-filepeek-crash.patch
-26dc94bbe29c2269bcbfefbfcc66120db8703aa3d11e605253db9751f731bec8  002-automounting-locked-screen.patch
-a8ed4a739ae35de7d1b0a67c60fc946d2151a473fc7fb6c8cecc1ac227eb656e  003-filename-null.patch
-5bc24968bb966b4afc4ce308f6118b5ec08bab2a48a081ab4390c7e41721a608  004-memory-leak.patch
-3339318db6d0f0c9e10f09eff6b5766e6833192c9c1efd6ab26944ff7a605664  005-gbus-assertion.patch
-63aafc8c4e0d25c78beef7eb89c823d48e5b31fa37d5f6e6480ae234f203fd72  006-select-extension.patch
-e0fae17feaff1bd417bf45183dea82465258e513efb90a648d2dc5098d1ef672  007-tracker0.10-compat.patch
-264bb1b5c17deebf6ac257db86b7aa4c9a8bfcab6ec99b9a9d511c9ed1979621  009-default-directories.patch
-e7d572e0c008aec9a8b1f64fc8e3dd5713674841ebd0771d1d72aa73800d5617  010-localpath-preview.patch
-09ba24583d06ffd7717b10b787b4845b0f5774ababed85c6857b957a0e6b05f8  011-keyboard-navigation.patch
-42aab0e038779a4cfb2921780ac6f1e9fe2a9b242f4dcbab4dc6e70fdb4b7484  g_const_return.patch
-231caff805d50dc5b6be4123f68e6c0077e24d7371a1708ce896f9cf4c658335  gmodule-underlinking.patch
-ddb7f616d112b7e2b52b25f57d9564a7aabcd62a6e8fee27a38273c2654273a1  glib-2.36.patch"
-sha512sums="cb9d65d16c8d771d182bb94d9de59c4054b05603b8ad33beeca26b41c3ca3c84581b596625f6503924c4a26f5ca1218c6d1e81c9d94e6cc637a3e8a941cde9b4  nautilus-2.32.2.1.tar.bz2
-a0906677d89e7ccbc3e0617db997bb1369eb32dcc4fb2b1c6ac594b29b47d533705ebedc3811fd3d28bd36ee65c31aea23c89463bb6f8c4a2a49a3b00314ff35  001-filepeek-crash.patch
-0e82b5dadda5dbdc8f7d4a2a9cfc1ac39f36d808b4f696500d29f8a082c22aef061e49be736a63d6bb85487210c0a0c4e2b4455d92dd0052d79b88153a21fa8d  002-automounting-locked-screen.patch
-534fdc10a83ebde5e777574742b6bf6fabb96bae7af3cd06cdfe4f0e9511b115898da1ff5f2a7754051f97c700d416b8d1462585ec818e691e2975be39ae8f40  003-filename-null.patch
-e33dbed40ca0fb30dd7ef4c2d787910ed0bfc2aab40af5442b4c86332cef119a217bd83ad4c8e606cdc459c3ea73bec8a2a6308c3db4c9400e71566e8456284c  004-memory-leak.patch
-ad44911465931a16b2a5e7d1131daf013fe63a748816110d20a17d709cb29ee9d5ba2c50b1b49c5211629bacbc0731a872395466ed85c5bf12cb0faca3945674  005-gbus-assertion.patch
-7955747b1412d177512ffa6f4fbd07c49fcd95158b55a192179136878801624fed91e6f1240bdd02c9ab4a9eaaf220b2a014f9c934f06cd914f1c599c84ffa02  006-select-extension.patch
-316e6ee5e982583090be0d1b65f006fa6ec41b5e39674f4f2ee9099e3248ae84504eaf126c319e312a255fced6a63c29eec1a24a5a2da626e58734f3938f4e9a  007-tracker0.10-compat.patch
-dac3679d46b4583983fc22ad8c4037bd589a0d6fd66f41b84cbeb9148722b6bb6950c787e02612ff14ac89648e5c333ba29373e6d7b5343f36c644e754e7d5f0  009-default-directories.patch
-4d0c6ff5dcac2a7cfa8f9677e2166a254d04475350c875a9943b63f4ed60e898393843f52c18d64042ceb4bc016fc0e43d13873f683dae5e8d54d3abcc2ba37c  010-localpath-preview.patch
-8875781a5dec0e343eddb9289566b3b299a93680df8f84fbed30724c18a1de54c0a7501aba674238ac601ac805c687a93f1e414fb91bc20eb2f1f31a1382f29a  011-keyboard-navigation.patch
-0022bf24420c72a04f0dc29b5d7392fcbbe59b4a0a4dfd1687381f97302a2da2809d7d54ee719f019c9f2b590cf87dd103e9e041923e72ef9e1b533ff52dbe03  g_const_return.patch
-870b0325e45e4fc9eb6b0e12aeaefc44a96796eb2dfc9dc4f0f9e141ce15bd78cdf063accd49e2fd36fa5627a3aa60523fadc82895318d46208df52505ac5be7  gmodule-underlinking.patch
-1c9fb7d28aa8c9845438fca372af75e334c2b66951dbd57cdd3c46f8934f23c84f2d3196bc0976f6540f935e8df2ef4f665ff79e42dfc28ac338e7d7cccf0eff  glib-2.36.patch"
diff --git a/main/nautilus/g_const_return.patch b/main/nautilus/g_const_return.patch
deleted file mode 100644
index 330ae0b22a..0000000000
--- a/main/nautilus/g_const_return.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-diff --git a/eel/eel-editable-label.c b/eel/eel-editable-label.c
-index b21bfea..63a3ccf 100644
---- a/eel/eel-editable-label.c
-+++ b/eel/eel-editable-label.c
-@@ -682,7 +682,7 @@ eel_editable_label_set_text (EelEditableLabel *label,
-  * Return value: the text in the label widget. This is the internal
-  *   string used by the label, and must not be modified.
-  **/
--G_CONST_RETURN gchar *
-+const gchar *
- eel_editable_label_get_text (EelEditableLabel *label)
- {
-   g_return_val_if_fail (EEL_IS_EDITABLE_LABEL (label), NULL);
-@@ -4292,7 +4292,7 @@ eel_editable_label_accessible_initialize (AtkObject *accessible,
-   atk_object_set_role (accessible, ATK_ROLE_TEXT);
- }
- 
--static G_CONST_RETURN gchar*
-+static const gchar*
- eel_editable_label_accessible_get_name (AtkObject *accessible)
- {
-   if (accessible->name != NULL)
-diff --git a/eel/eel-editable-label.h b/eel/eel-editable-label.h
-index 30069dc..b0adaec 100644
---- a/eel/eel-editable-label.h
-+++ b/eel/eel-editable-label.h
-@@ -112,7 +112,7 @@ GType                 eel_editable_label_get_type          (void) G_GNUC_CONST;
- GtkWidget*            eel_editable_label_new                  (const char       *str);
- void                  eel_editable_label_set_text             (EelEditableLabel *label,
- 							       const char       *str);
--G_CONST_RETURN gchar* eel_editable_label_get_text             (EelEditableLabel *label);
-+const gchar* eel_editable_label_get_text             (EelEditableLabel *label);
- void                  eel_editable_label_set_justify          (EelEditableLabel *label,
- 							       GtkJustification  jtype);
- GtkJustification      eel_editable_label_get_justify          (EelEditableLabel *label);
-diff --git a/eel/eel-i18n.c b/eel/eel-i18n.c
-index 83f9fec..98e36c5 100644
---- a/eel/eel-i18n.c
-+++ b/eel/eel-i18n.c
-@@ -32,7 +32,7 @@
- 
- 
- 
--G_CONST_RETURN char *
-+const char *
- _eel_gettext (const char *str)
- {
- 	static gboolean _eel_gettext_initialized = FALSE;
-diff --git a/eel/eel-i18n.h b/eel/eel-i18n.h
-index b455689..6db832b 100644
---- a/eel/eel-i18n.h
-+++ b/eel/eel-i18n.h
-@@ -28,7 +28,7 @@
- #ifdef ENABLE_NLS
- #include <glib.h>
- 
--G_CONST_RETURN char *
-+const char *
- _eel_gettext (const char *str) G_GNUC_FORMAT (1);
- 
- #include <libintl.h>
-diff --git a/eel/eel-labeled-image.c b/eel/eel-labeled-image.c
-index 90df383..a56e952 100644
---- a/eel/eel-labeled-image.c
-+++ b/eel/eel-labeled-image.c
-@@ -2140,7 +2140,7 @@ get_image (gpointer object)
- 	return EEL_LABELED_IMAGE (widget);
- }
- 
--static G_CONST_RETURN gchar *
-+static const gchar *
- eel_labeled_image_accessible_get_name (AtkObject *accessible)
- {
- 	EelLabeledImage *labeled_image;
-diff --git a/libnautilus-private/nautilus-icon-canvas-item.c b/libnautilus-private/nautilus-icon-canvas-item.c
-index a31623a..1aece5a 100644
---- a/libnautilus-private/nautilus-icon-canvas-item.c
-+++ b/libnautilus-private/nautilus-icon-canvas-item.c
-@@ -2878,7 +2878,7 @@ nautilus_icon_canvas_item_accessible_action_interface_init (AtkActionIface *ifac
- 	iface->set_description = nautilus_icon_canvas_item_accessible_action_set_description;
- }
- 
--static G_CONST_RETURN gchar *
-+static const gchar *
- nautilus_icon_canvas_item_accessible_get_name (AtkObject *accessible)
- {
- 	NautilusIconCanvasItem *item;
-@@ -2894,7 +2894,7 @@ nautilus_icon_canvas_item_accessible_get_name (AtkObject *accessible)
- 	return item->details->editable_text;
- }
- 
--static G_CONST_RETURN gchar*
-+static const gchar*
- nautilus_icon_canvas_item_accessible_get_description (AtkObject *accessible)
- {
- 	NautilusIconCanvasItem *item;
-@@ -3055,7 +3055,7 @@ nautilus_icon_canvas_item_accessible_class_init (AtkObjectClass *klass)
- }
- 
- 
--static G_CONST_RETURN gchar * 
-+static const gchar * 
- nautilus_icon_canvas_item_accessible_get_image_description
- 	(AtkImage *image)
- {
-diff --git a/libnautilus-private/nautilus-icon-info.c b/libnautilus-private/nautilus-icon-info.c
-index f39ad42..af023ba 100644
---- a/libnautilus-private/nautilus-icon-info.c
-+++ b/libnautilus-private/nautilus-icon-info.c
-@@ -573,13 +573,13 @@ nautilus_icon_info_get_attach_points (NautilusIconInfo  *icon,
- 	return icon->n_attach_points != 0;
- }
- 
--G_CONST_RETURN char *
-+const char *
- nautilus_icon_info_get_display_name   (NautilusIconInfo  *icon)
- {
- 	return icon->display_name;
- }
- 
--G_CONST_RETURN char *
-+const char *
- nautilus_icon_info_get_used_name (NautilusIconInfo  *icon)
- {
- 	return icon->icon_name;
-diff --git a/libnautilus-private/nautilus-icon-info.h b/libnautilus-private/nautilus-icon-info.h
-index 5ef6cd2..861abfd 100644
---- a/libnautilus-private/nautilus-icon-info.h
-+++ b/libnautilus-private/nautilus-icon-info.h
-@@ -72,8 +72,8 @@ gboolean              nautilus_icon_info_get_embedded_rect            (NautilusI
- gboolean              nautilus_icon_info_get_attach_points            (NautilusIconInfo  *icon,
- 								       GdkPoint         **points,
- 								       gint              *n_points);
--G_CONST_RETURN char  *nautilus_icon_info_get_display_name             (NautilusIconInfo  *icon);
--G_CONST_RETURN char  *nautilus_icon_info_get_used_name                (NautilusIconInfo  *icon);
-+const char  *nautilus_icon_info_get_display_name             (NautilusIconInfo  *icon);
-+const char  *nautilus_icon_info_get_used_name                (NautilusIconInfo  *icon);
- 
- void                  nautilus_icon_info_clear_caches                 (void);
- 
-diff --git a/libnautilus-private/nautilus-search-engine-beagle.c b/libnautilus-private/nautilus-search-engine-beagle.c
-index 930923f..1129d6c 100644
---- a/libnautilus-private/nautilus-search-engine-beagle.c
-+++ b/libnautilus-private/nautilus-search-engine-beagle.c
-@@ -69,7 +69,7 @@ typedef enum {
- static gboolean (*beagle_client_send_request_async) (BeagleClient  *client,
-                                                     BeagleRequest  *request,
-                                                     GError        **err) = NULL;
--static G_CONST_RETURN char *(*beagle_hit_get_uri) (BeagleHit *hit) = NULL;
-+static const char *(*beagle_hit_get_uri) (BeagleHit *hit) = NULL;
- static GSList *(*beagle_hits_added_response_get_hits) (BeagleHitsAddedResponse *response) = NULL;
- static BeagleQuery *(*beagle_query_new) (void) = NULL;
- static void (*beagle_query_add_text) (BeagleQuery     *query,
-diff --git a/src/nautilus-zoom-control.c b/src/nautilus-zoom-control.c
-index 2907cd7..2d399c3 100644
---- a/src/nautilus-zoom-control.c
-+++ b/src/nautilus-zoom-control.c
-@@ -748,7 +748,7 @@ nautilus_zoom_control_accessible_get_n_actions (AtkAction *accessible)
- 	return NUM_ACTIONS;
- }
- 
--static G_CONST_RETURN char *
-+static const char *
- nautilus_zoom_control_accessible_action_get_description (AtkAction *accessible, 
- 							 int i)
- {
-@@ -757,7 +757,7 @@ nautilus_zoom_control_accessible_action_get_description (AtkAction *accessible,
- 	return _(nautilus_zoom_control_accessible_action_descriptions[i]);
- }
- 
--static G_CONST_RETURN char *
-+static const char *
- nautilus_zoom_control_accessible_action_get_name (AtkAction *accessible, 
- 						  int i)
- {
-@@ -884,13 +884,13 @@ nautilus_zoom_control_accessible_value_interface_init (AtkValueIface *iface)
- 	iface->set_current_value = nautilus_zoom_control_accessible_set_current_value;
- }
- 
--static G_CONST_RETURN char *
-+static const char *
- nautilus_zoom_control_accessible_get_name (AtkObject *accessible)
- {
- 	return _("Zoom");
- }
- 
--static G_CONST_RETURN char *
-+static const char *
- nautilus_zoom_control_accessible_get_description (AtkObject *accessible)
- {
- 	return _("Set the zoom level of the current view");
diff --git a/main/nautilus/glib-2.36.patch b/main/nautilus/glib-2.36.patch
deleted file mode 100644
index 824f955c43..0000000000
--- a/main/nautilus/glib-2.36.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./eel/Makefile.orig	2013-04-25 11:43:20.962938407 +0000
-+++ ./eel/Makefile.in	2013-04-25 11:43:50.900065423 +0000
-@@ -320,7 +320,6 @@
- 	-DDATADIR=\""$(datadir)"\"			\
- 	-DSOURCE_DATADIR=\""$(top_srcdir)/data"\"	\
- 	-DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale"\"	\
--	-DG_DISABLE_DEPRECATED				\
- 	-DGDK_PIXBUF_DISABLE_DEPRECATED			\
- 	-DGMENU_I_KNOW_THIS_IS_UNSTABLE			\
- 	$(NULL)
diff --git a/main/nautilus/gmodule-underlinking.patch b/main/nautilus/gmodule-underlinking.patch
deleted file mode 100644
index efb690c176..0000000000
--- a/main/nautilus/gmodule-underlinking.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./src/Makefile.in.orig
-+++ ./src/Makefile.in
-@@ -469,7 +469,7 @@
- LDADD = \
- 	$(top_builddir)/src/file-manager/libnautilus-file-manager.la \
- 	$(top_builddir)/libnautilus-private/libnautilus-private.la  \
--	$(CORE_LIBS) \
-+	$(CORE_LIBS) -lgmodule-2.0 \
- 	$(EXIF_LIBS) \
- 	$(EXEMPI_LIBS) \
- 	$(POPT_LIBS) \
---- ./test/Makefile.in.orig
-+++ ./test/Makefile.in
-@@ -383,7 +383,7 @@
- 
- LDADD = \
- 	$(top_builddir)/libnautilus-private/libnautilus-private.la \
--	$(CORE_LIBS) \
-+	$(CORE_LIBS) -lgmodule-2.0 \
- 	$(NULL)
- 
- test_nautilus_copy_SOURCES = test-copy.c test.c
diff --git a/main/nautilus/nautilus.post-install b/main/nautilus/nautilus.post-install
deleted file mode 100644
index a4c26c32a9..0000000000
--- a/main/nautilus/nautilus.post-install
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-for i in apps_nautilus_preferences.schemas; do
-        echo "Installing GConf2 schema $i."
-	GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
-		/usr/bin/gconftool-2 --makefile-install-rule /etc/gconf/schemas/$i >/dev/null
-done
diff --git a/main/nautilus/nautilus.post-upgrade b/main/nautilus/nautilus.post-upgrade
deleted file mode 100644
index a4c26c32a9..0000000000
--- a/main/nautilus/nautilus.post-upgrade
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-for i in apps_nautilus_preferences.schemas; do
-        echo "Installing GConf2 schema $i."
-	GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
-		/usr/bin/gconftool-2 --makefile-install-rule /etc/gconf/schemas/$i >/dev/null
-done
diff --git a/main/nautilus/nautilus.pre-deinstall b/main/nautilus/nautilus.pre-deinstall
deleted file mode 100644
index 6902c6b290..0000000000
--- a/main/nautilus/nautilus.pre-deinstall
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-for i in apps_nautilus_preferences.schemas; do
-        echo "Uninstalling GConf2 schema $i."
-	GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \
-		/usr/bin/gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/$i >/dev/null
-done