/tmp/cvsX7MHVx

[~andy/gtk] / gtk / gtkprintoperation.h

diff --git a/gtk/gtkprintoperation.h b/gtk/gtkprintoperation.h
index ac144f4ff3f45f424607b804e74fe2dd85e020d7..624a759cb9d49c1d85b473dde2f5a4106463b9ff 100644 (file)
--- a/gtk/gtkprintoperation.h
+++ b/gtk/gtkprintoperation.h
@@ -60,7 +60,6 @@ typedef enum {
   GTK_PRINT_OPERATION_RESULT_ERROR,
   GTK_PRINT_OPERATION_RESULT_APPLY,
   GTK_PRINT_OPERATION_RESULT_CANCEL,
-  GTK_PRINT_OPERATION_RESULT_PREVIEW,
   GTK_PRINT_OPERATION_RESULT_IN_PROGRESS
 } GtkPrintOperationResult;
 
@@ -68,7 +67,7 @@ typedef enum {
   GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG,
   GTK_PRINT_OPERATION_ACTION_PRINT,
   GTK_PRINT_OPERATION_ACTION_PREVIEW,
-  GTK_PRINT_OPERATION_ACTION_EXPORT,
+  GTK_PRINT_OPERATION_ACTION_EXPORT
 } GtkPrintOperationAction;
 
 
@@ -149,7 +148,7 @@ void                    gtk_print_operation_set_use_full_page      (GtkPrintOper
                                                                    gboolean            full_page);
 void                    gtk_print_operation_set_unit               (GtkPrintOperation  *op,
                                                                    GtkUnit             unit);
-void                    gtk_print_operation_set_pdf_target         (GtkPrintOperation  *op,
+void                    gtk_print_operation_set_export_filename    (GtkPrintOperation  *op,
                                                                    const gchar        *filename);
 void                    gtk_print_operation_set_track_print_status (GtkPrintOperation  *op,
                                                                    gboolean            track_status);
@@ -163,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);
@@ -176,8 +176,6 @@ GtkPageSetup           *gtk_print_run_page_setup_dialog            (GtkWindow
 typedef void  (* GtkPageSetupDoneFunc) (GtkPageSetup *page_setup, 
                                        gpointer      data);
 
-void                    gtk_print_operation_run_async              (GtkPrintOperation    *op,
-                                                                   GtkWindow            *parent);
 void                    gtk_print_run_page_setup_dialog_async      (GtkWindow            *parent,
                                                                    GtkPageSetup         *page_setup,
                                                                    GtkPrintSettings     *settings,