[gnome-documents] pdf-loader: accept a NULL cancellable
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-documents] pdf-loader: accept a NULL cancellable
- Date: Tue, 28 Feb 2012 00:41:34 +0000 (UTC)
commit b79c434fafc6eca4aa046ae077d15def679b60bf
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Sun Feb 26 15:58:58 2012 -0500
pdf-loader: accept a NULL cancellable
Check for != NULL before reffing the cancellable object to avoid
spawning criticals when NULL is provided by the caller.
src/lib/gd-pdf-loader.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/src/lib/gd-pdf-loader.c b/src/lib/gd-pdf-loader.c
index e157706..6cf8c62 100644
--- a/src/lib/gd-pdf-loader.c
+++ b/src/lib/gd-pdf-loader.c
@@ -145,7 +145,6 @@ pdf_load_job_new (GSimpleAsyncResult *result,
retval = g_slice_new0 (PdfLoadJob);
retval->result = g_object_ref (result);
- retval->cancellable = g_object_ref (cancellable);
retval->unoconv_pid = -1;
retval->unlink_cache = FALSE;
retval->from_old_cache = FALSE;
@@ -154,6 +153,8 @@ pdf_load_job_new (GSimpleAsyncResult *result,
retval->uri = g_strdup (uri);
if (entry != NULL)
retval->gdata_entry = g_object_ref (entry);
+ if (cancellable != NULL)
+ retval->cancellable = g_object_ref (cancellable);
return retval;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]