diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2006-06-08 17:01:28 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-06-08 17:01:28 +0000 |
| commit | 480803d5baa8414e13588d10f7ca694eb5eec433 (patch) | |
| tree | af1b7b79d76268b9a204e78ab7cbf453b60c511e /gtk/gtkprintoperation.c | |
| parent | a0812b9ed501a3eb958b2f20c31dc9260bb0be95 (diff) | |
| download | gtk+-480803d5baa8414e13588d10f7ca694eb5eec433.tar.gz | |
Don't include gtkprinter-private.h here.
2006-06-08 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkprintbackend.h: Don't include gtkprinter-private.h here.
* gtk/gtkprintunixdialog.c:
* gtk/gtkprintoperation-unix.c:
* gtk/gtkprintjob.c:
* gtk/gtkprintbackend.c: Instead include it here.
* gtk/gtk.symbols:
* gtk/gtkprintoperation.h:
* gtk/gtkprintoperation.c: Rename pdf_target to export_filename.
Diffstat (limited to 'gtk/gtkprintoperation.c')
| -rw-r--r-- | gtk/gtkprintoperation.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c index ebf377e454..c54dedd5ce 100644 --- a/gtk/gtkprintoperation.c +++ b/gtk/gtkprintoperation.c @@ -2268,22 +2268,24 @@ print_pages (GtkPrintOperation *op, /** * gtk_print_operation_get_error: * @op: a #GtkPrintOperation + * @error: return location for the error * * Call this when the result of a print operation is * %GTK_PRINT_OPERATION_RESULT_ERROR, either as returned by * gtk_print_operation_run(), or in the ::done signal handler. * The returned #GError will contain more details on what went wrong. * - * Return value: a #GError representing the error, or #NULL - * * Since: 2.10 **/ -GError * -gtk_print_operation_get_error (GtkPrintOperation *op) +void +gtk_print_operation_get_error (GtkPrintOperation *op, + GError **error) { - g_return_val_if_fail (GTK_IS_PRINT_OPERATION (op), NULL); + g_return_if_fail (GTK_IS_PRINT_OPERATION (op)); - return op->priv->error; + g_propagate_error (error, op->priv->error); + + op->priv->error = NULL; } |