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

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nautilus?expand=0&rev=35

Browse Source
This commit is contained in:
OBS User unknown 2008-05-01 12:48:20 +00:00 committed by Git OBS Bridge
parent ac9413e4b4
commit 0ada411c19
5 changed files with 34 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
nautilus-6014-network-servers-in-places-sidebar.diff
View File

@ -1,23 +0,0 @@
http://bugzilla.gnome.org/show_bug.cgi?id=350974
https://bugzilla.novell.com/show_bug.cgi?id=6014
Add "Network Servers" to the Places sidebar.
--- nautilus/src/nautilus-places-sidebar.c.orig 2006-10-25 11:35:15.000000000 -0500
+++ nautilus/src/nautilus-places-sidebar.c 2006-10-25 11:38:12.000000000 -0500
@@ -263,6 +263,14 @@ update_places (NautilusPlacesSidebar *si
gtk_tree_selection_select_iter (selection, &last_iter);
}
+ mount_uri = "network:///"; /* No need to strdup */
+ last_iter = add_place (sidebar, PLACES_BUILT_IN,
+ _("Network Servers"), "gnome-fs-network",
+ mount_uri, NULL, NULL, 0);
+ if (strcmp (location, mount_uri) == 0) {
+ gtk_tree_selection_select_iter (selection, &last_iter);
+ }
+
/* for all drives add all its volumes */
volume_monitor = gnome_vfs_get_volume_monitor ();

13
nautilus-bnc376070-null-exifdata-crash.patch Normal file
View File

