nautilus r14962 - trunk/eel

[alexl svn gnome org]

Author: alexl
Date: Tue Feb 17 10:46:38 2009
New Revision: 14962
URL: http://svn.gnome.org/viewvc/nautilus?rev=14962&view=rev

Log:
2009-02-17  Alexander Larsson  <alexl redhat com>

	* eel-background.c (eel_background_ensure_realized):
	Ignore pending background changes when we've realized the
	background to avoid an unnecessary re-set of the pixmap.




Modified:
   trunk/eel/ChangeLog
   trunk/eel/eel-background.c

Modified: trunk/eel/eel-background.c
==============================================================================
--- trunk/eel/eel-background.c	(original)
+++ trunk/eel/eel-background.c	Tue Feb 17 10:46:38 2009
@@ -374,6 +374,10 @@
 									 entire_width, entire_height,
 									 background->details->is_desktop);
 
+	/* We got the pixmap and everything, so we don't care about a change
+	   that is pending (unless things actually change after this time) */
+	g_object_set_data (G_OBJECT (background->details->bg),
+			   "ignore-pending-change", GINT_TO_POINTER (TRUE));
 	changed = TRUE;