diff --git a/nautilus-2.21.90.tar.bz2 b/nautilus-2.21.90.tar.bz2 deleted file mode 100644 index 6c6fab8..0000000 --- a/nautilus-2.21.90.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c01c7edac273312ba7786f127c6b56ae17b19726f69cb60b238f7487435c7aa7 -size 5018730 diff --git a/nautilus-2.21.91.tar.bz2 b/nautilus-2.21.91.tar.bz2 new file mode 100644 index 0000000..19aeb54 --- /dev/null +++ b/nautilus-2.21.91.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de90db63df98cb8a758a48e9be63cc6a7801454ee08ec3f36bb75098b74d23ae +size 5042057 diff --git a/nautilus-bnc363122-lockdown-context-menus.diff b/nautilus-bnc363122-lockdown-context-menus.diff new file mode 100644 index 0000000..11b2c35 --- /dev/null +++ b/nautilus-bnc363122-lockdown-context-menus.diff @@ -0,0 +1,118 @@ +https://bugzilla.novell.com/show_bug.cgi?id=363122 + +Add a way to disable context menus in Nautilus's file views, for +quick-and-dirty kiosks. + +This adds an /apps/nautilus/lockdown/disable_context_menus GConf key; +if set to true, it will disable all the contextual menus on file views. + +diff --git a/libnautilus-private/apps_nautilus_preferences.schemas.in b/libnautilus-private/apps_nautilus_preferences.schemas.in +index 8548bf0..82531dc 100644 +--- a/libnautilus-private/apps_nautilus_preferences.schemas.in ++++ b/libnautilus-private/apps_nautilus_preferences.schemas.in +@@ -989,6 +989,21 @@ most cases, this should be left alone. -->Sans 10 + + + +- ++ ++ ++ /schemas/apps/nautilus/lockdown/disable_context_menus ++ /apps/nautilus/lockdown/disable_context_menus ++ nautilus ++ bool ++ false ++ ++ Disable context menus in file views ++ ++ Set this to true if you are deploying a kiosk and don't want users ++ to access the context menu in file views. ++ ++ ++ ++ + + +diff --git a/libnautilus-private/nautilus-debug-log.h b/libnautilus-private/nautilus-debug-log.h +index 801610d..ad0152e 100644 +--- a/libnautilus-private/nautilus-debug-log.h ++++ b/libnautilus-private/nautilus-debug-log.h +@@ -30,6 +30,7 @@ + #define NAUTILUS_DEBUG_LOG_DOMAIN_USER "USER" /* always enabled */ + #define NAUTILUS_DEBUG_LOG_DOMAIN_ASYNC "async" /* when asynchronous notifications come in */ + #define NAUTILUS_DEBUG_LOG_DOMAIN_GLOG "GLog" /* used for GLog messages; don't use it yourself */ ++#define NAUTILUS_DEBUG_LOG_DOMAIN_LOCKDOWN "lockdown" /* when things get *not* done due to lockdown */ + + void nautilus_debug_log (gboolean is_milestone, const char *domain, const char *format, ...); + +diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c +index 5f4f498..279810f 100644 +--- a/libnautilus-private/nautilus-global-preferences.c ++++ b/libnautilus-private/nautilus-global-preferences.c +@@ -227,6 +227,10 @@ typedef struct + * YOU SHOULD EDIT THE SCHEMAS FILE TO CHANGE DEFAULTS. + */ + static const PreferenceDefault preference_defaults[] = { ++ { NAUTILUS_LOCKDOWN_DISABLE_CONTEXT_MENUS, ++ PREFERENCE_BOOLEAN, ++ GINT_TO_POINTER (FALSE) ++ }, + { NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES, + PREFERENCE_BOOLEAN, + GINT_TO_POINTER (FALSE) +diff --git a/libnautilus-private/nautilus-global-preferences.h b/libnautilus-private/nautilus-global-preferences.h +index e6d0301..96dc6e2 100644 +--- a/libnautilus-private/nautilus-global-preferences.h ++++ b/libnautilus-private/nautilus-global-preferences.h +@@ -30,6 +30,8 @@ + + G_BEGIN_DECLS + ++#define NAUTILUS_LOCKDOWN_DISABLE_CONTEXT_MENUS "lockdown/disable_context_menus" ++ + /* Which theme is active */ + #define NAUTILUS_PREFERENCES_THEME "/desktop/gnome/file_views/icon_theme" + +diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c +index f23434c..2a505a7 100644 +--- a/src/file-manager/fm-directory-view.c ++++ b/src/file-manager/fm-directory-view.c +@@ -7288,6 +7288,12 @@ fm_directory_view_pop_up_selection_context_menu (FMDirectoryView *view, + { + g_assert (FM_IS_DIRECTORY_VIEW (view)); + ++ if (eel_preferences_get_boolean (NAUTILUS_LOCKDOWN_DISABLE_CONTEXT_MENUS)) { ++ nautilus_debug_log (FALSE, NAUTILUS_DEBUG_LOG_DOMAIN_LOCKDOWN, ++ "Ignoring request to pop up the context menu for the view's selection"); ++ return; ++ } ++ + /* Make the context menu items not flash as they update to proper disabled, + * etc. states by forcing menus to update now. + */ +@@ -7317,6 +7323,12 @@ fm_directory_view_pop_up_background_context_menu (FMDirectoryView *view, + { + g_assert (FM_IS_DIRECTORY_VIEW (view)); + ++ if (eel_preferences_get_boolean (NAUTILUS_LOCKDOWN_DISABLE_CONTEXT_MENUS)) { ++ nautilus_debug_log (FALSE, NAUTILUS_DEBUG_LOG_DOMAIN_LOCKDOWN, ++ "Ignoring request to pop up the context menu for the view's background"); ++ return; ++ } ++ + /* Make the context menu items not flash as they update to proper disabled, + * etc. states by forcing menus to update now. + */ +@@ -7345,6 +7357,12 @@ fm_directory_view_pop_up_location_context_menu (FMDirectoryView *view, + { + g_assert (FM_IS_DIRECTORY_VIEW (view)); + ++ if (eel_preferences_get_boolean (NAUTILUS_LOCKDOWN_DISABLE_CONTEXT_MENUS)) { ++ nautilus_debug_log (FALSE, NAUTILUS_DEBUG_LOG_DOMAIN_LOCKDOWN, ++ "Ignoring request to pop up the context menu for the view"); ++ return; ++ } ++ + /* always update the menu before showing it. Shouldn't be too expensive. */ + real_update_location_menu (view); + diff --git a/nautilus.changes b/nautilus.changes index 3efc3b4..2377267 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Wed Feb 20 22:07:55 CET 2008 - federico@novell.com + +- Added nautilus-bnc363122-lockdown-disable-context-menus.diff to implement + https://bugzilla.novell.com/show_bug.cgi?id=363122 - have a way to disable + context menus in file views for quick-and-dirty kiosk setups. + +------------------------------------------------------------------- +Wed Feb 20 15:59:48 CET 2008 - maw@suse.de + +- Update to version 2.21.91: + + String cleanups + + Inhibit autorun for things we mount ourselves + + Fix crashes and leaks + + Only show selinux context if selinux is detected + + Default to move, not copying, when dragging from the trash + + Don't autorun/automount non-local mounts + + Fix case where we could run out of file descriptors + + Handle drop of files on the desktop + + Fix sensitivity of delete from the trash menu item + + Fix open w/ context menu in always-use-browser mode. + ------------------------------------------------------------------- Wed Feb 6 20:40:13 CET 2008 - maw@suse.de diff --git a/nautilus.spec b/nautilus.spec index a7f4b0e..7bba23d 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -1,5 +1,5 @@ # -# spec file for package nautilus (Version 2.21.90) +# spec file for package nautilus (Version 2.21.91) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -10,12 +10,13 @@ # norootforbuild + Name: nautilus BuildRequires: cdparanoia eel-devel fdupes gnome-common gnome-icon-theme gnome-patch-translation gvfs-devel intltool libbeagle-devel libexempi-devel libexif-devel libgnomeui-devel libidl librsvg-devel perl-XML-Parser update-desktop-files License: GPL v2 or later Group: Productivity/File utilities -Version: 2.21.90 -Release: 7 +Version: 2.21.91 +Release: 1 Summary: The GNOME 2.x Desktop File Manager Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.20/%{name}-%{version}.tar.bz2 Url: http://www.gnome.org @@ -46,6 +47,7 @@ Patch17: nautilus-181941-i18n.patch Patch18: nautilus-330298-297983-fix-overlapping-desktop-icons.diff Patch19: desktop-icon.patch #Patch19: nautilus-desktop-icon.patch +Patch20: nautilus-bnc363122-lockdown-context-menus.diff Requires: gnome-icon-theme Requires: %{name}-lang = %{version} Requires: gvfs @@ -97,6 +99,7 @@ gnome-patch-translation-prepare %patch17 -p1 ### %patch18 -p1 %patch19 -p1 +%patch20 -p1 gnome-patch-translation-update %build @@ -179,6 +182,22 @@ fi %{_libdir}/pkgconfig/*.pc %changelog +* Wed Feb 20 2008 federico@novell.com +- Added nautilus-bnc363122-lockdown-disable-context-menus.diff to implement + https://bugzilla.novell.com/show_bug.cgi?id=363122 - have a way to disable + context menus in file views for quick-and-dirty kiosk setups. +* Wed Feb 20 2008 maw@suse.de +- Update to version 2.21.91: + + String cleanups + + Inhibit autorun for things we mount ourselves + + Fix crashes and leaks + + Only show selinux context if selinux is detected + + Default to move, not copying, when dragging from the trash + + Don't autorun/automount non-local mounts + + Fix case where we could run out of file descriptors + + Handle drop of files on the desktop + + Fix sensitivity of delete from the trash menu item + + Fix open w/ context menu in always-use-browser mode. * Wed Feb 06 2008 maw@suse.de - Explicitly require gvfs (bnc#358748). * Tue Feb 05 2008 jpr@suse.de