@ -0,0 +1,13 @@
diff -upr nautilus-2.22.2-pre/src/nautilus-image-properties-page.c nautilus-2.22.2-post/src/nautilus-image-properties-page.c
--- nautilus-2.22.2-pre/src/nautilus-image-properties-page.c 2008-03-29 03:40:25.000000000 -0600
+++ nautilus-2.22.2-post/src/nautilus-image-properties-page.c 2008-05-01 01:17:45.000000000 -0500
@@ -228,7 +228,7 @@ append_tag_value_pair (GString *string,
static void
append_exifdata_string (ExifData *exifdata, GString *string)
{
- if (exifdata->ifd[0] && exifdata->ifd[0]->count) {
+ if (exifdata && exifdata->ifd[0] && exifdata->ifd[0]->count) {
append_tag_value_pair (string, exifdata, EXIF_TAG_MAKE, _("Camera Brand"));
append_tag_value_pair (string, exifdata, EXIF_TAG_MODEL, _("Camera Model"));
Only in nautilus-2.22.2-post/src: nautilus-image-properties-page.c~

17
nautilus-default-thumbnail-size.diff
View File

@ -1,17 +0,0 @@
http://bugzilla.gnome.org/show_bug.cgi?id=350972
Make the default thumbnail size be 64 pixels, so that it matches the
default size for other icons. This makes the icon views look more
aligned.
--- nautilus-2.12.1.orig/libnautilus-private/nautilus-icon-factory.h 2005-05-23 08:21:47.000000000 -0500
+++ nautilus-2.12.1/libnautilus-private/nautilus-icon-factory.h 2005-11-16 18:11:57.000000000 -0600
@@ -72,7 +72,7 @@ typedef enum {
#define NAUTILUS_ICON_SIZE_LARGER 96
#define NAUTILUS_ICON_SIZE_LARGEST 192
-#define NAUTILUS_ICON_SIZE_THUMBNAIL 96
+#define NAUTILUS_ICON_SIZE_THUMBNAIL 64
/* Maximum size of an icon that the icon factory will ever produce */
#define NAUTILUS_ICON_MAXIMUM_SIZE 320

10
nautilus.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu May 1 10:36:36 CEST 2008 - hpj@suse.de
- Removed previously disabled patches that were made obsolete by
upstream changes:
* nautilus-default-thumbnail-size.diff
* nautilus-6014-network-servers-in-places-sidebar.diff
- Added nautilus-bnc376070-null-exifdata-crash, which fixes
crashes when showing the properties of a picture (bnc#376070).
-------------------------------------------------------------------
Mon Apr 28 18:12:44 CEST 2008 - federico@novell.com

18
nautilus.spec
View File

@ -16,7 +16,7 @@ BuildRequires: cdparanoia eel-devel fdupes gnome-common gnome-desktop-devel gno
License: GPL v2 or later
Group: Productivity/File utilities
Version: 2.22.2
Release: 11
Release: 14
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
@ -31,8 +31,6 @@ Patch5: nautilus-bnc117333-bgo350962-folder-icon-for-menus-and-windows.d
Patch6: nautilus-genericname.patch
# PATCH-FIX-OPENSUSE nautilus-disable-zoom-control-and-view-as-option-menu.patch
Patch7: nautilus-disable-zoom-control-and-view-as-option-menu.patch
# PATCH-NEEDS-REBASE nautilus-default-thumbnail-size.diff bgo350972
Patch8: nautilus-default-thumbnail-size.diff
# PATCH-FIX-UPSTREAM nautilus-146947-rename-bad-parameters-message.diff bgo350976 bnc146947 federico@novell.com
Patch9: nautilus-146947-rename-bad-parameters-message.diff
# PATCH-NEEDS-REBASE nautilus-mime.patch
@ -41,8 +39,6 @@ Patch10: nautilus-mime.patch
Patch11: nautilus-bnc366100-bgo338933-ignore-foreign-desktop-files.diff
# PATCH-FIX-UPSTREAM nautilus-212649-search-bar-visibility.patch bgo368424 federico@novell.com
Patch12: nautilus-212649-search-bar-visibility.patch
# PATCH-NEEDS-REBASE nautilus-6014-network-servers-in-places-sidebar.diff bgo350974 bnc6014 federico@novell.com
Patch13: nautilus-6014-network-servers-in-places-sidebar.diff
# PATCH-NEEDS-REBASE nautilus-drives-and-volumes-on-desktop.diff bgo335411 federico@novell.com
Patch15: nautilus-drives-and-volumes-on-desktop.diff
Patch17: nautilus-181941-i18n.patch
@ -54,6 +50,8 @@ Patch19: nautilus-desktop-icon.patch
Patch20: nautilus-bnc363122-lockdown-context-menus.diff
# PATCH-FEATURE-UPSTREAM nautilus-bnc368446-network-in-places.patch bnc368446 bgo350974 vuntz@novell.com -- Add network:// in the places sidebar
Patch21: nautilus-bnc368446-network-in-places.patch
# PATCH-FIX-UPSTREAM nautilus-bnc-376070-null-exifdata-crash.patch bnc376070 hpj@novell.com
Patch22: nautilus-bnc376070-null-exifdata-crash.patch
Requires: gnome-icon-theme
Requires: %{name}-lang = %{version}
Requires: gvfs
@ -93,18 +91,17 @@ gnome-patch-translation-prepare
%patch5 -p1
%patch6 -p0
%patch7
### %patch8 -p1
%patch9 -p0
### %patch10
%patch11 -p1
%patch12
### %patch13 -p1
### %patch15 -p1
%patch17 -p1
### %patch18 -p1
%patch19 -p1
%patch20 -p1
%patch21
%patch22 -p1
gnome-patch-translation-update
%build
@ -188,6 +185,13 @@ fi
%{_libdir}/pkgconfig/*.pc
%changelog
* Thu May 01 2008 hpj@suse.de
- Removed previously disabled patches that were made obsolete by
upstream changes:
* nautilus-default-thumbnail-size.diff
* nautilus-6014-network-servers-in-places-sidebar.diff
- Added nautilus-bnc376070-null-exifdata-crash, which fixes
crashes when showing the properties of a picture (bnc#376070).
* Mon Apr 28 2008 federico@novell.com
- Rebased these patches:
nautilus-bgo364843-name-copy-dont-overflow-max-path-len.diff