nautilus-07-lockdown.diff revision 12886
12886N/Adiff -urN -x '*.orig' -x '*.rej' naut.orig/libnautilus-private/Makefile.am naut.new/libnautilus-private/Makefile.am
12886N/A--- naut.orig/libnautilus-private/Makefile.am 2008-04-14 17:53:59.706712000 +0100
12886N/A+++ naut.new/libnautilus-private/Makefile.am 2008-04-14 18:23:32.059843000 +0100
12886N/Adiff -urN -x '*.orig' -x '*.rej' naut.orig/libnautilus-private/nautilus-directory-async.c naut.new/libnautilus-private/nautilus-directory-async.c
12886N/A--- naut.orig/libnautilus-private/nautilus-directory-async.c 2008-04-14 17:53:59.745421000 +0100
12886N/A+++ naut.new/libnautilus-private/nautilus-directory-async.c 2008-04-14 18:23:32.069957000 +0100
12128N/A #include "nautilus-signaller.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>
12886N/Adiff -urN -x '*.orig' -x '*.rej' naut.orig/libnautilus-private/nautilus-directory.c naut.new/libnautilus-private/nautilus-directory.c
12886N/A--- naut.orig/libnautilus-private/nautilus-directory.c 2008-04-14 17:53:59.752856000 +0100
12886N/A+++ naut.new/libnautilus-private/nautilus-directory.c 2008-04-14 18:23:32.074578000 +0100
12886N/Adiff -urN -x '*.orig' -x '*.rej' naut.orig/libnautilus-private/nautilus-file.c naut.new/libnautilus-private/nautilus-file.c
12886N/A--- naut.orig/libnautilus-private/nautilus-file.c 2008-04-14 17:54:00.030872000 +0100
12886N/A+++ naut.new/libnautilus-private/nautilus-file.c 2008-04-14 18:23:32.097670000 +0100
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>
12886N/Adiff -urN -x '*.orig' -x '*.rej' naut.orig/libnautilus-private/nautilus-global-preferences.c naut.new/libnautilus-private/nautilus-global-preferences.c
12886N/A--- naut.orig/libnautilus-private/nautilus-global-preferences.c 2008-04-14 17:54:00.033186000 +0100
12886N/A+++ naut.new/libnautilus-private/nautilus-global-preferences.c 2008-04-14 18:23:32.104344000 +0100
9802N/A static const char *EXTRA_MONITOR_PATHS[] = { "/system/gnome_vfs",
12886N/Adiff -urN -x '*.orig' -x '*.rej' naut.orig/libnautilus-private/nautilus-global-preferences.h naut.new/libnautilus-private/nautilus-global-preferences.h
12886N/A--- naut.orig/libnautilus-private/nautilus-global-preferences.h 2008-04-14 17:54:00.034082000 +0100
12886N/A+++ naut.new/libnautilus-private/nautilus-global-preferences.h 2008-04-14 18:23:32.109271000 +0100
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"
12886N/Adiff -urN -x '*.orig' -x '*.rej' naut.orig/libnautilus-private/nautilus-lockdown.c naut.new/libnautilus-private/nautilus-lockdown.c
12886N/A--- naut.orig/libnautilus-private/nautilus-lockdown.c 1970-01-01 01:00:00.000000000 +0100
12886N/A+++ naut.new/libnautilus-private/nautilus-lockdown.c 2008-04-14 18:23:32.111692000 +0100
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>
12128N/A+#include <eel/eel-string.h>
9802N/A+#include <libgnome/gnome-desktop-item.h>
9802N/A+ nautilus_lockdown.initialized = TRUE;
9802N/A+ g_assert (nautilus_lockdown.initialized == TRUE);
12128N/A+ g_strfreev(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 ; }
12337N/A+ allowed_app = nautilus_lockdown.allowed_applications[i];
12337N/A+ allowed_app = nautilus_lockdown.allowed_applications[++i];
12886N/Adiff -urN -x '*.orig' -x '*.rej' naut.orig/libnautilus-private/nautilus-lockdown.h naut.new/libnautilus-private/nautilus-lockdown.h
12886N/A--- naut.orig/libnautilus-private/nautilus-lockdown.h 1970-01-01 01:00:00.000000000 +0100
12886N/A+++ naut.new/libnautilus-private/nautilus-lockdown.h 2008-04-14 18:23:32.432577000 +0100
12886N/A+#include <libgnomevfs/gnome-vfs.h>
12886N/A+#include <glib-object.h>
12886N/A+#include "nautilus-directory.h"
12886N/Adiff -urN -x '*.orig' -x '*.rej' naut.orig/libnautilus-private/nautilus-program-choosing.c naut.new/libnautilus-private/nautilus-program-choosing.c
12886N/A--- naut.orig/libnautilus-private/nautilus-program-choosing.c 2008-04-14 17:54:00.092820000 +0100
12886N/A+++ naut.new/libnautilus-private/nautilus-program-choosing.c 2008-04-14 18:23:47.609828000 +0100
12886N/Adiff -urN -x '*.orig' -x '*.rej' naut.orig/src/file-manager/fm-directory-view.c naut.new/src/file-manager/fm-directory-view.c
12886N/A--- naut.orig/src/file-manager/fm-directory-view.c 2008-04-14 17:54:00.836176000 +0100
12886N/A+++ naut.new/src/file-manager/fm-directory-view.c 2008-04-14 18:23:32.474227000 +0100
12886N/Adiff -urN -x '*.orig' -x '*.rej' naut.orig/src/file-manager/fm-tree-model.c naut.new/src/file-manager/fm-tree-model.c
12886N/A--- naut.orig/src/file-manager/fm-tree-model.c 2008-04-14 17:54:00.861415000 +0100
12886N/A+++ naut.new/src/file-manager/fm-tree-model.c 2008-04-14 18:23:32.488874000 +0100
9802N/A #include <gtk/gtkenums.h>
9802N/A+#include <libnautilus-private/nautilus-lockdown.h>
12886N/Adiff -urN -x '*.orig' -x '*.rej' naut.orig/src/file-manager/fm-tree-view.c naut.new/src/file-manager/fm-tree-view.c
12886N/A--- naut.orig/src/file-manager/fm-tree-view.c 2008-04-14 17:54:00.863969000 +0100
12886N/A+++ naut.new/src/file-manager/fm-tree-view.c 2008-04-14 18:23:32.503241000 +0100
12886N/A--- naut.orig/src/nautilus-main.c 2008-04-14 17:54:00.547911000 +0100
12886N/A+++ naut.new/src/nautilus-main.c 2008-04-14 18:23:32.506766000 +0100
9802N/A #include <libnautilus-private/nautilus-debug-log.h>
9802N/A+#include <libnautilus-private/nautilus-lockdown.h>
9802N/A #include <libxml/parser.h>
12886N/Adiff -urN -x '*.orig' -x '*.rej' naut.orig/src/nautilus-window-menus.c naut.new/src/nautilus-window-menus.c
12886N/A--- naut.orig/src/nautilus-window-menus.c 2008-04-14 17:54:00.611647000 +0100
12886N/A+++ naut.new/src/nautilus-window-menus.c 2008-04-14 18:23:32.518524000 +0100
11976N/A+#include <libnautilus-private/nautilus-lockdown.h>
11976N/A #include <libnautilus-private/nautilus-module.h>
12886N/Adiff -urN -x '*.orig' -x '*.rej' naut.orig/src/nautilus-window-private.h naut.new/src/nautilus-window-private.h
12886N/A--- naut.orig/src/nautilus-window-private.h 2008-04-14 17:54:00.612601000 +0100
12886N/A+++ naut.new/src/nautilus-window-private.h 2008-04-14 18:23:32.532852000 +0100
12886N/Adiff -urN -x '*.orig' -x '*.rej' naut.orig/src/nautilus-window.c naut.new/src/nautilus-window.c
12886N/A--- naut.orig/src/nautilus-window.c 2008-04-14 17:54:00.614770000 +0100
12886N/A+++ naut.new/src/nautilus-window.c 2008-04-14 18:23:32.538268000 +0100