Hello community, here is the log from the commit of package nautilus for openSUSE:Factory checked in at Wed Nov 25 14:26:15 CET 2009. -------- --- GNOME/nautilus/nautilus.changes 2009-09-21 22:23:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/nautilus/nautilus.changes 2009-11-13 22:43:35.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Nov 13 22:43:06 CET 2009 - dimstar@opensuse.org + +- Refresh nautilus-bnc363122-lockdown-context-menus.diff to apply + with fuzz=0. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nautilus.spec ++++++ --- /var/tmp/diff_new_pack.ONF3j0/_old 2009-11-25 14:25:46.000000000 +0100 +++ /var/tmp/diff_new_pack.ONF3j0/_new 2009-11-25 14:25:46.000000000 +0100 @@ -36,7 +36,7 @@ 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 ++++++ nautilus-bnc363122-lockdown-context-menus.diff ++++++ --- /var/tmp/diff_new_pack.ONF3j0/_old 2009-11-25 14:25:47.000000000 +0100 +++ /var/tmp/diff_new_pack.ONF3j0/_new 2009-11-25 14:25:47.000000000 +0100 @@ -6,11 +6,11 @@ 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 @@ + </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 @@ 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 @@ + }, { 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 @@ /* 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 @@ /* 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)); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org