/jds/bin/diff -uprN nautilus-2.26.3.old/libnautilus-private/Makefile.am nautilus-2.26.3/libnautilus-private/Makefile.am

--- nautilus-2.26.3.old/libnautilus-private/Makefile.am	2009-04-20 11:57:19.000000000 +0100

+++ nautilus-2.26.3/libnautilus-private/Makefile.am	2009-07-13 11:41:43.040463000 +0100

@@ -124,6 +124,8 @@ libnautilus_private_la_SOURCES = \

 	nautilus-lib-self-check-functions.h \

 	nautilus-link.c \

 	nautilus-link.h \

+	nautilus-lockdown.c \

+	nautilus-lockdown.h \

 	nautilus-marshal.c \

 	nautilus-marshal.h \

 	nautilus-merged-directory.c \

/jds/bin/diff -uprN nautilus-2.26.3.old/libnautilus-private/nautilus-directory-async.c nautilus-2.26.3/libnautilus-private/nautilus-directory-async.c

--- nautilus-2.26.3.old/libnautilus-private/nautilus-directory-async.c	2009-05-13 12:30:32.000000000 +0100

+++ nautilus-2.26.3/libnautilus-private/nautilus-directory-async.c	2009-07-13 11:41:43.043014000 +0100

@@ -856,6 +857,10 @@ should_skip_file (NautilusDirectory *dir

 		return TRUE;

 	}

+	if (nautilus_lockdown_is_forbidden_file(directory, info)) {

+		return TRUE;

+	}

+

 	return FALSE;

 }

/jds/bin/diff -uprN nautilus-2.26.3.old/libnautilus-private/nautilus-directory.c nautilus-2.26.3/libnautilus-private/nautilus-directory.c

--- nautilus-2.26.3.old/libnautilus-private/nautilus-directory.c	2009-04-20 11:57:19.000000000 +0100

+++ nautilus-2.26.3/libnautilus-private/nautilus-directory.c	2009-07-13 11:41:43.045220000 +0100

@@ -342,6 +342,7 @@ add_preferences_callbacks (void)

 	eel_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES,

 				      filtering_changed_callback,

 				      NULL);

+    nautilus_lockdown_notify_add(filtering_changed_callback, NULL) ;

 	eel_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_TEXT_IN_ICONS,

 				      async_data_preference_changed_callback,

 				      NULL);

/jds/bin/diff -uprN nautilus-2.26.3.old/libnautilus-private/nautilus-file.c nautilus-2.26.3/libnautilus-private/nautilus-file.c

--- nautilus-2.26.3.old/libnautilus-private/nautilus-file.c	2009-07-13 11:38:13.506664000 +0100

+++ nautilus-2.26.3/libnautilus-private/nautilus-file.c	2009-07-13 11:41:43.048782000 +0100

@@ -47,6 +47,7 @@

 #include "nautilus-users-groups-cache.h"

 #include "nautilus-vfs-file.h"

 #include "nautilus-saved-search-file.h"

+#include "nautilus-lockdown.h"

 #include <eel/eel-debug.h>

 #include <eel/eel-glib-extensions.h>

 #include <eel/eel-gtk-extensions.h>

@@ -2814,7 +2815,8 @@ nautilus_file_should_show (NautilusFile 

 		return TRUE;

 	} else {

 		return (show_hidden || (!nautilus_file_is_hidden_file (file) && !is_file_hidden (file))) &&

-			(show_backup || !nautilus_file_is_backup_file (file)) &&

+			(show_backup || !nautilus_file_is_backup_file (file) &&

+			!nautilus_lockdown_is_forbidden_nautilus_file(file)) &&

 			(show_foreign || !(nautilus_file_is_in_desktop (file) && nautilus_file_is_foreign_link (file)));

 	}

 }

/jds/bin/diff -uprN nautilus-2.26.3.old/libnautilus-private/nautilus-lockdown.c nautilus-2.26.3/libnautilus-private/nautilus-lockdown.c

