Merge commit 'upstream/2.31.1'

1 files changed, 6 insertions, 4 deletions

diff --git a/src/book.c b/src/book.c
index 0dce5f0..1c1cc6e 100644
--- a/src/book.c
+++ b/src/book.c
@@ -304,6 +304,7 @@ book_save_pdf_with_imagemagick (Book *book, GFile *file, GError **error)
             path = g_file_get_path (tiff_file);
 
         resolution_command = g_strdup_printf ("convert %s -density %d %s", path, page_get_dpi (page), path);
+        g_debug ("Executing ImageMagick command: %s", resolution_command);
         result = g_spawn_command_line_sync (resolution_command, &stdout_text, &stderr_text, &exit_status, error);
         if (result && exit_status != 0) {
             g_warning ("ImageMagick returned error code %d, command line was: %s", exit_status, resolution_command);
@@ -334,6 +335,7 @@ book_save_pdf_with_imagemagick (Book *book, GFile *file, GError **error)
         g_string_append_printf (command_line, " %s", path);
         g_free (path);
 
+        g_debug ("Executing ImageMagick command: %s", command_line->str);
         result = g_spawn_command_line_sync (command_line->str, &stdout_text, &stderr_text, &exit_status, error);
         if (result && exit_status != 0) {
             g_warning ("ImageMagick returned error code %d, command line was: %s", exit_status, command_line->str);
@@ -459,16 +461,16 @@ book_class_init (BookClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (BookClass, page_added),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__POINTER,
-                      G_TYPE_NONE, 1, G_TYPE_POINTER);
+                      g_cclosure_marshal_VOID__OBJECT,
+                      G_TYPE_NONE, 1, page_get_type ());
     signals[PAGE_REMOVED] =
         g_signal_new ("page-removed",
                       G_TYPE_FROM_CLASS (klass),
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (BookClass, page_removed),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__POINTER,
-                      G_TYPE_NONE, 1, G_TYPE_POINTER);
+                      g_cclosure_marshal_VOID__OBJECT,
+                      G_TYPE_NONE, 1, page_get_type ());
     signals[CLEARED] =
         g_signal_new ("cleared",
                       G_TYPE_FROM_CLASS (klass),