diff options
| author | infirit <[email protected]> | 2014-11-21 17:12:25 +0100 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-11-22 20:25:30 +0100 |
| commit | b99f3f5e8080f266affd9734d4f73dac0c67215e (patch) | |
| tree | 4fe239a05e06136e388c1c31c2c4ef5a52ded7d7 /src/fr-archive.c | |
| parent | 770df1b16c7285cdcb1ba661f6a49ad022d4ac87 (diff) | |
| download | engrampa-b99f3f5e8080f266affd9734d4f73dac0c67215e.tar.bz2 engrampa-b99f3f5e8080f266affd9734d4f73dac0c67215e.tar.xz | |
use a boxed type to pass the error to the 'done' signal
Based on FR commit: 4b645f57c856928c508dd74c31e1bfb2132368e1
From: Paolo Bacchilega <[email protected]>
Diffstat (limited to 'src/fr-archive.c')
| -rw-r--r-- | src/fr-archive.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/fr-archive.c b/src/fr-archive.c index b466134..fcd50f6 100644 --- a/src/fr-archive.c +++ b/src/fr-archive.c @@ -38,6 +38,7 @@ #include "fr-command.h" #include "fr-error.h" #include "fr-marshal.h" +#include "fr-proc-error.h" #include "fr-process.h" #include "main.h" @@ -247,10 +248,10 @@ fr_archive_class_init (FrArchiveClass *class) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (FrArchiveClass, done), NULL, NULL, - fr_marshal_VOID__INT_POINTER, + fr_marshal_VOID__INT_BOXED, G_TYPE_NONE, 2, G_TYPE_INT, - G_TYPE_POINTER); + FR_TYPE_PROC_ERROR); fr_archive_signals[PROGRESS] = g_signal_new ("progress", G_TYPE_FROM_CLASS (class), @@ -1603,7 +1604,7 @@ fr_archive_add (FrArchive *archive, archive->process->error.type = FR_PROC_ERROR_NONE; g_signal_emit_by_name (G_OBJECT (archive->process), "done", - FR_ACTION_ADDING_FILES); + &archive->process->error); return; } @@ -1690,7 +1691,7 @@ fr_archive_add (FrArchive *archive, archive->process->error.gerror = g_error_copy (error); g_signal_emit_by_name (G_OBJECT (archive->process), "done", - FR_ACTION_ADDING_FILES); + &archive->process->error); g_clear_error (&error); error_occurred = TRUE; } |