--- nautilus-2.26.3.old/libnautilus-private/nautilus-lockdown.c	1970-01-01 01:00:00.000000000 +0100

+++ nautilus-2.26.3/libnautilus-private/nautilus-lockdown.c	2009-07-13 11:41:43.050482000 +0100

@@ -0,0 +1,332 @@

+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */

+/*

+ * Copyright (C) 2004 Sun Microsystems, 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.

+ *

+ * Authors:

+ *      Matt Keenan  <[email protected]>

+ *      Mark McLoughlin  <[email protected]>

+ */

+

+#include <config.h>

+

+#include "nautilus-lockdown.h"

+#include "nautilus-global-preferences.h"

+#include "nautilus-program-choosing.h"

+#include <eel/eel-preferences.h>

+#include <eel/eel-string.h>

+#include <libgnome/gnome-desktop-item.h>

+

+#include <string.h>

+

+#define N_LISTENERS 3

+

+typedef struct {

+        guint   initialized : 1;

+        guint   disable_command_line : 1;

+        guint   restrict_application_launching : 1;

+	

+        char**  allowed_applications;

+

+        guint   listeners [N_LISTENERS];

+

+        GSList *closures;

+} NautilusLockdown ;

+

+const gchar *command_line_execs[] = {

+	"/usr/bin/gnome-terminal",

+	"/usr/bin/xterm",

+};

+#define NUMBER_COMMAND_LINE_EXECS	2

+

+static NautilusLockdown nautilus_lockdown = { 0, };

+

+

+static inline void

+nautilus_lockdown_invoke_closures (NautilusLockdown *lockdown)

+{

+        GSList *l;

+

+        for (l = lockdown->closures; l; l = l->next)

+                g_closure_invoke (l->data, NULL, 0, NULL, NULL);

+}

+

+static void

+disable_command_line_notify (NautilusLockdown *lockdown)

+{

+        lockdown->disable_command_line = 

+            eel_preferences_get_boolean(

+                                    NAUTILUS_PREFERENCES_DISABLE_COMMANDLINE) ;

+        nautilus_lockdown_invoke_closures (lockdown);

+}

+

+static void

+restrict_application_launching_notify (NautilusLockdown *lockdown)

+{

+        lockdown->restrict_application_launching =

+                eel_preferences_get_boolean (

+                                NAUTILUS_PREFERENCES_RESTRICT_APP_LAUNCHING);

+        nautilus_lockdown_invoke_closures (lockdown);

+}

+

+static void

+allowed_applications_notify (NautilusLockdown *lockdown)

+{

+        g_strfreev(lockdown->allowed_applications) ;

+        lockdown->allowed_applications = 

+                eel_preferences_get_string_array(

+                                    NAUTILUS_PREFERENCES_ALLOWED_APPLICATIONS) ;

+        nautilus_lockdown_invoke_closures (lockdown);

+}

+

+static gboolean

+nautilus_lockdown_load_bool (NautilusLockdown         *lockdown,

+                          const char            *key,

+                          EelPreferencesCallback  notify_func)

+{

+        gboolean  retval = eel_preferences_get_boolean (key);

+

+        eel_preferences_add_callback(key, notify_func, lockdown) ;

+        return retval;

+}

+

+static char**

+nautilus_lockdown_load_allowed_applications (NautilusLockdown *lockdown)

+{

+        char **retval;

+

+        retval = eel_preferences_get_string_array(

+                                    NAUTILUS_PREFERENCES_ALLOWED_APPLICATIONS) ;

+        eel_preferences_add_callback(NAUTILUS_PREFERENCES_ALLOWED_APPLICATIONS,

+                                     allowed_applications_notify, lockdown) ;

+        return retval;

+}

+

+void

+nautilus_lockdown_init (void)

