r19216 - in /desktop/unstable/eog/debian: changelog patches/03_error_init.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Mar 24 12:20:53 2009
New Revision: 19216

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19216
Log:
03_error_init.patch: new patch. Fix wrong passing of GError.
Closes: #507991.

Added:
    desktop/unstable/eog/debian/patches/03_error_init.patch
Modified:
    desktop/unstable/eog/debian/changelog

Modified: desktop/unstable/eog/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/eog/debian/changelog?rev=19216&op=diff
==============================================================================
--- desktop/unstable/eog/debian/changelog (original)
+++ desktop/unstable/eog/debian/changelog Tue Mar 24 12:20:53 2009
@@ -2,6 +2,8 @@
 
   * Add libglib2.0-doc and libgtk2.0-doc to b-d-i to ensure proper 
     xrefs.
+  * 03_error_init.patch: new patch. Fix wrong passing of GError.
+    Closes: #507991.
 
  -- Josselin Mouette <joss at debian.org>  Tue, 10 Mar 2009 12:37:19 +0100
 

Added: desktop/unstable/eog/debian/patches/03_error_init.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/eog/debian/patches/03_error_init.patch?rev=19216&op=file
==============================================================================
--- desktop/unstable/eog/debian/patches/03_error_init.patch (added)
+++ desktop/unstable/eog/debian/patches/03_error_init.patch Tue Mar 24 12:20:53 2009
@@ -1,0 +1,20 @@
+--- src/eog-image.c.orig	2009-03-24 13:18:31.087998827 +0100
++++ src/eog-image.c	2009-03-24 13:19:20.472861008 +0100
+@@ -1323,7 +1323,7 @@
+ 		      GError **error)
+ {
+ 	gboolean result;
+-	GError **ioerror = NULL;
++	GError *ioerror = NULL;
+ 	
+ 	result = g_file_move (tmpfile,
+ 			      file,
+@@ -1332,7 +1332,7 @@
+ 			      NULL, 
+ 			      (GFileProgressCallback) transfer_progress_cb,
+ 			      image,
+-			      ioerror);
++			      &ioerror);
+ 
+ 	if (result == FALSE) {
+ 		if (g_error_matches (*ioerror, G_IO_ERROR,