diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 7 | ||||
| -rw-r--r-- | gtk/gtkprintbackend.c | 1 | ||||
| -rw-r--r-- | gtk/gtkprintbackend.h | 3 | ||||
| -rw-r--r-- | gtk/gtkprintjob.c | 1 | ||||
| -rw-r--r-- | gtk/gtkprintoperation-unix.c | 1 | ||||
| -rw-r--r-- | gtk/gtkprintoperation.c | 14 | ||||
| -rw-r--r-- | gtk/gtkprintoperation.h | 3 | ||||
| -rw-r--r-- | gtk/gtkprintunixdialog.c | 1 |
9 files changed, 29 insertions, 9 deletions
@@ -1,5 +1,12 @@ 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. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 032187d02..8189bd3a5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,12 @@ 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. diff --git a/gtk/gtkprintbackend.c b/gtk/gtkprintbackend.c index 1a139deb5..aa6c38cad 100644 --- a/gtk/gtkprintbackend.c +++ b/gtk/gtkprintbackend.c @@ -27,6 +27,7 @@ #include "gtkmodules.h" #include "gtkprivate.h" #include "gtkprintbackend.h" +#include "gtkprinter-private.h" #include "gtkalias.h" #define GTK_PRINT_BACKEND_GET_PRIVATE(o) \ diff --git a/gtk/gtkprintbackend.h b/gtk/gtkprintbackend.h index e8d9711ea..21419095f 100644 --- a/gtk/gtkprintbackend.h +++ b/gtk/gtkprintbackend.h @@ -32,9 +32,8 @@ #include <glib-object.h> #include <cairo.h> -#include "gtkprinter-private.h" #include "gtkprintsettings.h" -#include "gtkprinteroption.h" +#include "gtkprinteroptionset.h" #include "gtkprintjob.h" G_BEGIN_DECLS diff --git a/gtk/gtkprintjob.c b/gtk/gtkprintjob.c index adc385e14..2781c996c 100644 --- a/gtk/gtkprintjob.c +++ b/gtk/gtkprintjob.c @@ -35,6 +35,7 @@ #include "gtkprintjob.h" #include "gtkprinter.h" +#include "gtkprinter-private.h" #include "gtkprintbackend.h" #include "gtkalias.h" diff --git a/gtk/gtkprintoperation-unix.c b/gtk/gtkprintoperation-unix.c index e73964076..4eb81c097 100644 --- a/gtk/gtkprintoperation-unix.c +++ b/gtk/gtkprintoperation-unix.c @@ -39,6 +39,7 @@ #include "gtkpagesetupunixdialog.h" #include "gtkprintbackend.h" #include "gtkprinter.h" +#include "gtkprinter-private.h" #include "gtkprintjob.h" #include "gtklabel.h" #include "gtkalias.h" diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c index ebf377e45..c54dedd5c 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; } diff --git a/gtk/gtkprintoperation.h b/gtk/gtkprintoperation.h index 6f7a4d17a..abbb1525d 100644 --- a/gtk/gtkprintoperation.h +++ b/gtk/gtkprintoperation.h @@ -162,7 +162,8 @@ GtkPrintOperationResult gtk_print_operation_run (GtkPrintOper GtkPrintOperationAction action, GtkWindow *parent, GError **error); -GError * gtk_print_operation_get_error (GtkPrintOperation *op); +void gtk_print_operation_get_error (GtkPrintOperation *op, + GError **error); GtkPrintStatus gtk_print_operation_get_status (GtkPrintOperation *op); G_CONST_RETURN gchar * gtk_print_operation_get_status_string (GtkPrintOperation *op); gboolean gtk_print_operation_is_finished (GtkPrintOperation *op); diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c index c6ebc2113..3f2e52105 100644 --- a/gtk/gtkprintunixdialog.c +++ b/gtk/gtkprintunixdialog.c @@ -47,6 +47,7 @@ #include "gtklabel.h" #include "gtkprintbackend.h" +#include "gtkprinter-private.h" #include "gtkprintunixdialog.h" #include "gtkprinteroptionwidget.h" #include "gtkalias.h" |