--- a/ChangeLog Mon Oct 23 13:28:38 2006 +0000
+++ b/ChangeLog Mon Oct 23 13:58:18 2006 +0000
@@ -1,3 +1,11 @@
+2006-10-23 Stephen Browne <[email protected]>
+
+ * nautilus.spec: comment out TX patch for now
+ * patches/gnome-volume-manager-01-fixcompile.diff: defuzz
+ * patches/nautilus-12-lockdown.diff: defuzz
+ * patches/nautilus-13-locale.h.diff: defuzz
+ * patches/nautilus-15-eel-show-error-dialog.diff: defuzz
+
2006-10-23 Damien Carbery <[email protected]>
* patches/firefox-05-preload.diff: Minor rework to fix fuzz.
--- a/nautilus.spec Mon Oct 23 13:28:38 2006 +0000
+++ b/nautilus.spec Mon Oct 23 13:58:18 2006 +0000
@@ -123,7 +123,7 @@
%patch15 -p1
%patch16 -p1
%patch17 -p1
-%patch18 -p1
+#%patch18 -p1
%patch19 -p1
for po in po/*.po; do
--- a/patches/gnome-volume-manager-01-fixcompile.diff Mon Oct 23 13:28:38 2006 +0000
+++ b/patches/gnome-volume-manager-01-fixcompile.diff Mon Oct 23 13:58:18 2006 +0000
@@ -1,21 +1,6 @@
---- gnome-volume-manager-1.5.15/src/gvm.h-orig 2006-05-01 18:32:07.965461000 -0500
-+++ gnome-volume-manager-1.5.15/src/gvm.h 2006-05-01 18:32:16.507036000 -0500
-@@ -3,6 +3,13 @@
- #ifndef _GVM_H
- #define _GVM_H
-
-+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
-+#define GNUC_UNUSED \
-+ __attribute__((__unused__))
-+#else
-+#define GNUC_UNUSED
-+#endif
-+
- /* structure to represent the configuration of the volume manager */
- struct gvm_configuration {
- GConfClient *client;
---- gnome-volume-manager-1.5.15/src/clipboard.c-orig 2006-05-01 18:31:57.503817000 -0500
-+++ gnome-volume-manager-1.5.15/src/clipboard.c 2006-05-01 18:32:36.828733000 -0500
+diff -urN -x '*~' gvm.orig/src/clipboard.c gvm.new/src/clipboard.c
+--- gvm.orig/src/clipboard.c 2006-10-23 12:42:46.420177000 +0100
++++ gvm.new/src/clipboard.c 2006-10-23 12:43:13.715130000 +0100
@@ -20,10 +20,10 @@
* clipboard_get_func - dummy get_func for gtk_clipboard_set_with_data ()
*/
@@ -31,7 +16,7 @@
{
}
-@@ -31,8 +31,8 @@ clipboard_get_func (GtkClipboard *clipbo
+@@ -31,8 +31,8 @@
* clipboard_clear_func - dummy clear_func for gtk_clipboard_set_with_data ()
*/
static void
@@ -42,36 +27,27 @@
{
}
---- gnome-volume-manager-1.5.15/src/properties.c-orig 2006-05-01 18:32:05.088324000 -0500
-+++ gnome-volume-manager-1.5.15/src/properties.c 2006-05-01 18:33:33.642494000 -0500
-@@ -154,10 +154,10 @@ toggled_cb (GtkToggleButton *toggle, con
- }
+diff -urN -x '*~' gvm.orig/src/gvm.h gvm.new/src/gvm.h
+--- gvm.orig/src/gvm.h 2006-10-23 12:42:46.420450000 +0100
++++ gvm.new/src/gvm.h 2006-10-23 12:43:13.714294000 +0100
+@@ -3,6 +3,13 @@
+ #ifndef _GVM_H
+ #define _GVM_H
- static void
--gconf_changed_cb (GConfClient *client __attribute__((__unused__)),
-- guint id __attribute__((__unused__)),
-+gconf_changed_cb (GConfClient *client GNUC_UNUSED,
-+ guint id GNUC_UNUSED,
- GConfEntry *entry,
-- gpointer data __attribute__((__unused__)))
-+ gpointer data GNUC_UNUSED)
- {
- GConfValue *value;
- gpointer result;
-@@ -221,8 +221,8 @@ set_sensitivity (void)
- */
- static void
- close_cb (GtkWidget *dialog,
-- int response __attribute__((__unused__)),
-- gpointer user_data __attribute__((__unused__)))
-+ int response GNUC_UNUSED,
-+ gpointer user_data GNUC_UNUSED)
- {
- gtk_widget_destroy (dialog);
- gtk_main_quit ();
---- gnome-volume-manager-1.5.15/src/manager.c-old 2006-05-02 17:27:14.565624000 -0500
-+++ gnome-volume-manager-1.5.15/src/manager.c 2006-05-02 17:28:21.184936000 -0500
-@@ -615,10 +615,12 @@ gvm_load_config (void)
++#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
++#define GNUC_UNUSED \
++ __attribute__((__unused__))
++#else
++#define GNUC_UNUSED
++#endif
++
+ /* structure to represent the configuration of the volume manager */
+ struct gvm_configuration {
+ GConfClient *client;
+diff -urN -x '*~' gvm.orig/src/manager.c gvm.new/src/manager.c
+--- gvm.orig/src/manager.c 2006-10-23 12:42:46.419811000 +0100
++++ gvm.new/src/manager.c 2006-10-23 12:43:13.729274000 +0100
+@@ -635,10 +635,12 @@
for (i = 0; i < G_N_ELEMENTS (gvm_settings); i++) {
g_hash_table_insert (gvm_settings_hash, gvm_settings[i].key, GINT_TO_POINTER (i + 1));
if (gvm_settings[i].type == TYPE_STRING) {
@@ -85,7 +61,7 @@
} else if (gvm_settings[i].type == TYPE_BOOL) {
*((int *) gvm_settings[i].var) =
gconf_client_get_bool (config.client, gvm_settings[i].key, NULL);
-@@ -645,10 +647,10 @@ gvm_load_config (void)
+@@ -665,10 +667,10 @@
* gvm_config_changed - gconf_client_notify_add () call back to reload config
*/
static void
@@ -99,7 +75,7 @@
{
GConfValue *value;
gpointer result;
-@@ -2020,7 +2022,7 @@ strptrcmp (const void *strptr0, const vo
+@@ -2198,7 +2200,7 @@
typedef gboolean (* DeviceAddedHandler) (const char *udi, const char *capability);
static gboolean
@@ -108,7 +84,7 @@
{
char *fsusage = NULL, *device = NULL, *storage_device = NULL;
DBusError error;
-@@ -2099,7 +2101,7 @@ block_device_added (const char *udi, con
+@@ -2285,7 +2287,7 @@
}
static gboolean
@@ -117,7 +93,7 @@
{
GvmPromptCtx *ctx;
-@@ -2164,7 +2166,7 @@ input_device_added (const char *udi, con
+@@ -2350,7 +2352,7 @@
}
static gboolean
@@ -126,7 +102,7 @@
{
DBusError error;
char *platform;
-@@ -2191,7 +2193,7 @@ pda_device_added (const char *udi, const
+@@ -2377,7 +2379,7 @@
}
static gboolean
@@ -135,7 +111,7 @@
{
char *access_method;
DBusError error;
-@@ -2219,7 +2221,7 @@ media_player_device_added (const char *u
+@@ -2405,7 +2407,7 @@
}
static gboolean
@@ -144,7 +120,7 @@
{
if (config.autoprinter)
gvm_run_printer (udi);
-@@ -2249,7 +2251,7 @@ static struct {
+@@ -2435,7 +2437,7 @@
* @param udi Universal Device Id
*/
static void
@@ -153,7 +129,7 @@
const char *udi)
{
char **capabilities;
-@@ -2290,7 +2292,7 @@ hal_device_added (LibHalContext *ctx __a
+@@ -2476,7 +2478,7 @@
* @param udi Universal Device Id
*/
static void
@@ -162,7 +138,7 @@
const char *udi)
{
GtkDialog *dialog;
-@@ -2308,9 +2310,9 @@ hal_device_removed (LibHalContext *ctx _
+@@ -2494,9 +2496,9 @@
* @param capability Name of capability
*/
static void
@@ -175,7 +151,7 @@
{
}
-@@ -2321,9 +2323,9 @@ hal_device_new_capability (LibHalContext
+@@ -2507,9 +2509,9 @@
* @param capability Name of capability
*/
static void
@@ -188,7 +164,7 @@
{
}
-@@ -2335,11 +2337,11 @@ hal_device_lost_capability (LibHalContex
+@@ -2521,11 +2523,11 @@
* @param key Key of property
*/
static void
@@ -203,7 +179,7 @@
{
struct _MountPolicy *policy;
gboolean mounted;
-@@ -2491,9 +2493,9 @@ gvm_device_eject (const char *udi)
+@@ -2666,9 +2668,9 @@
* @param message D-BUS message with parameters
*/
static void
@@ -213,9 +189,9 @@
- const char *condition_details __attribute__((__unused__)))
+ const char *condition_details GNUC_UNUSED)
{
- if (!gvm_user_active_at_console ())
+ if (!gvm_active_user ())
return;
-@@ -2741,7 +2743,7 @@ static int sigterm_unix_signal_pipe_fds[
+@@ -2914,7 +2916,7 @@
static GIOChannel *sigterm_iochn;
static void
@@ -224,7 +200,7 @@
{
static char marker[1] = {'S'};
-@@ -2756,8 +2758,8 @@ handle_sigterm (int value __attribute__(
+@@ -2929,8 +2931,8 @@
static gboolean
sigterm_iochn_data (GIOChannel *source,
@@ -235,7 +211,7 @@
{
GError *err = NULL;
gchar data[1];
-@@ -2868,8 +2870,8 @@ gvm_statfs_timeout (gpointer data)
+@@ -3069,8 +3071,8 @@
#endif /* ENABLE_NOTIFY */
static void
@@ -246,3 +222,31 @@
{
dbg ("Received 'die', initiating shutdown\n");
+diff -urN -x '*~' gvm.orig/src/properties.c gvm.new/src/properties.c
+--- gvm.orig/src/properties.c 2006-10-23 12:42:46.420704000 +0100
++++ gvm.new/src/properties.c 2006-10-23 12:43:13.722742000 +0100
+@@ -159,10 +159,10 @@
+ }
+
+ static void
+-gconf_changed_cb (GConfClient *client __attribute__((__unused__)),
+- guint id __attribute__((__unused__)),
++gconf_changed_cb (GConfClient *client GNUC_UNUSED,
++ guint id GNUC_UNUSED,
+ GConfEntry *entry,
+- gpointer data __attribute__((__unused__)))
++ gpointer data GNUC_UNUSED)
+ {
+ GConfValue *value;
+ gpointer result;
+@@ -226,8 +226,8 @@
+ */
+ static void
+ close_cb (GtkWidget *dialog,
+- int response __attribute__((__unused__)),
+- gpointer user_data __attribute__((__unused__)))
++ int response GNUC_UNUSED,
++ gpointer user_data GNUC_UNUSED)
+ {
+ gtk_widget_destroy (dialog);
+ gtk_main_quit ();
--- a/patches/nautilus-12-lockdown.diff Mon Oct 23 13:28:38 2006 +0000
+++ b/patches/nautilus-12-lockdown.diff Mon Oct 23 13:58:18 2006 +0000
@@ -1,7 +1,7 @@
-diff -urN nautilus-2.14.1.orig/libnautilus-private/Makefile.am nautilus-2.14.1/libnautilus-private/Makefile.am
---- nautilus-2.14.1.orig/libnautilus-private/Makefile.am 2006-02-27 16:36:39.000000000 +0100
-+++ nautilus-2.14.1/libnautilus-private/Makefile.am 2006-06-19 14:17:36.556101256 +0200
-@@ -137,6 +137,8 @@
+diff -urN -x '*~' naut.orig/libnautilus-private/Makefile.am naut.new/libnautilus-private/Makefile.am
+--- naut.orig/libnautilus-private/Makefile.am 2006-10-23 11:55:48.026512000 +0100
++++ naut.new/libnautilus-private/Makefile.am 2006-10-23 11:56:16.096492000 +0100
+@@ -138,6 +138,8 @@
nautilus-link-desktop-file.h \
nautilus-link.c \
nautilus-link.h \
@@ -10,9 +10,9 @@
nautilus-marshal.c \
nautilus-marshal.h \
nautilus-merged-directory.c \
-diff -urN nautilus-2.14.1.orig/libnautilus-private/nautilus-directory-async.c nautilus-2.14.1/libnautilus-private/nautilus-directory-async.c
---- nautilus-2.14.1.orig/libnautilus-private/nautilus-directory-async.c 2006-03-29 21:29:59.000000000 +0200
-+++ nautilus-2.14.1/libnautilus-private/nautilus-directory-async.c 2006-06-19 14:17:36.559100800 +0200
+diff -urN -x '*~' naut.orig/libnautilus-private/nautilus-directory-async.c naut.new/libnautilus-private/nautilus-directory-async.c
+--- naut.orig/libnautilus-private/nautilus-directory-async.c 2006-10-23 11:55:47.954855000 +0100
++++ naut.new/libnautilus-private/nautilus-directory-async.c 2006-10-23 11:56:16.101679000 +0100
@@ -32,6 +32,7 @@
#include "nautilus-file-utilities.h"
#include "nautilus-global-preferences.h"
@@ -21,7 +21,7 @@
#include "nautilus-marshal.h"
#include "nautilus-metafile.h"
#include <eel/eel-glib-extensions.h>
-@@ -761,6 +762,7 @@
+@@ -767,6 +768,7 @@
if (!show_backup_files && nautilus_file_name_matches_backup_pattern (info->name)) {
return TRUE;
}
@@ -29,9 +29,9 @@
return FALSE;
}
-diff -urN nautilus-2.14.1.orig/libnautilus-private/nautilus-directory.c nautilus-2.14.1/libnautilus-private/nautilus-directory.c
---- nautilus-2.14.1.orig/libnautilus-private/nautilus-directory.c 2006-03-28 23:46:49.000000000 +0200
-+++ nautilus-2.14.1/libnautilus-private/nautilus-directory.c 2006-06-19 14:17:36.560100648 +0200
+diff -urN -x '*~' naut.orig/libnautilus-private/nautilus-directory.c naut.new/libnautilus-private/nautilus-directory.c
+--- naut.orig/libnautilus-private/nautilus-directory.c 2006-10-23 11:55:48.031119000 +0100
++++ naut.new/libnautilus-private/nautilus-directory.c 2006-10-23 11:56:16.104680000 +0100
@@ -305,6 +305,7 @@
eel_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES,
filtering_changed_callback,
@@ -40,9 +40,9 @@
eel_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_TEXT_IN_ICONS,
async_data_preference_changed_callback,
NULL);
-diff -urN nautilus-2.14.1.orig/libnautilus-private/nautilus-file.c nautilus-2.14.1/libnautilus-private/nautilus-file.c
---- nautilus-2.14.1.orig/libnautilus-private/nautilus-file.c 2006-06-19 14:17:08.285399000 +0200
-+++ nautilus-2.14.1/libnautilus-private/nautilus-file.c 2006-06-19 14:17:36.564100040 +0200
+diff -urN -x '*~' naut.orig/libnautilus-private/nautilus-file.c naut.new/libnautilus-private/nautilus-file.c
+--- naut.orig/libnautilus-private/nautilus-file.c 2006-10-23 11:55:48.029597000 +0100
++++ naut.new/libnautilus-private/nautilus-file.c 2006-10-23 11:56:16.113471000 +0100
@@ -48,6 +48,7 @@
#include "nautilus-users-groups-cache.h"
#include "nautilus-vfs-file.h"
@@ -51,7 +51,7 @@
#include <eel/eel-debug.h>
#include <eel/eel-glib-extensions.h>
#include <eel/eel-gtk-extensions.h>
-@@ -2343,7 +2344,8 @@
+@@ -2346,7 +2347,8 @@
gboolean show_backup)
{
return (show_hidden || (!nautilus_file_is_hidden_file (file) && !is_file_hidden (file))) &&
@@ -61,9 +61,9 @@
}
-diff -urN nautilus-2.14.1.orig/libnautilus-private/nautilus-global-preferences.c nautilus-2.14.1/libnautilus-private/nautilus-global-preferences.c
---- nautilus-2.14.1.orig/libnautilus-private/nautilus-global-preferences.c 2006-03-22 01:58:27.000000000 +0100
-+++ nautilus-2.14.1/libnautilus-private/nautilus-global-preferences.c 2006-06-19 14:17:36.565099888 +0200
+diff -urN -x '*~' naut.orig/libnautilus-private/nautilus-global-preferences.c naut.new/libnautilus-private/nautilus-global-preferences.c
+--- naut.orig/libnautilus-private/nautilus-global-preferences.c 2006-10-23 11:55:47.958485000 +0100
++++ naut.new/libnautilus-private/nautilus-global-preferences.c 2006-10-23 11:56:16.130981000 +0100
@@ -46,6 +46,7 @@
/* Path for gnome-vfs preferences */
static const char *EXTRA_MONITOR_PATHS[] = { "/system/gnome_vfs",
@@ -72,12 +72,12 @@
NULL };
/* Forward declarations */
-diff -urN nautilus-2.14.1.orig/libnautilus-private/nautilus-global-preferences.h nautilus-2.14.1/libnautilus-private/nautilus-global-preferences.h
---- nautilus-2.14.1.orig/libnautilus-private/nautilus-global-preferences.h 2005-12-15 15:32:57.000000000 +0100
-+++ nautilus-2.14.1/libnautilus-private/nautilus-global-preferences.h 2006-06-19 14:17:36.566099736 +0200
-@@ -184,6 +184,10 @@
- #define NAUTILUS_PREFERENCES_DESKTOP_VOLUMES_VISIBLE "desktop/volumes_visible"
+diff -urN -x '*~' naut.orig/libnautilus-private/nautilus-global-preferences.h naut.new/libnautilus-private/nautilus-global-preferences.h
+--- naut.orig/libnautilus-private/nautilus-global-preferences.h 2006-10-23 11:55:48.083900000 +0100
++++ naut.new/libnautilus-private/nautilus-global-preferences.h 2006-10-23 11:56:16.133563000 +0100
+@@ -186,6 +186,10 @@
#define NAUTILUS_PREFERENCES_DESKTOP_NETWORK_VISIBLE "desktop/network_icon_visible"
+ #define NAUTILUS_PREFERENCES_DESKTOP_PRIMARY_SCREEN "desktop/primary_screen"
+#define NAUTILUS_PREFERENCES_DISABLE_COMMANDLINE "/desktop/gnome/lockdown/disable_command_line"
+#define NAUTILUS_PREFERENCES_RESTRICT_APP_LAUNCHING "/desktop/gnome/lockdown/restrict_application_launching"
@@ -86,9 +86,9 @@
void nautilus_global_preferences_init (void);
char *nautilus_global_preferences_get_default_folder_viewer_preference_as_iid (void);
G_END_DECLS
-diff -urN nautilus-2.14.1.orig/libnautilus-private/nautilus-lockdown.c nautilus-2.14.1/libnautilus-private/nautilus-lockdown.c
---- nautilus-2.14.1.orig/libnautilus-private/nautilus-lockdown.c 1970-01-01 01:00:00.000000000 +0100
-+++ nautilus-2.14.1/libnautilus-private/nautilus-lockdown.c 2006-06-19 14:28:56.029805552 +0200
+diff -urN -x '*~' naut.orig/libnautilus-private/nautilus-lockdown.c naut.new/libnautilus-private/nautilus-lockdown.c
+--- naut.orig/libnautilus-private/nautilus-lockdown.c 1970-01-01 01:00:00.000000000 +0100
++++ naut.new/libnautilus-private/nautilus-lockdown.c 2006-10-23 11:56:16.135370000 +0100
@@ -0,0 +1,325 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
+/*
@@ -415,9 +415,9 @@
+ return retCode ;
+}
+
-diff -urN nautilus-2.14.1.orig/libnautilus-private/nautilus-lockdown.h nautilus-2.14.1/libnautilus-private/nautilus-lockdown.h
---- nautilus-2.14.1.orig/libnautilus-private/nautilus-lockdown.h 1970-01-01 01:00:00.000000000 +0100
-+++ nautilus-2.14.1/libnautilus-private/nautilus-lockdown.h 2006-06-19 14:21:03.912578280 +0200
+diff -urN -x '*~' naut.orig/libnautilus-private/nautilus-lockdown.h naut.new/libnautilus-private/nautilus-lockdown.h
+--- naut.orig/libnautilus-private/nautilus-lockdown.h 1970-01-01 01:00:00.000000000 +0100
++++ naut.new/libnautilus-private/nautilus-lockdown.h 2006-10-23 11:56:16.136402000 +0100
@@ -0,0 +1,55 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
+/*
@@ -474,9 +474,9 @@
+G_END_DECLS
+
+#endif /* __NAUTILUS_LOCKDOWN_H__ */
-diff -urN nautilus-2.14.1.orig/libnautilus-private/nautilus-program-choosing.c nautilus-2.14.1/libnautilus-private/nautilus-program-choosing.c
---- nautilus-2.14.1.orig/libnautilus-private/nautilus-program-choosing.c 2006-03-18 07:45:15.000000000 +0100
-+++ nautilus-2.14.1/libnautilus-private/nautilus-program-choosing.c 2006-06-19 14:20:33.625182664 +0200
+diff -urN -x '*~' naut.orig/libnautilus-private/nautilus-program-choosing.c naut.new/libnautilus-private/nautilus-program-choosing.c
+--- naut.orig/libnautilus-private/nautilus-program-choosing.c 2006-10-23 11:55:48.020126000 +0100
++++ naut.new/libnautilus-private/nautilus-program-choosing.c 2006-10-23 11:56:16.138390000 +0100
@@ -415,6 +415,22 @@
@@ -546,10 +546,10 @@
if ((strstr (command_string, "%F") || strstr (command_string, "%f"))
&& !(strstr (command_string, "%U") || strstr (command_string, "%u"))
&& parameter_uris != NULL) {
-diff -urN nautilus-2.14.1.orig/src/file-manager/fm-directory-view.c nautilus-2.14.1/src/file-manager/fm-directory-view.c
---- nautilus-2.14.1.orig/src/file-manager/fm-directory-view.c 2006-06-19 14:16:45.053930000 +0200
-+++ nautilus-2.14.1/src/file-manager/fm-directory-view.c 2006-06-19 14:17:36.597095024 +0200
-@@ -363,6 +363,7 @@
+diff -urN -x '*~' naut.orig/src/file-manager/fm-directory-view.c naut.new/src/file-manager/fm-directory-view.c
+--- naut.orig/src/file-manager/fm-directory-view.c 2006-10-23 11:55:47.840886000 +0100
++++ naut.new/src/file-manager/fm-directory-view.c 2006-10-23 11:56:16.151284000 +0100
+@@ -365,6 +365,7 @@
static void unschedule_display_of_pending_files (FMDirectoryView *view);
static void disconnect_model_handlers (FMDirectoryView *view);
static void filtering_changed_callback (gpointer callback_data);
@@ -557,7 +557,7 @@
static void metadata_for_directory_as_file_ready_callback (NautilusFile *file,
gpointer callback_data);
static void metadata_for_files_in_directory_ready_callback (NautilusDirectory *directory,
-@@ -1972,6 +1973,7 @@
+@@ -1969,6 +1970,7 @@
filtering_changed_callback, view);
eel_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES,
filtering_changed_callback, view);
@@ -565,7 +565,7 @@
}
static void
-@@ -2077,6 +2079,7 @@
+@@ -2074,6 +2076,7 @@
view = FM_DIRECTORY_VIEW (object);
@@ -573,7 +573,7 @@
eel_preferences_remove_callback (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES,
filtering_changed_callback, view);
eel_preferences_remove_callback (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES,
-@@ -9127,6 +9130,15 @@
+@@ -9411,6 +9414,15 @@
}
}
@@ -589,9 +589,9 @@
void
fm_directory_view_ignore_hidden_file_preferences (FMDirectoryView *view)
{
-diff -urN nautilus-2.14.1.orig/src/file-manager/fm-tree-model.c nautilus-2.14.1/src/file-manager/fm-tree-model.c
---- nautilus-2.14.1.orig/src/file-manager/fm-tree-model.c 2006-03-18 07:45:15.000000000 +0100
-+++ nautilus-2.14.1/src/file-manager/fm-tree-model.c 2006-06-19 14:17:36.599094720 +0200
+diff -urN -x '*~' naut.orig/src/file-manager/fm-tree-model.c naut.new/src/file-manager/fm-tree-model.c
+--- naut.orig/src/file-manager/fm-tree-model.c 2006-10-23 11:55:47.837305000 +0100
++++ naut.new/src/file-manager/fm-tree-model.c 2006-10-23 11:56:16.155878000 +0100
@@ -38,6 +38,8 @@
#include <gtk/gtkenums.h>
#include <string.h>
@@ -616,10 +616,10 @@
static gboolean
file_is_not_directory (NautilusFile *file)
{
-diff -urN nautilus-2.14.1.orig/src/file-manager/fm-tree-view.c nautilus-2.14.1/src/file-manager/fm-tree-view.c
---- nautilus-2.14.1.orig/src/file-manager/fm-tree-view.c 2006-04-11 00:34:49.000000000 +0200
-+++ nautilus-2.14.1/src/file-manager/fm-tree-view.c 2006-06-19 14:17:36.600094568 +0200
-@@ -1350,6 +1350,7 @@
+diff -urN -x '*~' naut.orig/src/file-manager/fm-tree-view.c naut.new/src/file-manager/fm-tree-view.c
+--- naut.orig/src/file-manager/fm-tree-view.c 2006-10-23 11:55:47.846081000 +0100
++++ naut.new/src/file-manager/fm-tree-view.c 2006-10-23 11:56:16.158606000 +0100
+@@ -1342,6 +1342,7 @@
fm_tree_model_set_show_only_directories
(view->details->child_model,
eel_preferences_get_boolean (NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES));
@@ -627,7 +627,7 @@
}
static void
-@@ -1405,6 +1406,7 @@
+@@ -1397,6 +1398,7 @@
filtering_changed_callback, view);
eel_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES,
filtering_changed_callback, view);
@@ -635,7 +635,7 @@
eel_preferences_add_callback (NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES,
filtering_changed_callback, view);
-@@ -1451,6 +1453,7 @@
+@@ -1443,6 +1445,7 @@
filtering_changed_callback, view);
eel_preferences_remove_callback (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES,
filtering_changed_callback, view);
@@ -643,9 +643,9 @@
eel_preferences_remove_callback (NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES,
filtering_changed_callback, view);
-diff -urN nautilus-2.14.1.orig/src/nautilus-main.c nautilus-2.14.1/src/nautilus-main.c
---- nautilus-2.14.1.orig/src/nautilus-main.c 2006-04-08 00:37:24.000000000 +0200
-+++ nautilus-2.14.1/src/nautilus-main.c 2006-06-19 14:17:36.601094416 +0200
+diff -urN -x '*~' naut.orig/src/nautilus-main.c naut.new/src/nautilus-main.c
+--- naut.orig/src/nautilus-main.c 2006-10-23 11:55:47.917178000 +0100
++++ naut.new/src/nautilus-main.c 2006-10-23 11:56:16.161912000 +0100
@@ -51,6 +51,7 @@
#include <libgnomevfs/gnome-vfs-init.h>
#include <libnautilus-private/nautilus-directory-metafile.h>
@@ -653,8 +653,8 @@
+#include <libnautilus-private/nautilus-lockdown.h>
#include <libnautilus-private/nautilus-lib-self-check-functions.h>
#include <libxml/parser.h>
- #include <popt.h>
-@@ -370,6 +371,7 @@
+ #ifdef HAVE_LOCALE_H
+@@ -334,6 +335,7 @@
(NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR, TRUE);
}
@@ -662,11 +662,11 @@
bonobo_activate (); /* do now since we need it before main loop */
application = NULL;
-@@ -407,6 +409,7 @@
+@@ -372,6 +374,7 @@
}
}
+ nautilus_lockdown_finalize() ;
gnome_vfs_shutdown ();
-
+
--- a/patches/nautilus-13-locale.h.diff Mon Oct 23 13:28:38 2006 +0000
+++ b/patches/nautilus-13-locale.h.diff Mon Oct 23 13:58:18 2006 +0000
@@ -1,8 +1,9 @@
---- nautilus-2.12.1.orig/libnautilus-private/nautilus-file-operations.c 2005-10-14 12:06:21.853474000 -0400
-+++ nautilus-2.12.1/libnautilus-private/nautilus-file-operations.c 2005-10-14 12:13:30.742409329 -0400
-@@ -28,6 +28,7 @@
- #include <string.h>
+diff -urN naut.orig/libnautilus-private/nautilus-file-operations.c naut.new/libnautilus-private/nautilus-file-operations.c
+--- naut.orig/libnautilus-private/nautilus-file-operations.c 2006-10-23 11:50:45.270553000 +0100
++++ naut.new/libnautilus-private/nautilus-file-operations.c 2006-10-23 11:51:39.829323000 +0100
+@@ -29,6 +29,7 @@
#include <stdio.h>
+ #include <locale.h>
#include "nautilus-file-operations.h"
+#include <locale.h>
--- a/patches/nautilus-15-eel-show-error-dialog.diff Mon Oct 23 13:28:38 2006 +0000
+++ b/patches/nautilus-15-eel-show-error-dialog.diff Mon Oct 23 13:58:18 2006 +0000
@@ -1,5 +1,25 @@
---- nautilus-2.13.3/src/file-manager/fm-desktop-icon-view.c.orig 2006-01-06 11:42:25.925002000 +0000
-+++ nautilus-2.13.3/src/file-manager/fm-desktop-icon-view.c 2006-01-06 11:57:24.151530000 +0000
+diff -urN -x '*~' naut.orig/libnautilus-private/nautilus-program-choosing.c naut.new/libnautilus-private/nautilus-program-choosing.c
+--- naut.orig/libnautilus-private/nautilus-program-choosing.c 2006-10-23 12:10:45.564120000 +0100
++++ naut.new/libnautilus-private/nautilus-program-choosing.c 2006-10-23 12:11:34.587339000 +0100
+@@ -425,7 +425,6 @@
+ eel_show_error_dialog
+ (_("Sorry, This is a restricted application which "
+ "you may not run."), _("Restricted Application"),
+- _("Can't execute restricted applictions"),
+ NULL);
+ allowed = FALSE;
+ }
+@@ -890,7 +889,6 @@
+ eel_show_error_dialog
+ (_("Sorry, this command requires a terminal "),
+ _("Terminal access is restricted."),
+- _("Can't execute terminal"),
+ NULL);
+ }
+ } else {
+diff -urN -x '*~' naut.orig/src/file-manager/fm-desktop-icon-view.c naut.new/src/file-manager/fm-desktop-icon-view.c
+--- naut.orig/src/file-manager/fm-desktop-icon-view.c 2006-10-23 12:10:45.365365000 +0100
++++ naut.new/src/file-manager/fm-desktop-icon-view.c 2006-10-23 12:11:34.584007000 +0100
@@ -730,8 +730,7 @@
gtk_widget_get_screen (GTK_WIDGET (data)), &error);
@@ -10,21 +30,3 @@
g_error_free (error);
}
}
---- nautilus-2.13.3/libnautilus-private/nautilus-program-choosing.c.orig 2006-01-06 11:25:33.990462000 +0000
-+++ nautilus-2.13.3/libnautilus-private/nautilus-program-choosing.c 2006-01-06 11:57:56.108786000 +0000
-@@ -443,7 +443,6 @@
- eel_show_error_dialog
- (_("Sorry, This is a restricted application which "
- "you may not run."), _("Restricted Application"),
-- _("Can't execute restricted applictions"),
- NULL);
- allowed = FALSE;
- }
-@@ -888,7 +887,6 @@
- eel_show_error_dialog
- (_("Sorry, this command requires a terminal "),
- _("Terminal access is restricted."),
-- _("Can't execute terminal"),
- NULL);
- }
- } else {