rpms/gtk2/FC-6 gtk+-2.10.4-close-loader.patch, 1.1, 1.2 gtk2.spec, 1.197, 1.198

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Dec 22 03:19:37 UTC 2006


Author: mclasen

Update of /cvs/dist/rpms/gtk2/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv25516

Modified Files:
	gtk+-2.10.4-close-loader.patch gtk2.spec 
Log Message:
Further fixes to pixbuf loader error handling


gtk+-2.10.4-close-loader.patch:
 gdk-pixbuf-loader.c |   34 +++++++++++++++++++++-------------
 1 files changed, 21 insertions(+), 13 deletions(-)

Index: gtk+-2.10.4-close-loader.patch
===================================================================
RCS file: /cvs/dist/rpms/gtk2/FC-6/gtk+-2.10.4-close-loader.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtk+-2.10.4-close-loader.patch	10 Dec 2006 04:38:32 -0000	1.1
+++ gtk+-2.10.4-close-loader.patch	22 Dec 2006 03:19:34 -0000	1.2
@@ -1,6 +1,6 @@
---- gtk+-2.10.6/gdk-pixbuf/gdk-pixbuf-loader.c.close-loader	2006-07-16 22:37:29.000000000 -0400
-+++ gtk+-2.10.6/gdk-pixbuf/gdk-pixbuf-loader.c	2006-12-09 23:11:10.000000000 -0500
-@@ -455,10 +472,7 @@
+--- gtk+-2.10.4/gdk-pixbuf/gdk-pixbuf-loader.c.close-loader	2006-07-16 22:37:29.000000000 -0400
++++ gtk+-2.10.4/gdk-pixbuf/gdk-pixbuf-loader.c	2006-12-21 22:17:53.000000000 -0500
+@@ -455,10 +455,7 @@
        
                          eaten = gdk_pixbuf_loader_eat_header_write (loader, buf, count, error);
                          if (eaten <= 0)
@@ -12,7 +12,7 @@
        
                          count -= eaten;
                          buf += eaten;
-@@ -466,16 +480,25 @@
+@@ -466,16 +463,27 @@
    
          if (count > 0 && priv->image_module->load_increment)
                  {
@@ -41,7 +41,20 @@
 +                	priv->holds_threadlock = FALSE;
 +        	}
 +
++        g_signal_emit (loader, pixbuf_loader_signals[CLOSED], 0);
++
 +        return FALSE;
  }
  
  /**
+@@ -693,8 +701,8 @@
+   
+         priv = loader->priv;
+   
+-        /* we expect it's not closed */
+-        g_return_val_if_fail (priv->closed == FALSE, TRUE);
++        if (priv->closed)
++		return TRUE;
+   
+         /* We have less the LOADER_HEADER_SIZE bytes in the image.  
+          * Flush it, and keep going. 


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/FC-6/gtk2.spec,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- gtk2.spec	21 Dec 2006 15:40:11 -0000	1.197
+++ gtk2.spec	22 Dec 2006 03:19:34 -0000	1.198
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source: gtk+-%{version}.tar.bz2
@@ -315,6 +315,10 @@
 %doc tmpdocs/examples
 
 %changelog
+* Thu Dec 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.4-10
+- Make gdk_pixbuf_loader_close() idempotent
+- Always emit the closed signal when the loader is closed
+
 * Thu Dec 21 2006 Matthias Clasen <mclasen at redhat.com> - 2.10.4-9
 - Make update scripts handle slight variations in $host
 




More information about the fedora-cvs-commits mailing list