From a3979cd918d366be7850ca558b3040b8d2d0322d Mon Sep 17 00:00:00 2001
From: Peter Waller <peter.waller@gmail.com>
Date: Tue, 04 Aug 2009 09:14:30 +0000
Subject: Bug 589915 - gedit crashed with SEGV in strlen()

FIx a crash introduced by commit c372064a where it was forgotten do
adapt the function signature of a callback
---
diff --git a/client/gdaemonfileoutputstream.c b/client/gdaemonfileoutputstream.c
index e47c2e8..c5263e1 100644
--- a/client/gdaemonfileoutputstream.c
+++ b/client/gdaemonfileoutputstream.c
@@ -1474,6 +1474,7 @@ async_close_done (GOutputStream *stream,
 		  gpointer op_data,
 		  GAsyncReadyCallback callback,
 		  gpointer user_data,
+                  GCancellable *cancellable,
 		  GError *io_error)
 {
   GDaemonFileOutputStream *file;
@@ -1481,7 +1482,6 @@ async_close_done (GOutputStream *stream,
   CloseOperation *op;
   gboolean result;
   GError *error;
-  GCancellable *cancellable = NULL; /* TODO: get cancellable */
 
   file = G_DAEMON_FILE_OUTPUT_STREAM (stream);
   
@@ -1544,7 +1544,7 @@ g_daemon_file_output_stream_close_async (GOutputStream     *stream,
 			   op, io_priority,
 			   (GAsyncReadyCallback)callback, data,
 			   cancellable,
-			   (AsyncIteratorDone)async_close_done);
+			   async_close_done);
 }
 
 static gboolean
--
cgit v0.8.2