OBS User unknown 2008-01-30 21:16:51 +00:00 committed by Git OBS Bridge
parent bb7e657562
commit 0358014087
6 changed files with 144 additions and 55 deletions

View File

@ -6,17 +6,19 @@ libsmbclient returns EINVAL if one sends it filenames with illegal
characters, like '\'. Display a more useful error message than
"generic error" in that case.
--- src/file-manager/fm-error-reporting.c.orig 2006-01-16 13:20:30.000000000 -0600
+++ src/file-manager/fm-error-reporting.c 2006-01-31 13:00:05.000000000 -0600
@@ -133,6 +133,11 @@
message = g_strdup_printf (_("Couldn't change the name of \"%s\" because it is on a read-only disk"),
original_name_truncated);
break;
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:
/* We should invent decent error messages for every case we actually experience. */
g_warning ("Hit unhandled case %d (%s) in fm_report_error_renaming_file",
default:
break;
}

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:98f9d9f7bc89db67cbcc4c7d08ec72175b8c9b3eb9489f7869c5cec9f16feb08
size 4916284

3
nautilus-2.21.90.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c01c7edac273312ba7786f127c6b56ae17b19726f69cb60b238f7487435c7aa7
size 5018730

View File

@ -5,20 +5,24 @@ https://bugzilla.novell.com/show_bug.cgi?id=117333
Use "gnome-fs-directory" instead of "file-manager" as an icon. A
folder is more recognizable than a filing cabinet.
--- nautilus-2.15.4/nautilus-file-management-properties.desktop.in.in
+++ nautilus-2.15.4/nautilus-file-management-properties.desktop.in.in
@@ -3,7 +3,7 @@
Index: nautilus-2.21.5/nautilus-file-management-properties.desktop.in.in
===================================================================
--- nautilus-2.21.5.orig/nautilus-file-management-properties.desktop.in.in
+++ nautilus-2.21.5/nautilus-file-management-properties.desktop.in.in
@@ -3,7 +3,7 @@ Encoding=UTF-8
_Name=File Management
_Comment=Change how files are managed
_Comment=Change the behaviour and appearance of file manager windows
Exec=nautilus-file-management-properties
-Icon=file-manager
+Icon=gnome-fs-directory
Terminal=false
Type=Application
StartupNotify=true
--- nautilus-2.15.4/nautilus.desktop.in.in
+++ nautilus-2.15.4/nautilus.desktop.in.in
@@ -4,7 +4,7 @@
Index: nautilus-2.21.5/nautilus.desktop.in.in
===================================================================
--- nautilus-2.21.5.orig/nautilus.desktop.in.in
+++ nautilus-2.21.5/nautilus.desktop.in.in
@@ -4,7 +4,7 @@ _Name=File Browser
_Comment=Browse the file system with the file manager
TryExec=nautilus
Exec=nautilus --no-desktop --browser %U
@ -27,9 +31,11 @@ folder is more recognizable than a filing cabinet.
Terminal=false
StartupNotify=true
Type=Application
--- nautilus-2.15.4/src/nautilus-file-management-properties.c
+++ nautilus-2.15.4/src/nautilus-file-management-properties.c
@@ -632,7 +632,7 @@
Index: nautilus-2.21.5/src/nautilus-file-management-properties.c
===================================================================
--- nautilus-2.21.5.orig/src/nautilus-file-management-properties.c
+++ nautilus-2.21.5/src/nautilus-file-management-properties.c
@@ -667,7 +667,7 @@ nautilus_file_management_properties_dial
G_CALLBACK (nautilus_file_management_properties_dialog_response_cb),
xml_dialog);
@ -38,14 +44,16 @@ folder is more recognizable than a filing cabinet.
if (window) {
gtk_window_set_screen (GTK_WINDOW (dialog), gtk_window_get_screen(window));
--- nautilus-2.15.4/src/nautilus-navigation-window.c
+++ nautilus-2.15.4/src/nautilus-navigation-window.c
@@ -851,7 +851,7 @@
static char *
real_get_icon_name (NautilusWindow *window)
Index: nautilus-2.21.5/src/nautilus-navigation-window.c
===================================================================
--- nautilus-2.21.5.orig/src/nautilus-navigation-window.c
+++ nautilus-2.21.5/src/nautilus-navigation-window.c
@@ -949,7 +949,7 @@ real_set_title (NautilusWindow *window,
static NautilusIconInfo *
real_get_icon (NautilusWindow *window)
{
- return g_strdup ("file-manager");
+ return g_strdup ("gnome-fs-directory");
- return nautilus_icon_info_lookup_from_name ("file-manager", 48);
+ return nautilus_icon_info_lookup_from_name ("gnome-fs-directory", 48);
}
static void

View File

@ -1,3 +1,41 @@
-------------------------------------------------------------------
Wed Jan 30 20:48:24 CET 2008 - maw@suse.de
- Add extensions-2.0 directory.
-------------------------------------------------------------------
Tue Jan 29 11:41:50 CST 2008 - maw@suse.de
- Update to version 2.21.90:
+ Regenerate thumbnails when files change
+ Fix crashes
+ New autorun and automount support
+ Allow unmount of current location if its a mountpoint
+ Use thousand separators in all numbers (if used by locale)
+ Fix leaks
+ Performance improvements
+ Update to latest glib APIs
+ Fix bug that lost metadata from older versions
+ Fix crashes
+ Enable paste into folder for desktop icons
+ Better finding of autorun files on case sensitive media
- Remove libtool archives.
-------------------------------------------------------------------
Fri Jan 25 12:30:38 CST 2008 - maw@suse.de
- Update to version 2.21.5:
+ Totally replaced gnome-vfs use with gio
+ New implementation of file operations like copy/move with
a shared progress dialog
+ Update pkg-config files with new extensions dir
+ Handle dnd of desktop icons
+ Implement some missing unmount/eject operations
+ Add autorun/automount feature
+ Better handling of sensitivity of delete menu items
+ Better handling of mount/unmount/eject in many places
+ Fix for extensions with submenus.
-------------------------------------------------------------------
Fri Jan 18 20:31:09 CET 2008 - jpr@suse.de

View File

@ -1,5 +1,5 @@
#
# spec file for package nautilus (Version 2.20.0)
# spec file for package nautilus (Version 2.21.90)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -14,29 +14,38 @@ Name: nautilus
BuildRequires: cdparanoia eel-devel fdupes gnome-common gnome-icon-theme gnome-patch-translation intltool libbeagle-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.20.0
Release: 51
Version: 2.21.90
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
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Patch1: nautilus-config-defaults.patch
# FIXME: This patch needs to be reevaluated and, if necessary, fixed up.
Patch2: nautilus-name-length.patch
Patch3: nautilus-onlyshowin.patch
Patch4: nautilus-search-desktop.patch
# PATCH-NEEDS-REBASE nautilus-icon.patch
Patch5: nautilus-icon.patch
Patch6: nautilus-docpath.patch
Patch7: nautilus-disable-zoom-control-and-view-as-option-menu.patch
# FIXME: This patch needs to be fixed up.
Patch8: nautilus-default-thumbnail-size.diff
Patch9: nautilus-146947-rename-bad-parameters-message.diff
# PATCH-NEEDS-REBASE nautilus-mime.patch
Patch10: nautilus-mime.patch
# FIXME: This patch needs to be reevaluated and, if necessary, fixed up.
Patch11: nautilus-158158-ignore-foreign-desktop-files.diff
Patch12: nautilus-212649-search-bar-visibility.patch
# FIXME: This patch needs to be reevaluated and, if necessary, fixed up.
Patch13: nautilus-6014-network-servers-in-places-sidebar.diff
# FIXME: This patch needs to be reevaluated and, if necessary, fixed up.
Patch15: nautilus-drives-and-volumes-on-desktop.diff
Patch17: nautilus-181941-i18n.patch
# FIXME: This patch needs to be reevaluated and, if necessary, fixed up.
Patch18: nautilus-330298-297983-fix-overlapping-desktop-icons.diff
Patch19: desktop-icon.patch
#Patch19: nautilus-desktop-icon.patch
Requires: gnome-icon-theme
Requires: %{name}-lang = %{version}
Provides: nautilus2
@ -69,23 +78,23 @@ features of the Nautilus file manager.
%setup -q
gnome-patch-translation-prepare
%patch1 -p1
%patch2 -p0
#%patch2 -p0
%patch3 -p1
%if ! %sles_version
%patch4
%endif
%patch5 -p1
### %patch5 -p1
%patch6 -p0
%patch7
%patch8 -p1
### %patch8 -p1
%patch9 -p0
%patch10
%patch11 -p1
### %patch10
### %patch11 -p1
%patch12
%patch13 -p1
%patch15 -p1
### %patch13 -p1
### %patch15 -p1
%patch17 -p1
%patch18 -p1
### %patch18 -p1
%patch19 -p1
gnome-patch-translation-update
@ -102,10 +111,12 @@ chmod -x COPYING
%install
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT/%{_libdir}/*.*a
rm docs/Makefile*
ln -s ../icons/gnome/24x24/devices/gnome-fs-client.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
ln -s ../icons/gnome/24x24/places/gnome-fs-home.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
ln -s ../icons/gnome/24x24/actions/system-search.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
ln -s ../icons/gnome/24x24/places/user-home.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
%suse_update_desktop_file -N "Nautilus" -G "File Browser" -D "user-guide/user-guide.xml?gosnautilus-1" nautilus System FileManager
%suse_update_desktop_file -D "user-guide/user-guide.xml?gosnautilus-1" nautilus-computer System FileManager
%suse_update_desktop_file -D "user-guide/user-guide.xml?gosnautilus-1" nautilus-file-management-properties System FileManager X-SuSE-ControlCenter-LookAndFeel
@ -116,6 +127,7 @@ ln -s ../icons/gnome/24x24/actions/system-search.png $RPM_BUILD_ROOT%{_datadir}/
%endif
%suse_update_desktop_file -G "File Browser" -D "user-guide/user-guide.xml?gosnautilus-1" network-scheme System Network
mkdir -p $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-1.0
mkdir -p $RPM_BUILD_ROOT/%{_libdir}/nautilus/extensions-2.0
%find_lang %{name}
%find_gconf_schemas
cat %{name}.schemas_list >%{name}.lst
@ -127,7 +139,7 @@ rm -rf $RPM_BUILD_ROOT
%pre -f %{name}.schemas_pre
%post
%run_ldconfig
/sbin/ldconfig
if test -x usr/bin/update-mime-database ; then
usr/bin/update-mime-database usr/share/mime >/dev/null
fi
@ -136,7 +148,7 @@ fi
%preun -f %{name}.schemas_preun
%postun
%run_ldconfig
/sbin/ldconfig
if test -x usr/bin/update-mime-database ; then
usr/bin/update-mime-database usr/share/mime >/dev/null
fi
@ -155,17 +167,46 @@ fi
%{_libdir}/bonobo/servers/*.server
%dir %{_libdir}/nautilus
%dir %{_libdir}/nautilus/extensions-1.0
%dir %{_libdir}/nautilus/extensions-2.0
%files lang -f %{name}.lang
%files devel
%defattr(-,root,root)
%{_libdir}/*.so
%{_libdir}/*.*a
%{_includedir}/*
%{_libdir}/pkgconfig/*.pc
%changelog
* Wed Jan 30 2008 maw@suse.de
- Add extensions-2.0 directory.
* Tue Jan 29 2008 maw@suse.de
- Update to version 2.21.90:
+ Regenerate thumbnails when files change
+ Fix crashes
+ New autorun and automount support
+ Allow unmount of current location if its a mountpoint
+ Use thousand separators in all numbers (if used by locale)
+ Fix leaks
+ Performance improvements
+ Update to latest glib APIs
+ Fix bug that lost metadata from older versions
+ Fix crashes
+ Enable paste into folder for desktop icons
+ Better finding of autorun files on case sensitive media
- Remove libtool archives.
* Fri Jan 25 2008 maw@suse.de
- Update to version 2.21.5:
+ Totally replaced gnome-vfs use with gio
+ New implementation of file operations like copy/move with
a shared progress dialog
+ Update pkg-config files with new extensions dir
+ Handle dnd of desktop icons
+ Implement some missing unmount/eject operations
+ Add autorun/automount feature
+ Better handling of sensitivity of delete menu items
+ Better handling of mount/unmount/eject in many places
+ Fix for extensions with submenus.
* Fri Jan 18 2008 jpr@suse.de
- Updated nautilus-drives-and-volumes-on-desktop.diff to fix
https://bugzilla.novell.com/show_bug.cgi?id=335411 - Nautilus
@ -183,7 +224,7 @@ fi
* Wed Sep 05 2007 maw@suse.de
- Don't require gnome2-user-docs, which now supplements
nautilus (#297833).
* Wed Aug 29 2007 maw@suse.de
* Thu Aug 30 2007 maw@suse.de
- Update to version 2.19.91:
* Be more robust against broken extensions
* Set current working directory right on desktop when running scripts
@ -200,7 +241,7 @@ fi
CD and re-mounting the CD, Nautilus uses 100%% CPU. This simply
includes the last patch from
https://bugzilla.novell.com/show_bug.cgi?id=276193#c42
* Fri Aug 10 2007 federico@novell.com
* Sat Aug 11 2007 federico@novell.com
- Added nautilus-330298-297983-fix-overlapping-desktop-icons.diff to
fix https://bugzilla.novell.com/show_bug.cgi?id=297983 - desktop
icons would overlap when inserting removable media, if the
@ -251,7 +292,7 @@ fi
[#374623], #382207, #376952, #384078, #383840, #45953, #350579,
[#318373], #132326, #372550, #338353, #372471, #330298, #155337,
[#174766], #122688, #321175, #349840, #356124, #351713, #348161.
* Tue Feb 27 2007 dmueller@suse.de
* Wed Feb 28 2007 dmueller@suse.de
- adjust BuildRequires: libexif->libexif-devel
* Mon Feb 05 2007 sbrabec@suse.cz
- Fixed Categories (#242053).
@ -445,7 +486,7 @@ fi
https://bugzilla.novell.com/show_bug.cgi?id=176123. The
"OnlyShowIn" key in desktop files can contain multiple items. Also
pay attention to the "NotShowIn" key.
* Mon May 15 2006 federico@novell.com
* Tue May 16 2006 federico@novell.com
- Added nautilus-158279-add-location-toggle-button.diff to fix
https://bugzilla.novell.com/show_bug.cgi?id=158279. This adds a
toggle button to the left of path bar in navigation windows.
@ -455,7 +496,7 @@ fi
- Updated nautilus-155010-desktop-volume-policy.diff; this fixes
https://bugzilla.novell.com/show_bug.cgi?id=175076. This fixes a
crash when dragging a volume to the trash.
* Wed May 10 2006 joeshaw@suse.de
* Thu May 11 2006 joeshaw@suse.de
- Update search patch to remove annoying "queuing <whatever>"
debug spew.
* Wed May 10 2006 federico@novell.com
@ -530,7 +571,7 @@ fi
- Reduce BuildRequires.
* Sat Feb 18 2006 gekker@suse.de
- ficup .desktop files for UI team
* Mon Feb 13 2006 federico@novell.com
* Tue Feb 14 2006 federico@novell.com
- Added nautilus-130796-bad-icon-placement.diff to fix
https://bugzilla.novell.com/show_bug.cgi?id=130796. This makes
desktop icons with very wide labels be placed correctly, instead of
@ -556,7 +597,7 @@ fi
* Tue Dec 06 2005 sbrabec@suse.cz
- Do not require beagle on ppc64.
- Enabled parallel build.
* Mon Dec 05 2005 federico@novell.com
* Tue Dec 06 2005 federico@novell.com
- Removed nautilus-136167-no-default-window.diff. This is not the right fix, as external
apps rely on being to call just "nautilus" without command-line arguments, so that
Nautilus will open a window showing your Home directory. Moreover, there's no way for
@ -571,9 +612,9 @@ fi
- Added nautilus-136167-no-default-window.diff to fix bug #136167.
When restarted abnormally, Nautilus will no longer open a window for
your home directory.
* Wed Nov 30 2005 gekker@suse.de
* Thu Dec 01 2005 gekker@suse.de
- Update to version 2.12.2
* Mon Nov 28 2005 gekker@suse.de
* Tue Nov 29 2005 gekker@suse.de
- Enable nauilus sidebar by default (#132383).
* Thu Nov 17 2005 federico@novell.com
- Added nautilus-default-thumbnail-size.diff. This makes the default size for
@ -590,7 +631,7 @@ fi
* Wed Nov 02 2005 federico@novell.com
- Updated nautilus-submount.patch to fix bug #127509. With this, the
"Unmount volume" command will appear again for network volumes.
* Thu Oct 13 2005 gekker@suse.de
* Fri Oct 14 2005 gekker@suse.de
- Update to version 2.12.1
- Remove upstreamed patch
- Re-diff some patches so that they apply to new version
@ -610,7 +651,7 @@ fi
GtkFileChooser.
* Thu Sep 22 2005 clahey@suse.de
- Turn off computer icon by default.
* Thu Sep 15 2005 clahey@suse.de
* Fri Sep 16 2005 clahey@suse.de
- Added nautilus-icon.patch to change main icon. bug #117333
* Thu Sep 08 2005 federico@novell.com
- Added nautilus-114914-trash-unmount-removable-volume.diff to fix bug