+{

+        nautilus_lockdown.disable_command_line =

+                nautilus_lockdown_load_bool (

+                                    &nautilus_lockdown,

+                                    NAUTILUS_PREFERENCES_DISABLE_COMMANDLINE,

+                                    disable_command_line_notify);

+        nautilus_lockdown.restrict_application_launching =

+                nautilus_lockdown_load_bool (

+                                    &nautilus_lockdown,

+                                    NAUTILUS_PREFERENCES_RESTRICT_APP_LAUNCHING,

+                                    restrict_application_launching_notify) ;

+        nautilus_lockdown.allowed_applications =

+                nautilus_lockdown_load_allowed_applications (

+                                                        &nautilus_lockdown) ;

+        nautilus_lockdown.initialized = TRUE;

+}

+

+void

+nautilus_lockdown_finalize (void)

+{

+    GSList *l = NULL ;

+

+        g_assert (nautilus_lockdown.initialized == TRUE);

+        eel_preferences_remove_callback(

+                                    NAUTILUS_PREFERENCES_DISABLE_COMMANDLINE,

+                                    disable_command_line_notify, 

+                                    &nautilus_lockdown) ;

+        eel_preferences_remove_callback(

+                                    NAUTILUS_PREFERENCES_RESTRICT_APP_LAUNCHING,

+                                    restrict_application_launching_notify, 

+                                    &nautilus_lockdown) ;

+        eel_preferences_remove_callback(

+                                    NAUTILUS_PREFERENCES_ALLOWED_APPLICATIONS,

+                                    allowed_applications_notify, 

+                                    &nautilus_lockdown) ;

+        g_strfreev(nautilus_lockdown.allowed_applications) ;

+        for (l = nautilus_lockdown.closures; l; l = l->next) {

+                g_closure_unref (l->data);

+        }

+        g_slist_free (nautilus_lockdown.closures);

+        nautilus_lockdown.closures = NULL;

+        nautilus_lockdown.initialized = FALSE;

+}

+

+gboolean

+nautilus_lockdown_is_command_line_disabled (void)

+{

+        g_assert (nautilus_lockdown.initialized == TRUE);

+        return nautilus_lockdown.disable_command_line;

+}

+

+gboolean

+nautilus_lockdown_is_app_launching_restricted (void)

+{

+        g_assert (nautilus_lockdown.initialized == TRUE);

+        return nautilus_lockdown.restrict_application_launching;

+}

+

+char**

+nautilus_lockdown_get_allowed_apps (void)

+{

+	g_assert (nautilus_lockdown.initialized == TRUE);

+	return nautilus_lockdown.allowed_applications;

+}

+

+static GClosure *

+nautilus_lockdown_notify_find (GSList    *closures,

+                            GCallback  callback_func,

+                            gpointer   user_data)

+{

+        GSList *l;

+

+        for (l = closures; l; l = l->next) {

+                GCClosure *cclosure = l->data;

+                GClosure  *closure  = l->data;

+

+                if (closure->data == user_data &&

+                    cclosure->callback == callback_func)

+                        return closure;

+        }

+

+        return NULL;

+}

+

+static void

+marshal_user_data (GClosure     *closure,

+                   GValue       *return_value,

+                   guint         n_param_values,

+                   const GValue *param_values,

+                   gpointer      invocation_hint,

+                   gpointer      marshal_data)

+{

+        GCClosure *cclosure = (GCClosure*) closure;

+

+        g_return_if_fail (cclosure->callback != NULL);

+        g_return_if_fail (n_param_values == 0);

+

+        ((void (*) (gpointer *))cclosure->callback) (closure->data);

+}

+

+void

+nautilus_lockdown_notify_add (GCallback callback_func,

+                           gpointer  user_data)

+{

+        GClosure *closure;

+

+        g_assert (nautilus_lockdown_notify_find (nautilus_lockdown.closures,

+                                              callback_func,

+                                              user_data) == NULL);

+        closure = g_cclosure_new (callback_func, user_data, NULL);

+        g_closure_set_marshal (closure, marshal_user_data);

+        nautilus_lockdown.closures = g_slist_append (nautilus_lockdown.closures,

+                                                  closure);

+}

