AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Don't include gtkprinter-private.h here.

Browse Source 
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.
This commit is contained in:
Matthias Clasen 2006-06-08 17:01:28 +00:00 committed by Matthias Clasen
parent a0812b9ed5
commit 480803d5ba
9 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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.

7
ChangeLog.pre-2-10
View File

@ -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.

1
gtk/gtkprintbackend.c
View File

@ -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) \

3
gtk/gtkprintbackend.h
View File

@ -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

1
gtk/gtkprintjob.c
View File

@ -35,6 +35,7 @@
#include "gtkprintjob.h"
#include "gtkprinter.h"
#include "gtkprinter-private.h"
#include "gtkprintbackend.h"
#include "gtkalias.h"

1
gtk/gtkprintoperation-unix.c
View File

@ -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"

14
gtk/gtkprintoperation.c
View File

@ -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;
}

3
gtk/gtkprintoperation.h
View File

@ -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);

1
gtk/gtkprintunixdialog.c
View File

@ -47,6 +47,7 @@
#include "gtklabel.h"
#include "gtkprintbackend.h"
#include "gtkprinter-private.h"
#include "gtkprintunixdialog.h"
#include "gtkprinteroptionwidget.h"
#include "gtkalias.h"