pool/nautilus
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

checked in

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=68
This commit is contained in:
OBS User autobuild 2009-11-25 13:26:31 +00:00 committed by Git OBS Bridge
parent 8971c38d64
commit 40e636f75c
2 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
nautilus-bnc363122-lockdown-context-menus.diff
View File

@ -6,11 +6,11 @@ quick-and-dirty kiosks.
This adds an /apps/nautilus/lockdown/disable_context_menus GConf key; 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. if set to true, it will disable all the contextual menus on file views.
Index: nautilus-2.28.0/libnautilus-private/apps_nautilus_preferences.schemas.in Index: nautilus-2.23.4/libnautilus-private/apps_nautilus_preferences.schemas.in
=================================================================== ===================================================================
--- nautilus-2.28.0.orig/libnautilus-private/apps_nautilus_preferences.schemas.in --- nautilus-2.23.4.orig/libnautilus-private/apps_nautilus_preferences.schemas.in
+++ nautilus-2.28.0/libnautilus-private/apps_nautilus_preferences.schemas.in +++ nautilus-2.23.4/libnautilus-private/apps_nautilus_preferences.schemas.in
@@ -1186,6 +1186,21 @@ most cases, this should be left alone. - @@ -1019,6 +1019,21 @@ most cases, this should be left alone. -
</long> </long>
</locale> </locale>
</schema> </schema>
@ -33,10 +33,10 @@ Index: nautilus-2.28.0/libnautilus-private/apps_nautilus_preferences.schemas.in
+ +
</schemalist> </schemalist>
</gconfschemafile> </gconfschemafile>
Index: nautilus-2.28.0/libnautilus-private/nautilus-debug-log.h Index: nautilus-2.23.4/libnautilus-private/nautilus-debug-log.h
=================================================================== ===================================================================
--- nautilus-2.28.0.orig/libnautilus-private/nautilus-debug-log.h --- nautilus-2.23.4.orig/libnautilus-private/nautilus-debug-log.h
+++ nautilus-2.28.0/libnautilus-private/nautilus-debug-log.h +++ nautilus-2.23.4/libnautilus-private/nautilus-debug-log.h
@@ -30,6 +30,7 @@ @@ -30,6 +30,7 @@
#define NAUTILUS_DEBUG_LOG_DOMAIN_USER "USER" /* always enabled */ #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_ASYNC "async" /* when asynchronous notifications come in */
@ -45,11 +45,11 @@ Index: nautilus-2.28.0/libnautilus-private/nautilus-debug-log.h
void nautilus_debug_log (gboolean is_milestone, const char *domain, const char *format, ...); void nautilus_debug_log (gboolean is_milestone, const char *domain, const char *format, ...);
Index: nautilus-2.28.0/libnautilus-private/nautilus-global-preferences.c Index: nautilus-2.23.4/libnautilus-private/nautilus-global-preferences.c
=================================================================== ===================================================================
--- nautilus-2.28.0.orig/libnautilus-private/nautilus-global-preferences.c --- nautilus-2.23.4.orig/libnautilus-private/nautilus-global-preferences.c
+++ nautilus-2.28.0/libnautilus-private/nautilus-global-preferences.c +++ nautilus-2.23.4/libnautilus-private/nautilus-global-preferences.c
@@ -236,6 +236,10 @@ typedef struct @@ -229,6 +229,10 @@ typedef struct
* YOU SHOULD EDIT THE SCHEMAS FILE TO CHANGE DEFAULTS. * YOU SHOULD EDIT THE SCHEMAS FILE TO CHANGE DEFAULTS.
*/ */
static const PreferenceDefault preference_defaults[] = { static const PreferenceDefault preference_defaults[] = {
@ -59,25 +59,25 @@ Index: nautilus-2.28.0/libnautilus-private/nautilus-global-preferences.c
+ }, + },
{ NAUTILUS_PREFERENCES_EXIT_WITH_LAST_WINDOW, { NAUTILUS_PREFERENCES_EXIT_WITH_LAST_WINDOW,
PREFERENCE_BOOLEAN, PREFERENCE_BOOLEAN,
GINT_TO_POINTER (TRUE) GINT_TO_POINTER (FALSE)
Index: nautilus-2.28.0/libnautilus-private/nautilus-global-preferences.h Index: nautilus-2.23.4/libnautilus-private/nautilus-global-preferences.h
=================================================================== ===================================================================
--- nautilus-2.28.0.orig/libnautilus-private/nautilus-global-preferences.h --- nautilus-2.23.4.orig/libnautilus-private/nautilus-global-preferences.h
+++ nautilus-2.28.0/libnautilus-private/nautilus-global-preferences.h +++ nautilus-2.23.4/libnautilus-private/nautilus-global-preferences.h
@@ -33,6 +33,8 @@ G_BEGIN_DECLS @@ -30,6 +30,8 @@
/* Whether exit when last window destroyed */
#define NAUTILUS_PREFERENCES_EXIT_WITH_LAST_WINDOW "preferences/exit_with_last_window" G_BEGIN_DECLS
+#define NAUTILUS_LOCKDOWN_DISABLE_CONTEXT_MENUS "lockdown/disable_context_menus" +#define NAUTILUS_LOCKDOWN_DISABLE_CONTEXT_MENUS "lockdown/disable_context_menus"
+ +
/* Which theme is active */ /* Which theme is active */
#define NAUTILUS_PREFERENCES_THEME "/desktop/gnome/file_views/icon_theme" #define NAUTILUS_PREFERENCES_THEME "/desktop/gnome/file_views/icon_theme"
Index: nautilus-2.28.0/src/file-manager/fm-directory-view.c Index: nautilus-2.23.4/src/file-manager/fm-directory-view.c
=================================================================== ===================================================================
--- nautilus-2.28.0.orig/src/file-manager/fm-directory-view.c --- nautilus-2.23.4.orig/src/file-manager/fm-directory-view.c
+++ nautilus-2.28.0/src/file-manager/fm-directory-view.c +++ nautilus-2.23.4/src/file-manager/fm-directory-view.c
@@ -8728,6 +8728,12 @@ fm_directory_view_pop_up_selection_conte @@ -7568,6 +7568,12 @@ fm_directory_view_pop_up_selection_conte
{ {
g_assert (FM_IS_DIRECTORY_VIEW (view)); g_assert (FM_IS_DIRECTORY_VIEW (view));
@ -90,7 +90,7 @@ Index: nautilus-2.28.0/src/file-manager/fm-directory-view.c
/* Make the context menu items not flash as they update to proper disabled, /* Make the context menu items not flash as they update to proper disabled,
* etc. states by forcing menus to update now. * etc. states by forcing menus to update now.
*/ */
@@ -8757,6 +8763,12 @@ fm_directory_view_pop_up_background_cont @@ -7597,6 +7603,12 @@ fm_directory_view_pop_up_background_cont
{ {
g_assert (FM_IS_DIRECTORY_VIEW (view)); g_assert (FM_IS_DIRECTORY_VIEW (view));
@ -103,7 +103,7 @@ Index: nautilus-2.28.0/src/file-manager/fm-directory-view.c
/* Make the context menu items not flash as they update to proper disabled, /* Make the context menu items not flash as they update to proper disabled,
* etc. states by forcing menus to update now. * etc. states by forcing menus to update now.
*/ */
@@ -8864,6 +8876,12 @@ fm_directory_view_pop_up_location_contex @@ -7704,6 +7716,12 @@ fm_directory_view_pop_up_location_contex
g_assert (FM_IS_DIRECTORY_VIEW (view)); g_assert (FM_IS_DIRECTORY_VIEW (view));

6
nautilus.changes
View File

@ -1,9 +1,3 @@
-------------------------------------------------------------------
Fri Nov 13 22:43:06 CET 2009 - dimstar@opensuse.org
- Refresh nautilus-bnc363122-lockdown-context-menus.diff to apply
with fuzz=0.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 21 22:01:01 CEST 2009 - dimstar@opensuse.org Mon Sep 21 22:01:01 CEST 2009 - dimstar@opensuse.org