diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2006-06-08 16:30:51 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-06-08 16:30:51 +0000 |
| commit | 49e88d89000bcd8e22a949ff66fe2d5b5425657a (patch) | |
| tree | a4e26797a740e0ec9a2eed3ad8da9309618a1e5d /gtk/gtkprintoperation.c | |
| parent | 52a7a65ce84c578d6ded2b556d9b5309b6980b24 (diff) | |
| download | gtk+-49e88d89000bcd8e22a949ff66fe2d5b5425657a.tar.gz | |
Get rid of GTK_PRINT_OPERATION_RESULT_PREVIEW.
2006-06-08 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkprintoperation.h (GtkPrintOperationResult): Get
rid of GTK_PRINT_OPERATION_RESULT_PREVIEW.
* gtk/gtkprintoperation-unix.c:
* gtk/gtkprintoperation.c: Update all users.
Diffstat (limited to 'gtk/gtkprintoperation.c')
| -rw-r--r-- | gtk/gtkprintoperation.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c index b39ac1f94a..b42d3260a5 100644 --- a/gtk/gtkprintoperation.c +++ b/gtk/gtkprintoperation.c @@ -418,8 +418,7 @@ preview_print_idle (gpointer data) gtk_print_operation_preview_render_page (pop->preview, pop->page_nr); cr = gtk_print_context_get_cairo_context (pop->print_context); - _gtk_print_operation_platform_backend_preview_end_page (op, pop->surface, - cr); + _gtk_print_operation_platform_backend_preview_end_page (op, pop->surface, cr); /* TODO: print out sheets not pages and follow ranges */ pop->page_nr++; @@ -443,8 +442,7 @@ preview_got_page_size (GtkPrintOperationPreview *preview, _gtk_print_operation_platform_backend_resize_preview_surface (op, page_setup, pop->surface); cr = gtk_print_context_get_cairo_context (pop->print_context); - _gtk_print_operation_platform_backend_preview_start_page (op, pop->surface, - cr); + _gtk_print_operation_platform_backend_preview_start_page (op, pop->surface, cr); } @@ -2194,7 +2192,7 @@ print_pages (GtkPrintOperation *op, data = g_new0 (PrintPagesData, 1); data->op = g_object_ref (op); - data->is_preview = (result == GTK_PRINT_OPERATION_RESULT_PREVIEW); + data->is_preview = (op->priv->action == GTK_PRINT_OPERATION_ACTION_PREVIEW); if (priv->show_progress) { @@ -2386,14 +2384,13 @@ gtk_print_operation_run (GtkPrintOperation *op, } else if (action == GTK_PRINT_OPERATION_ACTION_PREVIEW) { + priv->is_sync = !priv->allow_async; priv->print_context = _gtk_print_context_new (op); page_setup = create_page_setup (op); _gtk_print_context_set_page_setup (priv->print_context, page_setup); g_object_unref (page_setup); do_print = TRUE; - result = GTK_PRINT_OPERATION_RESULT_PREVIEW; - - priv->is_sync = !priv->allow_async; + result = priv->is_sync ? GTK_PRINT_OPERATION_RESULT_APPLY : GTK_PRINT_OPERATION_RESULT_IN_PROGRESS; } #ifndef G_OS_WIN32 else if (priv->allow_async) |