- Update to 2.24.2
This commit is contained in:
Tomas Bzatek
parent
43ab87156f
commit
c8d741d6f3
@ -1 +1 @@
|
||||
nautilus-2.24.1.tar.bz2
|
||||
nautilus-2.24.2.tar.bz2
|
||||
|
||||
@ -1,75 +0,0 @@
|
||||
Index: libnautilus-private/nautilus-icon-info.c
|
||||
===================================================================
|
||||
--- libnautilus-private/nautilus-icon-info.c (revision 14759)
|
||||
+++ libnautilus-private/nautilus-icon-info.c (revision 14760)
|
||||
@@ -59,6 +59,12 @@ nautilus_icon_info_init (NautilusIconInf
|
||||
icon->sole_owner = TRUE;
|
||||
}
|
||||
|
||||
+gboolean
|
||||
+nautilus_icon_info_is_fallback (NautilusIconInfo *icon)
|
||||
+{
|
||||
+ return icon->pixbuf == NULL;
|
||||
+}
|
||||
+
|
||||
static void
|
||||
pixbuf_toggle_notify (gpointer info,
|
||||
GObject *object,
|
||||
Index: libnautilus-private/nautilus-icon-info.h
|
||||
===================================================================
|
||||
--- libnautilus-private/nautilus-icon-info.h (revision 14759)
|
||||
+++ libnautilus-private/nautilus-icon-info.h (revision 14760)
|
||||
@@ -58,6 +58,7 @@ NautilusIconInfo * nautilus_icon_info
|
||||
int size);
|
||||
NautilusIconInfo * nautilus_icon_info_lookup_from_name (const char *name,
|
||||
int size);
|
||||
+gboolean nautilus_icon_info_is_fallback (NautilusIconInfo *icon);
|
||||
GdkPixbuf * nautilus_icon_info_get_pixbuf (NautilusIconInfo *icon);
|
||||
GdkPixbuf * nautilus_icon_info_get_pixbuf_nodefault (NautilusIconInfo *icon);
|
||||
GdkPixbuf * nautilus_icon_info_get_pixbuf_nodefault_at_size (NautilusIconInfo *icon,
|
||||
Index: libnautilus-private/nautilus-file.c
|
||||
===================================================================
|
||||
--- libnautilus-private/nautilus-file.c (revision 14759)
|
||||
+++ libnautilus-private/nautilus-file.c (revision 14760)
|
||||
@@ -3482,6 +3482,23 @@ nautilus_file_get_gicon (NautilusFile *f
|
||||
return g_themed_icon_new ("text-x-generic");
|
||||
}
|
||||
|
||||
+static GIcon *
|
||||
+get_default_file_icon (NautilusFileIconFlags flags)
|
||||
+{
|
||||
+ static GIcon *fallback_icon = NULL;
|
||||
+ static GIcon *fallback_icon_preview = NULL;
|
||||
+ if (fallback_icon == NULL) {
|
||||
+ fallback_icon = g_themed_icon_new ("text-x-generic");
|
||||
+ fallback_icon_preview = g_themed_icon_new ("text-x-preview");
|
||||
+ g_themed_icon_append_name (G_THEMED_ICON (fallback_icon_preview), "text-x-generic");
|
||||
+ }
|
||||
+ if (flags & NAUTILUS_FILE_ICON_FLAGS_EMBEDDING_TEXT) {
|
||||
+ return fallback_icon_preview;
|
||||
+ } else {
|
||||
+ return fallback_icon;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
NautilusIconInfo *
|
||||
nautilus_file_get_icon (NautilusFile *file,
|
||||
int size,
|
||||
@@ -3573,11 +3590,15 @@ nautilus_file_get_icon (NautilusFile *fi
|
||||
|
||||
if (gicon) {
|
||||
icon = nautilus_icon_info_lookup (gicon, size);
|
||||
+ if (nautilus_icon_info_is_fallback (icon)) {
|
||||
+ g_object_unref (icon);
|
||||
+ icon = nautilus_icon_info_lookup (get_default_file_icon (flags), size);
|
||||
+ }
|
||||
g_object_unref (gicon);
|
||||
return icon;
|
||||
+ } else {
|
||||
+ return nautilus_icon_info_lookup (get_default_file_icon (flags), size);
|
||||
}
|
||||
-
|
||||
- return nautilus_icon_info_new_for_pixbuf (NULL);
|
||||
}
|
||||
|
||||
GdkPixbuf *
|
||||
@ -1,4 +1,4 @@
|
||||
%define glib2_version 2.17.5
|
||||
%define glib2_version 2.18.3
|
||||
%define pango_version 1.1.3
|
||||
%define gtk2_version 2.11.6
|
||||
%define libgnomeui_version 2.6.0
|
||||
@ -18,8 +18,8 @@
|
||||
|
||||
Name: nautilus
|
||||
Summary: File manager for GNOME
|
||||
Version: 2.24.1
|
||||
Release: 5%{?dist}
|
||||
Version: 2.24.2
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+
|
||||
Group: User Interface/Desktops
|
||||
Source: http://download.gnome.org/sources/%{name}/2.24/%{name}-%{version}.tar.bz2
|
||||
@ -30,7 +30,7 @@ Requires: gamin
|
||||
Requires: filesystem >= 2.1.1-1
|
||||
Requires: desktop-backgrounds-basic >= %{desktop_backgrounds_version}
|
||||
Requires: redhat-menus >= %{redhat_menus_version}
|
||||
Requires: gvfs
|
||||
Requires: gvfs >= 1.0.3
|
||||
Requires: gvfs-fuse
|
||||
Requires: gvfs-smb
|
||||
Requires: gvfs-archive
|
||||
@ -99,9 +99,6 @@ Patch15: nautilus-2.22.0-treeview-xds-dnd.patch
|
||||
# http://bugzilla.gnome.org/show_bug.cgi?id=519743
|
||||
Patch17: nautilus-filetype-symlink-fix.patch
|
||||
|
||||
# From svn
|
||||
Patch18: nautilus-2.24-fallback-file-icon.patch
|
||||
|
||||
%description
|
||||
Nautilus is the file manager and graphical shell for the GNOME desktop
|
||||
that makes it easy to manage your files and the rest of your system.
|
||||
@ -140,7 +137,6 @@ for developing nautilus extensions.
|
||||
%patch10 -p0 -b .gvfs-desktop-key
|
||||
%patch15 -p0 -b .xds
|
||||
%patch17 -p0 -b .symlink
|
||||
%patch18 -p0 -b .fallback-file-icon
|
||||
|
||||
%build
|
||||
|
||||
@ -269,6 +265,9 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Nov 26 2008 Tomas Bzatek <tbzatek@redhat.com> - 2.24.2-1
|
||||
- Update to 2.24.2
|
||||
|
||||
* Fri Nov 21 2008 Matthias Clasen <mclasen@redhat.com> - 2.24.1-5
|
||||
- Better URL
|
||||
- Tweak %%description
|
||||
|
||||
Loading…
Reference in New Issue
Block a user