+

+void

+nautilus_lockdown_notify_remove (GCallback callback_func,

+                              gpointer  user_data)

+{

+        GClosure *closure;

+

+        closure = nautilus_lockdown_notify_find (nautilus_lockdown.closures,

+                                              callback_func,

+                                              user_data);

+        g_assert (closure != NULL);

+        nautilus_lockdown.closures = g_slist_remove (nautilus_lockdown.closures,

+                                                  closure);

+        g_closure_unref (closure);

+}

+

+static gboolean nautilus_lockdown_is_forbidden_uri(const char *uri)

+{

+    GnomeDesktopItem *item = NULL ;

+    GError *error = NULL ;

+    const char *command = NULL ;

+    gboolean ret_code = FALSE ;

+

+    item = gnome_desktop_item_new_from_uri(uri, 0, &error) ;

+    if (error != NULL) { 

+        g_error_free(error) ;

+        return ret_code ; 

+    }

+    command = gnome_desktop_item_get_string(item, GNOME_DESKTOP_ITEM_EXEC) ;

+    if (command == NULL) { return ret_code ; }

+    return nautilus_lockdown_is_forbidden_command(command) ;

+}

+

+static const char *GNOME_APP_MIME = "application/x-gnome-app-info" ;

+static const char *DESKTOP_MIME = "application/x-desktop" ;

+

+gboolean nautilus_lockdown_is_forbidden_file(NautilusDirectory *directory,

+                                             GFileInfo *file)

+{

+    const char *mime_type = g_file_info_get_content_type(file) ;

+

+    if (nautilus_lockdown.restrict_application_launching &&

+            mime_type != NULL &&

+            (strcmp(mime_type, GNOME_APP_MIME) == 0 ||

+             strcmp(mime_type, DESKTOP_MIME) == 0)) {

+        return nautilus_lockdown_is_forbidden_command(

+                    nautilus_directory_get_file_uri(directory, g_file_info_get_name(file)));

+    }

+    return FALSE ;

+}

+

+gboolean nautilus_lockdown_is_forbidden_nautilus_file(NautilusFile *file)

+{

+    if (nautilus_lockdown.restrict_application_launching &&

+                        (nautilus_file_is_mime_type(file, GNOME_APP_MIME) ||

+                         nautilus_file_is_mime_type(file, DESKTOP_MIME))) {

+        return nautilus_lockdown_is_forbidden_uri(nautilus_file_get_uri(file)) ;

+    }

+    return FALSE ;

+}

+

+gboolean nautilus_lockdown_is_forbidden_command(const char *command)

+{

+    char *commandCopy = NULL ;

+    char *program = NULL ;

+    char *allowed_app;

+    gboolean retCode = FALSE ;

+

+    if (!nautilus_lockdown.restrict_application_launching) { return retCode ; }

+    commandCopy = g_shell_unquote(command, NULL) ;

+    if (commandCopy == NULL) { commandCopy = g_strdup(command) ; }

+    strtok(commandCopy, " ") ;

+    if (g_path_is_absolute(commandCopy)) {

+        program = commandCopy ;

+    }

+    else {

+        char *stripped = g_path_get_basename(commandCopy) ;

+

+        program = g_find_program_in_path(stripped) ;

+        g_free(stripped) ;

+        g_free(commandCopy) ;

+    }

+    retCode = TRUE;

+    if (program != NULL) {

+        int i = 0;

+        allowed_app = nautilus_lockdown.allowed_applications[i];

+        while (allowed_app != NULL) {

+            if (!strcmp(allowed_app, program)) {

+                retCode = FALSE;

+                break;   

+            }

+            allowed_app = nautilus_lockdown.allowed_applications[++i];

+        }

+        g_free(program) ;

+    }

+    return retCode ;

+}

