r19956 - /desktop/lenny/glib2.0/debian/patches/10_gfile_set_error.patch

joss at users.alioth.debian.org joss at users.alioth.debian.org
Thu May 14 06:20:51 UTC 2009


Author: joss
Date: Thu May 14 06:20:51 2009
New Revision: 19956

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19956
Log:
Let the patch apply cleanly in lenny version /o\

Modified:
    desktop/lenny/glib2.0/debian/patches/10_gfile_set_error.patch

Modified: desktop/lenny/glib2.0/debian/patches/10_gfile_set_error.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/lenny/glib2.0/debian/patches/10_gfile_set_error.patch?rev=19956&op=diff
==============================================================================
--- desktop/lenny/glib2.0/debian/patches/10_gfile_set_error.patch (original)
+++ desktop/lenny/glib2.0/debian/patches/10_gfile_set_error.patch Thu May 14 06:20:51 2009
@@ -2,14 +2,16 @@
 GNOME #545203
 Upstream commit r7269
 
---- trunk/gio/gfile.c	2008/07/20 00:34:58	7208
-+++ trunk/gio/gfile.c	2008/07/28 19:12:19	7269
-@@ -4201,7 +4201,7 @@
+Index: glib-2.16.6/gio/gfile.c
+===================================================================
+--- glib-2.16.6.orig/gio/gfile.c	2008-09-12 19:55:52.000000000 +0200
++++ glib-2.16.6/gio/gfile.c	2009-05-14 08:19:57.370024273 +0200
+@@ -4020,7 +4020,7 @@ open_read_async_thread (GSimpleAsyncResu
  
    if (iface->read_fn == NULL)
      {
--      g_set_error_literal (error, G_IO_ERROR,
-+      g_set_error_literal (&error, G_IO_ERROR,
-                            G_IO_ERROR_NOT_SUPPORTED,
-                            _("Operation not supported"));
+-      g_set_error (error, G_IO_ERROR,
++      g_set_error (&error, G_IO_ERROR,
+                    G_IO_ERROR_NOT_SUPPORTED,
+                    _("Operation not supported"));
  




More information about the pkg-gnome-commits mailing list