nautilus-07-lockdown.diff revision 10821
9802N/Adiff -urN -x '*~' naut.orig/libnautilus-private/Makefile.am naut.new/libnautilus-private/Makefile.am
9802N/A--- naut.orig/libnautilus-private/Makefile.am 2007-01-23 12:14:21.876956000 +0000
9802N/A+++ naut.new/libnautilus-private/Makefile.am 2007-01-23 12:15:48.497580000 +0000
9802N/Adiff -urN -x '*~' naut.orig/libnautilus-private/nautilus-directory-async.c naut.new/libnautilus-private/nautilus-directory-async.c
9802N/A--- naut.orig/libnautilus-private/nautilus-directory-async.c 2007-01-23 12:14:21.400862000 +0000
9802N/A+++ naut.new/libnautilus-private/nautilus-directory-async.c 2007-01-23 12:15:48.501944000 +0000
9802N/A #include "nautilus-file-utilities.h"
9802N/A #include "nautilus-global-preferences.h"
9802N/A #include "nautilus-link.h"
9802N/A+#include "nautilus-lockdown.h"
9802N/A #include "nautilus-marshal.h"
9802N/A #include "nautilus-metafile.h"
9802N/A #include <eel/eel-glib-extensions.h>
9802N/Adiff -urN -x '*~' naut.orig/libnautilus-private/nautilus-directory.c naut.new/libnautilus-private/nautilus-directory.c
9802N/A--- naut.orig/libnautilus-private/nautilus-directory.c 2007-01-23 12:14:22.112062000 +0000
9802N/A+++ naut.new/libnautilus-private/nautilus-directory.c 2007-01-23 12:15:48.504527000 +0000
9802N/Adiff -urN -x '*~' naut.orig/libnautilus-private/nautilus-file.c naut.new/libnautilus-private/nautilus-file.c
9802N/A--- naut.orig/libnautilus-private/nautilus-file.c 2007-01-23 12:14:22.111021000 +0000
9802N/A+++ naut.new/libnautilus-private/nautilus-file.c 2007-01-23 12:15:48.511205000 +0000
9802N/A #include "nautilus-users-groups-cache.h"
9802N/A #include "nautilus-vfs-file.h"
9802N/A #include "nautilus-saved-search-file.h"
9802N/A+#include "nautilus-lockdown.h"
9802N/A #include <eel/eel-debug.h>
9802N/A #include <eel/eel-glib-extensions.h>
9802N/A #include <eel/eel-gtk-extensions.h>
9802N/Adiff -urN -x '*~' naut.orig/libnautilus-private/nautilus-global-preferences.c naut.new/libnautilus-private/nautilus-global-preferences.c
9802N/A--- naut.orig/libnautilus-private/nautilus-global-preferences.c 2007-01-23 12:14:21.403884000 +0000
9802N/A+++ naut.new/libnautilus-private/nautilus-global-preferences.c 2007-01-23 12:15:48.513608000 +0000
9802N/A static const char *EXTRA_MONITOR_PATHS[] = { "/system/gnome_vfs",
9802N/Adiff -urN -x '*~' naut.orig/libnautilus-private/nautilus-global-preferences.h naut.new/libnautilus-private/nautilus-global-preferences.h
9802N/A--- naut.orig/libnautilus-private/nautilus-global-preferences.h 2007-01-23 12:14:22.123798000 +0000
9802N/A+++ naut.new/libnautilus-private/nautilus-global-preferences.h 2007-01-23 12:15:48.514623000 +0000
10821N/A #define NAUTILUS_PREFERENCES_DESKTOP_NETWORK_NAME "desktop/network_icon_name"
9802N/A #define NAUTILUS_PREFERENCES_DESKTOP_PRIMARY_SCREEN "desktop/primary_screen"
9802N/A+#define NAUTILUS_PREFERENCES_DISABLE_COMMANDLINE "/desktop/gnome/lockdown/disable_command_line"
9802N/A+#define NAUTILUS_PREFERENCES_RESTRICT_APP_LAUNCHING "/desktop/gnome/lockdown/restrict_application_launching"
9802N/A+#define NAUTILUS_PREFERENCES_ALLOWED_APPLICATIONS "/desktop/gnome/lockdown/allowed_applications"
9802N/Adiff -urN -x '*~' naut.orig/libnautilus-private/nautilus-lockdown.c naut.new/libnautilus-private/nautilus-lockdown.c
9802N/A--- naut.orig/libnautilus-private/nautilus-lockdown.c 1970-01-01 01:00:00.000000000 +0100
9802N/A+++ naut.new/libnautilus-private/nautilus-lockdown.c 2007-01-23 12:15:48.515981000 +0000
9802N/A+#include "nautilus-lockdown.h"
9802N/A+#include "nautilus-global-preferences.h"
9802N/A+#include "nautilus-program-choosing.h"
9802N/A+#include <eel/eel-preferences.h>
9802N/A+#include <libgnome/gnome-desktop-item.h>
9802N/A+ nautilus_lockdown.initialized = TRUE;
9802N/A+ g_assert (nautilus_lockdown.initialized == TRUE);
9802N/A+ eel_string_list_free(nautilus_lockdown.allowed_applications) ;
9802N/A+ for (l = nautilus_lockdown.closures; l; l = l->next) {
9802N/A+ g_slist_free (nautilus_lockdown.closures);
9802N/A+ nautilus_lockdown.closures = NULL;
9802N/A+ nautilus_lockdown.initialized = FALSE;
9802N/A+ g_assert (nautilus_lockdown.initialized == TRUE);
9802N/A+ g_assert (nautilus_lockdown.initialized == TRUE);
9802N/A+ g_assert (nautilus_lockdown.initialized == TRUE);
9802N/A+ g_assert (nautilus_lockdown_notify_find (nautilus_lockdown.closures,
9802N/A+ closure = nautilus_lockdown_notify_find (nautilus_lockdown.closures,
9802N/A+static const char *GNOME_APP_MIME = "application/x-gnome-app-info" ;
9802N/A+static const char *DESKTOP_MIME = "application/x-desktop" ;
9802N/A+ if (!nautilus_lockdown.restrict_application_launching) { return retCode ; }
9802N/A+ retCode = !eel_string_list_contains(nautilus_lockdown.allowed_applications,
9802N/Adiff -urN -x '*~' naut.orig/libnautilus-private/nautilus-lockdown.h naut.new/libnautilus-private/nautilus-lockdown.h
9802N/A--- naut.orig/libnautilus-private/nautilus-lockdown.h 1970-01-01 01:00:00.000000000 +0100
9802N/A+++ naut.new/libnautilus-private/nautilus-lockdown.h 2007-01-23 12:15:48.516717000 +0000
9802N/A+#include <libgnomevfs/gnome-vfs.h>
9802N/A+#include <glib-object.h>
9802N/A+#include <eel/eel-string-list.h>
9802N/A+#include "nautilus-directory.h"
9802N/Adiff -urN -x '*~' naut.orig/libnautilus-private/nautilus-program-choosing.c naut.new/libnautilus-private/nautilus-program-choosing.c
9802N/A--- naut.orig/libnautilus-private/nautilus-program-choosing.c 2007-01-23 12:14:21.881695000 +0000
9802N/A+++ naut.new/libnautilus-private/nautilus-program-choosing.c 2007-01-23 12:15:48.518753000 +0000
9802N/Adiff -urN -x '*~' naut.orig/src/file-manager/fm-directory-view.c naut.new/src/file-manager/fm-directory-view.c
9802N/A--- naut.orig/src/file-manager/fm-directory-view.c 2007-01-23 12:14:22.597209000 +0000
9802N/A+++ naut.new/src/file-manager/fm-directory-view.c 2007-01-23 12:15:48.534029000 +0000
9802N/Adiff -urN -x '*~' naut.orig/src/file-manager/fm-tree-model.c naut.new/src/file-manager/fm-tree-model.c
9802N/A--- naut.orig/src/file-manager/fm-tree-model.c 2007-01-23 12:14:22.594599000 +0000
9802N/A+++ naut.new/src/file-manager/fm-tree-model.c 2007-01-23 12:15:48.536375000 +0000
9802N/A #include <gtk/gtkenums.h>
9802N/A+#include <libnautilus-private/nautilus-lockdown.h>
9802N/Adiff -urN -x '*~' naut.orig/src/file-manager/fm-tree-view.c naut.new/src/file-manager/fm-tree-view.c
9802N/A--- naut.orig/src/file-manager/fm-tree-view.c 2007-01-23 12:14:22.602086000 +0000
9802N/A+++ naut.new/src/file-manager/fm-tree-view.c 2007-01-23 12:15:48.538554000 +0000
9802N/A--- naut.orig/src/nautilus-main.c 2007-01-23 12:14:22.880410000 +0000
9802N/A+++ naut.new/src/nautilus-main.c 2007-01-23 12:18:05.096259000 +0000
9802N/A #include <libnautilus-private/nautilus-debug-log.h>
9802N/A+#include <libnautilus-private/nautilus-lockdown.h>
9802N/A #include <libxml/parser.h>