rpms/gnome-desktop/devel gnome-desktop-2.25.1.1-fade.patch, 1.4, 1.5 gnome-desktop.spec, 1.191, 1.192 gnome-desktop-2.24.0-fade.patch, 1.8, NONE

[Ray Strode]

Author: rstrode

Update of /cvs/pkgs/rpms/gnome-desktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25579

Modified Files:
	gnome-desktop-2.25.1.1-fade.patch gnome-desktop.spec 
Removed Files:
	gnome-desktop-2.24.0-fade.patch 
Log Message:
- Fix leak in previous update (bug 468339)


gnome-desktop-2.25.1.1-fade.patch:

Index: gnome-desktop-2.25.1.1-fade.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop-2.25.1.1-fade.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-desktop-2.25.1.1-fade.patch	4 Dec 2008 19:59:12 -0000	1.4
+++ gnome-desktop-2.25.1.1-fade.patch	5 Dec 2008 14:36:10 -0000	1.5
@@ -121,8 +121,8 @@
 -	
 -	XFlush (display);
 +
-+	gdk_x11_display_ungrab (gdk_screen_get_display (screen));
 +	gdk_display_flush (gdk_screen_get_display (screen));
++	gdk_x11_display_ungrab (gdk_screen_get_display (screen));
  }
  
  
@@ -230,7 +230,7 @@
 +				    GDK_PIXMAP_XID (pixmap));
  	XClearWindow (display, RootWindow (display, screen_num));
  
- 	gdk_x11_display_ungrab (gdk_screen_get_display (screen));
+ 	gdk_display_flush (gdk_screen_get_display (screen));
 
 ============================================================
  Add Crossfade class
@@ -1042,8 +1042,8 @@
  static void
  gnome_bg_set_root_pixmap_id (GdkScreen *screen,
  			     GdkPixmap *pixmap)
-@@ -1142,6 +1230,54 @@ gnome_bg_set_pixmap_as_root (GdkScreen *screen, GdkPixmap *pixmap)
- 	gdk_display_flush (gdk_screen_get_display (screen));
+@@ -1142,6 +1230,55 @@ gnome_bg_set_pixmap_as_root (GdkScreen *screen, GdkPixmap *pixmap)
+ 	gdk_x11_display_ungrab (gdk_screen_get_display (screen));
  }
  
 +/**
@@ -1086,6 +1086,7 @@
 +	old_pixmap = gnome_bg_get_pixmap_from_root (screen);
 +	gnome_bg_set_root_pixmap_id (screen, pixmap);
 +	gnome_bg_crossfade_set_start_pixmap (fade, old_pixmap);
++	g_object_unref (old_pixmap);
 +	gnome_bg_crossfade_set_end_pixmap (fade, pixmap);
 +	gdk_display_flush (display);
 +	gdk_x11_display_ungrab (display);
@@ -1119,59 +1120,3 @@
  
  G_END_DECLS
  
-
-============================================================
- add new gnome_bg_ignore_changes api
-
-  This will prevent the "changed" signal from getting
-emitted before gnome-settings-daemon is ready for it.
-
-diff --git a/libgnome-desktop/gnome-bg.c b/libgnome-desktop/gnome-bg.c
---- a/libgnome-desktop/gnome-bg.c
-+++ b/libgnome-desktop/gnome-bg.c
-@@ -110,6 +110,8 @@ struct _GnomeBG
- 	int			timeout_id;
- 
- 	GList *		        file_cache;
-+
-+	guint                   ignore_changes : 1;
- };
- 
- struct _GnomeBGClass
-@@ -269,6 +271,10 @@ do_changed (GnomeBG *bg)
- static void
- queue_changed (GnomeBG *bg)
- {
-+	if (bg->ignore_changes) {
-+		return;
-+	}
-+
- 	if (bg->changed_id > 0) {
- 		g_source_remove (bg->changed_id);
- 	}
-@@ -589,6 +595,13 @@ gnome_bg_set_filename (GnomeBG     *bg,
- 	}
- }
- 
-+void
-+gnome_bg_ignore_changes (GnomeBG *bg,
-+                         gboolean should_ignore)
-+{
-+	bg->ignore_changes = should_ignore;
-+}
-+
- static void
- draw_color (GnomeBG *bg, GdkPixbuf *dest)
- {
-diff --git a/libgnome-desktop/libgnomeui/gnome-bg.h b/libgnome-desktop/libgnomeui/gnome-bg.h
---- a/libgnome-desktop/libgnomeui/gnome-bg.h
-+++ b/libgnome-desktop/libgnomeui/gnome-bg.h
-@@ -64,6 +64,8 @@ typedef enum {
- 
- GType            gnome_bg_get_type              (void);
- GnomeBG *        gnome_bg_new                   (void);
-+void             gnome_bg_ignore_changes        (GnomeBG *bg,
-+                                                 gboolean should_ignore);
- void             gnome_bg_load_from_preferences (GnomeBG               *bg,
- 						 GConfClient           *client);
- void             gnome_bg_save_to_preferences   (GnomeBG               *bg,


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/devel/gnome-desktop.spec,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- gnome-desktop.spec	4 Dec 2008 19:59:13 -0000	1.191
+++ gnome-desktop.spec	5 Dec 2008 14:36:10 -0000	1.192
@@ -12,7 +12,7 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.25.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.25/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -127,6 +127,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Fri Dec  5 2008 Ray Strode <rstrode at redhat.com> - 2.25.2-4
+- Fix leak in previous update (bug 468339)
+
 * Thu Dec  4 2008 Ray Strode <rstrode at redhat.com> - 2.25.2-3
 - Rebase fade-in patch to latest from upstream report
 


--- gnome-desktop-2.24.0-fade.patch DELETED ---