rpms/nautilus
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Update fade patch to work with updated gnome-desktop api

Browse Source 
- Fix fade start pixmap
This commit is contained in:
Ray Strode 2009-01-20 02:22:22 +00:00
parent 29fb407f2f
commit 7ebe35652d
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
eel-2.24.0-fade.patch
View File

@ -324,7 +324,7 @@ diff --git a/eel/eel-background.c b/eel/eel-background.c
+ } + }
+ +
+ if (!gnome_bg_crossfade_is_started (background->details->fade)) { + if (!gnome_bg_crossfade_is_started (background->details->fade)) {
+ gnome_bg_crossfade_start (background->details->fade, window, NULL); + gnome_bg_crossfade_start (background->details->fade, window);
+ if (background->details->is_desktop) { + if (background->details->is_desktop) {
+ g_signal_connect_swapped (background->details->fade, + g_signal_connect_swapped (background->details->fade,
+ "finished", + "finished",
@ -375,7 +375,7 @@ diff --git a/eel/eel-background.c b/eel/eel-background.c
set_root_pixmap (background, window); set_root_pixmap (background, window);
} }
@@ -720,6 +772,36 @@ on_background_changed (EelBackground *background) @@ -720,6 +772,44 @@ on_background_changed (EelBackground *background)
} }
static void static void
@ -403,8 +403,16 @@ diff --git a/eel/eel-background.c b/eel/eel-background.c
+ } + }
+ +
+ if (background->details->fade != NULL && !gnome_bg_crossfade_is_started (background->details->fade)) { + if (background->details->fade != NULL && !gnome_bg_crossfade_is_started (background->details->fade)) {
+ GdkPixmap *start_pixmap;
+
+ if (background->details->background_pixmap == NULL) {
+ start_pixmap = gnome_bg_get_pixmap_from_root (gtk_widget_get_screen (widget));
+ } else {
+ start_pixmap = g_object_ref (background->details->background_pixmap);
+ }
+ gnome_bg_crossfade_set_start_pixmap (background->details->fade, + gnome_bg_crossfade_set_start_pixmap (background->details->fade,
+ background->details->background_pixmap); + start_pixmap);
+ g_object_unref (start_pixmap);
+ } + }
+} +}
+ +
@ -412,3 +420,12 @@ diff --git a/eel/eel-background.c b/eel/eel-background.c
eel_widget_queue_background_change (GtkWidget *widget) eel_widget_queue_background_change (GtkWidget *widget)
{ {
EelBackground *background; EelBackground *background;
@@ -782,6 +872,8 @@ widget_realized_setup (GtkWidget *widget, gpointer data)
} else {
background->details->use_common_pixmap = FALSE;
}
+
+ init_fade (background, widget);
}
}

6
nautilus.spec
View File

@ -16,7 +16,7 @@
Name: nautilus Name: nautilus
Summary: File manager for GNOME Summary: File manager for GNOME
Version: 2.25.2 Version: 2.25.2
Release: 6%{?dist} Release: 7%{?dist}
License: GPLv2+ License: GPLv2+
Group: User Interface/Desktops Group: User Interface/Desktops
Source: http://download.gnome.org/sources/%{name}/2.25/%{name}-%{version}.tar.bz2 Source: http://download.gnome.org/sources/%{name}/2.25/%{name}-%{version}.tar.bz2
@ -265,6 +265,10 @@ fi
%changelog %changelog
* Mon Jan 19 2009 Ray Strode <rstrode@redhat.com> - 2.25.2-7
- Update fade patch to work with updated gnome-desktop api
- Fix fade start pixmap
* Wed Jan 7 2009 Ray Strode <rstrode@redhat.com> - 2.25.2-6 * Wed Jan 7 2009 Ray Strode <rstrode@redhat.com> - 2.25.2-6
- Don't crash when closing spatial window very quickly after - Don't crash when closing spatial window very quickly after
opening it (gnome bug 552859) opening it (gnome bug 552859)