Accepting request 25010 from GNOME:Factory
Copy from GNOME:Factory/nautilus based on submit request 25010 from user dimstar OBS-URL: https://build.opensuse.org/request/show/25010 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nautilus?expand=0&rev=67
This commit is contained in:
OBS User autobuild
Git OBS Bridge
parent
10282c79f5
commit
ccabd08086
@ -6,11 +6,11 @@ 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.
|
||||
|
||||
Index: nautilus-2.23.4/libnautilus-private/apps_nautilus_preferences.schemas.in
|
||||
Index: nautilus-2.28.0/libnautilus-private/apps_nautilus_preferences.schemas.in
|
||||
===================================================================
|
||||
--- nautilus-2.23.4.orig/libnautilus-private/apps_nautilus_preferences.schemas.in
|
||||
+++ nautilus-2.23.4/libnautilus-private/apps_nautilus_preferences.schemas.in
|
||||
@@ -1019,6 +1019,21 @@ most cases, this should be left alone. -
|
||||
--- nautilus-2.28.0.orig/libnautilus-private/apps_nautilus_preferences.schemas.in
|
||||
+++ nautilus-2.28.0/libnautilus-private/apps_nautilus_preferences.schemas.in
|
||||
@@ -1186,6 +1186,21 @@ most cases, this should be left alone. -
|
||||
</long>
|
||||
</locale>
|
||||
</schema>
|
||||
@ -33,10 +33,10 @@ Index: nautilus-2.23.4/libnautilus-private/apps_nautilus_preferences.schemas.in
|
||||
+
|
||||
</schemalist>
|
||||
</gconfschemafile>
|
||||
Index: nautilus-2.23.4/libnautilus-private/nautilus-debug-log.h
|
||||
Index: nautilus-2.28.0/libnautilus-private/nautilus-debug-log.h
|
||||
===================================================================
|
||||
--- nautilus-2.23.4.orig/libnautilus-private/nautilus-debug-log.h
|
||||
+++ nautilus-2.23.4/libnautilus-private/nautilus-debug-log.h
|
||||
--- nautilus-2.28.0.orig/libnautilus-private/nautilus-debug-log.h
|
||||
+++ nautilus-2.28.0/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 */
|
||||
@ -45,11 +45,11 @@ Index: nautilus-2.23.4/libnautilus-private/nautilus-debug-log.h
|
||||
|
||||
void nautilus_debug_log (gboolean is_milestone, const char *domain, const char *format, ...);
|
||||
|
||||
Index: nautilus-2.23.4/libnautilus-private/nautilus-global-preferences.c
|
||||
Index: nautilus-2.28.0/libnautilus-private/nautilus-global-preferences.c
|
||||
===================================================================
|
||||
--- nautilus-2.23.4.orig/libnautilus-private/nautilus-global-preferences.c
|
||||
+++ nautilus-2.23.4/libnautilus-private/nautilus-global-preferences.c
|
||||
@@ -229,6 +229,10 @@ typedef struct
|
||||
--- nautilus-2.28.0.orig/libnautilus-private/nautilus-global-preferences.c
|
||||
+++ nautilus-2.28.0/libnautilus-private/nautilus-global-preferences.c
|
||||
@@ -236,6 +236,10 @@ typedef struct
|
||||
* YOU SHOULD EDIT THE SCHEMAS FILE TO CHANGE DEFAULTS.
|
||||
*/
|
||||
static const PreferenceDefault preference_defaults[] = {
|
||||
@ -59,25 +59,25 @@ Index: nautilus-2.23.4/libnautilus-private/nautilus-global-preferences.c
|
||||
+ },
|
||||
{ NAUTILUS_PREFERENCES_EXIT_WITH_LAST_WINDOW,
|
||||
PREFERENCE_BOOLEAN,
|
||||
GINT_TO_POINTER (FALSE)
|
||||
Index: nautilus-2.23.4/libnautilus-private/nautilus-global-preferences.h
|
||||
GINT_TO_POINTER (TRUE)
|
||||
Index: nautilus-2.28.0/libnautilus-private/nautilus-global-preferences.h
|
||||
===================================================================
|
||||
--- nautilus-2.23.4.orig/libnautilus-private/nautilus-global-preferences.h
|
||||
+++ nautilus-2.23.4/libnautilus-private/nautilus-global-preferences.h
|
||||
@@ -30,6 +30,8 @@
|
||||
|
||||
G_BEGIN_DECLS
|
||||
--- nautilus-2.28.0.orig/libnautilus-private/nautilus-global-preferences.h
|
||||
+++ nautilus-2.28.0/libnautilus-private/nautilus-global-preferences.h
|
||||
@@ -33,6 +33,8 @@ G_BEGIN_DECLS
|
||||
/* Whether exit when last window destroyed */
|
||||
#define NAUTILUS_PREFERENCES_EXIT_WITH_LAST_WINDOW "preferences/exit_with_last_window"
|
||||
|
||||
+#define NAUTILUS_LOCKDOWN_DISABLE_CONTEXT_MENUS "lockdown/disable_context_menus"
|
||||
+
|
||||
/* Which theme is active */
|
||||
#define NAUTILUS_PREFERENCES_THEME "/desktop/gnome/file_views/icon_theme"
|
||||
|
||||
Index: nautilus-2.23.4/src/file-manager/fm-directory-view.c
|
||||
Index: nautilus-2.28.0/src/file-manager/fm-directory-view.c
|
||||
===================================================================
|
||||
--- nautilus-2.23.4.orig/src/file-manager/fm-directory-view.c
|
||||
+++ nautilus-2.23.4/src/file-manager/fm-directory-view.c
|
||||
@@ -7568,6 +7568,12 @@ fm_directory_view_pop_up_selection_conte
|
||||
--- nautilus-2.28.0.orig/src/file-manager/fm-directory-view.c
|
||||
+++ nautilus-2.28.0/src/file-manager/fm-directory-view.c
|
||||
@@ -8728,6 +8728,12 @@ fm_directory_view_pop_up_selection_conte
|
||||
{
|
||||
g_assert (FM_IS_DIRECTORY_VIEW (view));
|
||||
|
||||
@ -90,7 +90,7 @@ Index: nautilus-2.23.4/src/file-manager/fm-directory-view.c
|
||||
/* Make the context menu items not flash as they update to proper disabled,
|
||||
* etc. states by forcing menus to update now.
|
||||
*/
|
||||
@@ -7597,6 +7603,12 @@ fm_directory_view_pop_up_background_cont
|
||||
@@ -8757,6 +8763,12 @@ fm_directory_view_pop_up_background_cont
|
||||
{
|
||||
g_assert (FM_IS_DIRECTORY_VIEW (view));
|
||||
|
||||
@ -103,7 +103,7 @@ Index: nautilus-2.23.4/src/file-manager/fm-directory-view.c
|
||||
/* Make the context menu items not flash as they update to proper disabled,
|
||||
* etc. states by forcing menus to update now.
|
||||
*/
|
||||
@@ -7704,6 +7716,12 @@ fm_directory_view_pop_up_location_contex
|
||||
@@ -8864,6 +8876,12 @@ fm_directory_view_pop_up_location_contex
|
||||
|
||||
g_assert (FM_IS_DIRECTORY_VIEW (view));
|
||||
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
||||
@ -36,7 +36,7 @@ BuildRequires: update-desktop-files
|
||||
License: GPL v2 or later
|
||||
Group: Productivity/File utilities
|
||||
Version: 2.28.0
|
||||
Release: 1
|
||||
Release: 2
|
||||
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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user