+

/jds/bin/diff -uprN nautilus-2.26.3.old/libnautilus-private/nautilus-lockdown.h nautilus-2.26.3/libnautilus-private/nautilus-lockdown.h

--- nautilus-2.26.3.old/libnautilus-private/nautilus-lockdown.h	1970-01-01 01:00:00.000000000 +0100

+++ nautilus-2.26.3/libnautilus-private/nautilus-lockdown.h	2009-07-13 11:41:43.050917000 +0100

@@ -0,0 +1,54 @@

+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */

+/*

+ * Copyright (C) 2004 Sun Microsystems, 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.

+ *

+ * Authors:

+ *      Matt Keenan  <[email protected]>

+ *      Mark McLoughlin  <[email protected]>

+ */

+

+#ifndef __NAUTILUS_LOCKDOWN_H__

+#define __NAUTILUS_LOCKDOWN_H__

+

+#include <libgnomevfs/gnome-vfs.h>

+#include <glib.h>

+#include <glib-object.h>

+#include "nautilus-directory.h"

+

+G_BEGIN_DECLS

+

+void nautilus_lockdown_init     (void);

+void nautilus_lockdown_finalize (void);

+

+void nautilus_lockdown_notify_add    (GCallback callback_func,

+                                   gpointer  user_data);

+void nautilus_lockdown_notify_remove (GCallback callback_func,

+                                   gpointer  user_data);

+

+gboolean nautilus_lockdown_is_command_line_disabled(void) ;

+gboolean nautilus_lockdown_is_app_launching_restricted(void) ;

+char** nautilus_lockdown_get_allowed_apps(void) ;

+

+gboolean nautilus_lockdown_is_forbidden_file(NautilusDirectory *directory,

+                                             GFileInfo *file) ;

+gboolean nautilus_lockdown_is_forbidden_nautilus_file(NautilusFile *file) ;

+gboolean nautilus_lockdown_is_forbidden_command(const char *command) ;

+

+G_END_DECLS

+

+#endif /* __NAUTILUS_LOCKDOWN_H__ */

/jds/bin/diff -uprN nautilus-2.26.3.old/src/file-manager/fm-directory-view.c nautilus-2.26.3/src/file-manager/fm-directory-view.c

--- nautilus-2.26.3.old/src/file-manager/fm-directory-view.c	2009-05-18 20:44:27.000000000 +0100

+++ nautilus-2.26.3/src/file-manager/fm-directory-view.c	2009-07-13 11:41:43.055406000 +0100

@@ -314,6 +314,7 @@ static void     reset_update_interval   

 static void     schedule_idle_display_of_pending_files         (FMDirectoryView      *view);

 static void     unschedule_display_of_pending_files            (FMDirectoryView      *view);

 static void     disconnect_model_handlers                      (FMDirectoryView      *view);

+static void     lockdown_changed_callback (gpointer context);

 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,

@@ -9575,6 +9579,15 @@ fm_directory_view_handle_uri_list_drop (

 	g_free (container_uri);

 }

+static void lockdown_changed_callback(gpointer context)

+{

+    FMDirectoryView *directory_view = FM_DIRECTORY_VIEW(context) ;

+

+    if (directory_view != NULL && directory_view->details->model != NULL) {

+        load_directory(directory_view, directory_view->details->model) ;

+    }

+}

+

 void

 fm_directory_view_handle_text_drop (FMDirectoryView  *view,

 				    const char       *text,

/jds/bin/diff -uprN nautilus-2.26.3.old/src/file-manager/fm-tree-model.c nautilus-2.26.3/src/file-manager/fm-tree-model.c

--- nautilus-2.26.3.old/src/file-manager/fm-tree-model.c	2009-04-20 11:57:20.000000000 +0100

+++ nautilus-2.26.3/src/file-manager/fm-tree-model.c	2009-07-13 11:41:43.056901000 +0100

@@ -38,6 +38,8 @@