diff --git a/nautilus-146947-rename-bad-parameters-message.diff b/nautilus-146947-rename-bad-parameters-message.diff deleted file mode 100644 index 28412c4..0000000 --- a/nautilus-146947-rename-bad-parameters-message.diff +++ /dev/null @@ -1,24 +0,0 @@ -http://bugzilla.gnome.org/show_bug.cgi?id=350976 - -https://bugzilla.novell.com/show_bug.cgi?id=146947 - -libsmbclient returns EINVAL if one sends it filenames with illegal -characters, like '\'. Display a more useful error message than -"generic error" in that case. - -Index: src/file-manager/fm-error-reporting.c -=================================================================== ---- src/file-manager/fm-error-reporting.c.orig -+++ src/file-manager/fm-error-reporting.c -@@ -124,6 +124,11 @@ fm_report_error_renaming_file (NautilusF - new_name_truncated); - } - break; -+ case GNOME_VFS_ERROR_BAD_PARAMETERS: -+ message = g_strdup_printf (_("Couldn't rename \"%s\" to \"%s\". Please make sure the new name has " -+ "only valid characters in it."), -+ original_name_truncated, new_name_truncated); -+ break; - default: - break; - } diff --git a/nautilus-3.1.3.tar.bz2 b/nautilus-3.1.3.tar.bz2 deleted file mode 100644 index 0e3dfbf..0000000 --- a/nautilus-3.1.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bd2560e00638720edc1e6b3ecd5a0cad67dcfa3be64926df34789e2b470e849d -size 5677735 diff --git a/nautilus-3.1.4.tar.bz2 b/nautilus-3.1.4.tar.bz2 new file mode 100644 index 0000000..f837e8b --- /dev/null +++ b/nautilus-3.1.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:572fdb653c57b4ff91da02380625ba324abc978f128ca4bede9bffd248bfac91 +size 5676103 diff --git a/nautilus-bgo350950-search-desktop.diff b/nautilus-bgo350950-search-desktop.diff deleted file mode 100644 index 281a547..0000000 --- a/nautilus-bgo350950-search-desktop.diff +++ /dev/null @@ -1,146 +0,0 @@ -http://bugzilla.gnome.org/show_bug.cgi?id=350950 - -From: Federico Mena Quintero - -Install a nautilus-search.desktop with a shortcut to -x-nautilus-search: so that people can easily add *that* link to their -desktops. ---- - - Makefile.am | 1 - nautilus-search.desktop.in | 113 ++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 114 insertions(+), 0 deletions(-) - create mode 100644 nautilus-search.desktop.in - - -Index: nautilus-2.91.4/data/Makefile.am -=================================================================== ---- nautilus-2.91.4.orig/data/Makefile.am -+++ nautilus-2.91.4/data/Makefile.am -@@ -10,6 +10,7 @@ desktop_in_files = \ - nautilus.desktop.in \ - nautilus-home.desktop.in \ - nautilus-computer.desktop.in \ -+ nautilus-search.desktop.in \ - nautilus-folder-handler.desktop.in \ - nautilus-browser.desktop.in \ - nautilus-autorun-software.desktop.in -Index: nautilus-2.91.4/data/nautilus-search.desktop.in -=================================================================== ---- /dev/null -+++ nautilus-2.91.4/data/nautilus-search.desktop.in -@@ -0,0 +1,114 @@ -+[Desktop Entry] -+Encoding=UTF-8 -+Name=Search for Files... -+Name[bg]=Търсене за файлове... -+Name[ca]=Cerca fitxers... -+Name[cs]=Hledat soubory... -+Name[cy]=Chwilio am Ffeiliau... -+Name[da]=Søg efter filer... -+Name[de]=Nach Dateien suchen... -+Name[el]=Αναζήτηση για αρχεία... -+Name[en_CA]=Search for Files... -+Name[en_GB]=Search for Files... -+Name[es]=Buscar archivos... -+Name[et]=Otsi faile... -+Name[fa]=جستجوی پرونده‌ها... -+Name[fi]=Etsi tiedostoja... -+Name[fr]=Rechercher des fichiers... -+Name[gl]=Buscar ficheiros... -+Name[gu]=ફાઈલો માટે શોધો... -+Name[he]=חפש קבצים... -+Name[hi]=फ़ाइलों हेतु ढूंढें... -+Name[hu]=Fájlok keresése... -+Name[id]=Cari Berkas... -+Name[it]=Cerca file... -+Name[ja]=ファイルの検索... -+Name[ko]=파일 찾기... -+Name[lt]=Ieškoti bylų... -+Name[mk]=Барај датотеки... -+Name[nb]=Søk etter filer... -+Name[ne]=...फाइलहरूलाई खोज्नुहोस् -+Name[nl]=Bestanden zoeken... -+Name[no]=Søk etter filer... -+Name[pa]=ਫਾਇਲਾਂ ਦੀ ਖੋਜ... -+Name[pl]=Wyszukaj pliki... -+Name[pt]=Procurar Ficheiros... -+Name[pt_BR]=Procurar por Arquivos... -+Name[ro]=Caută fişiere... -+Name[ru]=Поиск файлов... -+Name[sq]=Kërko për files... -+Name[sr]=Тражи датотеке... -+Name[sr@Latn]=Traži datoteke... -+Name[sv]=Sök efter filer... -+Name[th]=ค้นหาแฟ้ม... -+Name[tr]=Dosya Ara... -+Name[uk]=Пошук файлів... -+Name[vi]=Tìm kiếm tập tin... -+Name[xh]=Khangela iiFayili... -+Name[zh_CN]=搜索文件... -+Name[zh_TW]=搜尋檔案... -+Comment=Find files, folders, and documents on your computer -+Comment[ar]=إيجاد ملفّات و مجلّدات و مستندات على حاسوبك -+Comment[az]=Kompüterinizdəki faylları, qovluqları və sənədləri tapın -+Comment[bg]=Намиране на файлове, папки и документи на вашия компютър -+Comment[bs]=Nalazi datoteke, direktorije, i dokumente na vašem računaru -+Comment[ca]=Cerca fitxers, carpetes i documents al vostre ordinador -+Comment[cs]=Hledat soubory, adresáře a dokumenty ve vašem počítači -+Comment[cy]=Canfod ffeiliau, ffolderi a dogfennau ar eich cyfrifiadur -+Comment[da]=Find filer, mapper og dokumenter på din maskine -+Comment[de]=Dateien, Ordner und Dokumente auf Ihrem Computer finden -+Comment[el]=Εύρεση αρχείων, φακέλων και εγγράφων στον υπολογιστή σας -+Comment[en_CA]=Find files, folders, and documents on your computer -+Comment[en_GB]=Find files, folders, and documents on your computer -+Comment[es]=Busca archivos, carpetas y documentos en su equipo -+Comment[et]=Failide, kataloogide ja dokumentide otsimine -+Comment[eu]=Aurkitu fitxategiak, karpetak eta dokumentuak zure ordenagailuan -+Comment[fa]=پیدا کردن پرونده‌ها، پوشه‌ها و نوشتارها در کامپیوتر شما -+Comment[fi]=Etsi tiedostoja, kansioita ja asiakirjoja tietokoneeltasi -+Comment[fr]=Recherche des fichiers, des dossiers et des documents dans votre ordinateur -+Comment[gl]=Bucar ficheiros, carpetas, e documentos no seu ordenador -+Comment[gu]=તમારા કમ્પ્યૂટર પર ફાઈલો, ફોલ્ડરો અને દસ્તાવેજો શોધો -+Comment[he]=מצא קבצים, תיקיות ומסמכים במחשב שלך -+Comment[hi]=कंप्यूटर में फ़ाइल, फ़ोल्डर और दस्तावेज़ ढूंढें -+Comment[hu]=Fájlok, mappák és dokumentumok keresése a számítógépen -+Comment[id]=Cari berkas, folder, dan dokumen dalam komputer -+Comment[it]=Trova file, cartelle e documenti nel computer -+Comment[ja]=お使いのコンピュータにあるファイルやフォルダ、ドキュメントを検索します -+Comment[ko]=컴퓨터에 들어 있는 파일, 폴더, 문서 찾기 -+Comment[lt]=Raskite bylas, aplankus ir dokumentus esančius Jūsų kompiuteryje -+Comment[mk]=Најдете датотеки, папки и документи на Вашиот компјутер -+Comment[ms]=Cari fail, folder, dan dokumen pada komputer anda -+Comment[nb]=Finn filer, mapper og dokumenter på din datamaskin -+Comment[ne]=कम्प्युटरका फाइलहरू, फोल्डरहरू, र कागजातहरू फेला पार्नुहोस् -+Comment[nl]=Bestanden, mappen en documenten zoeken op uw computer -+Comment[nn]=Finn filer, mapper og dokument på datamaskinen -+Comment[no]=Finn filer, mapper og dokumenter på din datamaskin -+Comment[pa]=ਆਪਣੇ ਕੰਪਿਊਟਰ ਤੇ ਫਾਇਲਾਂ, ਫੋਲਡਰ ਤੇ ਦਸਤਾਵੇਜ਼ ਲੱਭੋ -+Comment[pl]=Wyszukuje pliki, foldery i dokumenty na komputerze -+Comment[pt]=Procurar ficheiros, pastas e documentos no seu computador -+Comment[pt_BR]=Encontre arquivos, pastas e documentos em seu computador -+Comment[ro]=Caută fişiere, dosare şi documente pe calculatorul dumneavoastră -+Comment[ru]=Поиск файлов, папок и документов на вашем компьютере -+Comment[sk]=Hľadať súbory, priečinky a dokumenty na vašom počítači -+Comment[sq]=Gjej files, kartela, dhe dokumentë në kompjuterin tuaj -+Comment[sr]=Тражите датотеке, фасцикле и документе на вашем рачунару -+Comment[sr@Latn]=Tražite datoteke, fascikle i dokumente na vašem računaru -+Comment[sv]=Sök filer, mappar och dokument på din dator -+Comment[ta]=உங்கள் கணினியில் உள்ள கோப்புகள்,அடைவுகள் மற்றும் ஆவணங்களை கண்டுபிடி -+Comment[th]=ค้นหาแฟ้ม โฟลเดอร์ หรือเอกสาร ในคอมพิวเตอร์เครื่องนี้ -+Comment[tr]=Bilgisayarınızdaki dosyaları, klasörleri ve belgeleri bulun -+Comment[uk]=Пошук файлів, тек та документів на вашому комп'ютері -+Comment[vi]=Tìm tập tin, thư mục và tài liệu trên máy tính. -+Comment[xh]=Ukufumana iifayili, iziqulathi zeefayili, namaxwebhu kwikhompyutha yakho -+Comment[zh_CN]=在您的计算机上查找文件、文件夹和文档 -+Comment[zh_TW]=在電腦中搜尋檔案、資料夾和文件 -+Exec=nautilus --no-desktop x-nautilus-search: -+Icon=system-search -+Terminal=false -+Type=Application -+StartupNotify=true -+Categories=Core; -+OnlyShowIn=GNOME; -+X-GNOME-Bugzilla-Bugzilla=GNOME -+X-GNOME-Bugzilla-Product=nautilus -+X-GNOME-Bugzilla-Component=general diff --git a/nautilus-bnc363122-lockdown-context-menus.diff b/nautilus-bnc363122-lockdown-context-menus.diff deleted file mode 100644 index 38a22be..0000000 --- a/nautilus-bnc363122-lockdown-context-menus.diff +++ /dev/null @@ -1,118 +0,0 @@ -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. - -Index: nautilus-2.28.0/libnautilus-private/apps_nautilus_preferences.schemas.in -=================================================================== ---- 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. - - - - -- -+ -+ -+ /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. -+ -+ -+ -+ - - -Index: nautilus-2.28.0/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 */ - #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, ...); - -Index: nautilus-2.28.0/libnautilus-private/nautilus-global-preferences.c -=================================================================== ---- 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[] = { -+ { NAUTILUS_LOCKDOWN_DISABLE_CONTEXT_MENUS, -+ PREFERENCE_BOOLEAN, -+ GINT_TO_POINTER (FALSE) -+ }, - { NAUTILUS_PREFERENCES_EXIT_WITH_LAST_WINDOW, - PREFERENCE_BOOLEAN, - GINT_TO_POINTER (TRUE) -Index: nautilus-2.28.0/libnautilus-private/nautilus-global-preferences.h -=================================================================== ---- 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.28.0/src/file-manager/fm-directory-view.c -=================================================================== ---- 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)); - -+ 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. - */ -@@ -8757,6 +8763,12 @@ fm_directory_view_pop_up_background_cont - { - 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. - */ -@@ -8864,6 +8876,12 @@ fm_directory_view_pop_up_location_contex - - 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; -+ } -+ - if (location != NULL) { - file = nautilus_file_get_by_uri (location); - } else { diff --git a/nautilus.changes b/nautilus.changes index 1dff7aa..5b50bd8 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Wed Aug 3 11:37:05 CEST 2011 - vuntz@opensuse.org + +- Update to version 3.1.4: + + Remove the 'Create Launcher' options from the desktop + + Improve the 'File System' entry in the places sidebar + + Remove 'Clear History' from the 'Go' menu + + Fix location bar not expanding full width in the toolbar + + Use new g_format_size() instead of g_format_size_for_display() +- Drop nautilus-replace-deprecated-function.patch: fixed upstream. +- Drop nautilus-bnc363122-lockdown-context-menus.diff: as discussed + upstream, in bgo#532228, this patch isn't really useful as + actions are still available in the toolbar. So instead of + pretending to offer a feature that is broken, it's better to not + do anything. +- Drop nautilus-146947-rename-bad-parameters-message.diff: this was + marked as needing a rebase, and the upstream bug (bgo#350976) now + has a proper patch for gvfs. +- Drop nautilus-bgo350950-search-desktop.diff: we should use + tracker-needle instead now, and possibly gnome-documents in the + future. + +------------------------------------------------------------------- +Fri Jul 29 06:58:02 UTC 2011 - glin@suse.com + +- Rebase nautilus-bnc363122-lockdown-context-menus.diff +- Add nautilus-replace-deprecated-function.patch to fix + 64bit-portability-issue from rpmlint + ------------------------------------------------------------------- Sat Jul 2 08:59:07 CEST 2011 - vuntz@opensuse.org diff --git a/nautilus.spec b/nautilus.spec index 6c525a9..6d6732f 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -20,7 +20,7 @@ Name: nautilus License: GPLv2+ Group: Productivity/File utilities -Version: 3.1.3 +Version: 3.1.4 Release: 1 # FIXME: replace libexempi-devel BuildRequires with pkgconfig(exempi-2.0) once fixed exempi is in Summary: File Manager for the GNOME Desktop @@ -30,14 +30,8 @@ Source1: mount-archive.desktop Source99: baselibs.conf Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build -# PATCH-NEEDS-REBASE PATCH-FIX-UPSTREAM nautilus-bgo350950-search-desktop.diff bgo350950 federico@novell.com -- add a desktop file for Nautilus search interface -Patch4: nautilus-bgo350950-search-desktop.diff -# PATCH-NEEDS-REBASE nautilus-146947-rename-bad-parameters-message.diff bgo350976 bnc146947 federico@novell.com -- The upstream bug is still open, so we need to check if it's still needed (you just need a samba share to test). If yes, we should port the patch to gio -Patch9: nautilus-146947-rename-bad-parameters-message.diff # PATCH-NEEDS-REBASE nautilus-drives-and-volumes-on-desktop.diff bnc335411 federico@novell.com Patch15: nautilus-drives-and-volumes-on-desktop.diff -# PATCH_NEEDS-REBASE PATCH-FIX-OPENSUSE nautilus-bnc363122-lockdown-context-menus.diff bnc363122 federico@novell.com -Patch20: nautilus-bnc363122-lockdown-context-menus.diff # PATCH-NEEDS-REBASE nautilus-sysadmin-desktop-items.diff fate305252 federico@novell.com -- Support sysadmin-defined desktop items (was PATCH-FEATURE-OPENSUSE) Patch21: nautilus-sysadmin-desktop-items.diff # needed for directory ownership @@ -101,10 +95,7 @@ This package contains development files for nautilus. %setup -q translation-update-upstream #gnome-patch-translation-prepare -##%patch4 -p1 -#%patch9 -p0 ### %patch15 -p1 -####%patch20 -p1 #%patch21 -p1 #gnome-patch-translation-update