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

print operation: Drop the priv pointer

Browse Source
This commit is contained in:
Matthias Clasen 2019-05-26 18:38:19 -04:00
parent cc1c1df405
commit 6a669265ac
1 changed files with 59 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

161
gtk/gtkprintoperation.c
View File

@ -181,8 +181,8 @@ gtk_print_error_quark (void)
static void static void
gtk_print_operation_finalize (GObject *object) gtk_print_operation_finalize (GObject *object)
{ {
GtkPrintOperation *print_operation = GTK_PRINT_OPERATION (object); GtkPrintOperation *op = GTK_PRINT_OPERATION (object);
GtkPrintOperationPrivate *priv = print_operation->priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
if (priv->free_platform_data && if (priv->free_platform_data &&
priv->platform_data) priv->platform_data)
@ -220,11 +220,9 @@ gtk_print_operation_finalize (GObject *object)
static void static void
gtk_print_operation_init (GtkPrintOperation *operation) gtk_print_operation_init (GtkPrintOperation *operation)
{ {
GtkPrintOperationPrivate *priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (operation);
const char *appname; const char *appname;
priv = operation->priv = gtk_print_operation_get_instance_private (operation);
priv->status = GTK_PRINT_STATUS_INITIAL; priv->status = GTK_PRINT_STATUS_INITIAL;
priv->status_string = g_strdup (""); priv->status_string = g_strdup ("");
priv->default_page_setup = NULL; priv->default_page_setup = NULL;
@ -300,13 +298,10 @@ static gboolean
preview_iface_is_selected (GtkPrintOperationPreview *preview, preview_iface_is_selected (GtkPrintOperationPreview *preview,
gint page_nr) gint page_nr)
{ {
GtkPrintOperation *op; GtkPrintOperation *op = GTK_PRINT_OPERATION (preview);
GtkPrintOperationPrivate *priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
int i; int i;
op = GTK_PRINT_OPERATION (preview);
priv = op->priv;
switch (priv->print_pages) switch (priv->print_pages)
{ {
case GTK_PRINT_PAGES_SELECTION: case GTK_PRINT_PAGES_SELECTION:
@ -437,7 +432,7 @@ gtk_print_operation_get_property (GObject *object,
GParamSpec *pspec) GParamSpec *pspec)
{ {
GtkPrintOperation *op = GTK_PRINT_OPERATION (object); GtkPrintOperation *op = GTK_PRINT_OPERATION (object);
GtkPrintOperationPrivate *priv = op->priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
switch (prop_id) switch (prop_id)
{ {
@ -575,15 +570,11 @@ preview_print_idle_done (gpointer data)
static gboolean static gboolean
preview_print_idle (gpointer data) preview_print_idle (gpointer data)
{ {
PreviewOp *pop; PreviewOp *pop = (PreviewOp *) data;
GtkPrintOperation *op; GtkPrintOperation *op = GTK_PRINT_OPERATION (pop->preview);
GtkPrintOperationPrivate *priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
gboolean done = FALSE; gboolean done = FALSE;
pop = (PreviewOp *) data;
op = GTK_PRINT_OPERATION (pop->preview);
priv = op->priv;
if (priv->page_drawing_state == GTK_PAGE_DRAWING_STATE_READY) if (priv->page_drawing_state == GTK_PAGE_DRAWING_STATE_READY)
{ {
if (priv->cancelled) if (priv->cancelled)
@ -707,7 +698,7 @@ static void
gtk_print_operation_done (GtkPrintOperation *operation, gtk_print_operation_done (GtkPrintOperation *operation,
GtkPrintOperationResult result) GtkPrintOperationResult result)
{ {
GtkPrintOperationPrivate *priv = operation->priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (operation);
if (priv->print_context) if (priv->print_context)
{ {
@ -1424,14 +1415,12 @@ void
gtk_print_operation_set_default_page_setup (GtkPrintOperation *op, gtk_print_operation_set_default_page_setup (GtkPrintOperation *op,
GtkPageSetup *default_page_setup) GtkPageSetup *default_page_setup)
{ {
GtkPrintOperationPrivate *priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
g_return_if_fail (GTK_IS_PRINT_OPERATION (op)); g_return_if_fail (GTK_IS_PRINT_OPERATION (op));
g_return_if_fail (default_page_setup == NULL || g_return_if_fail (default_page_setup == NULL ||
GTK_IS_PAGE_SETUP (default_page_setup)); GTK_IS_PAGE_SETUP (default_page_setup));
priv = op->priv;
if (default_page_setup != priv->default_page_setup) if (default_page_setup != priv->default_page_setup)
{ {
if (default_page_setup) if (default_page_setup)
@ -1477,14 +1466,12 @@ void
gtk_print_operation_set_print_settings (GtkPrintOperation *op, gtk_print_operation_set_print_settings (GtkPrintOperation *op,
GtkPrintSettings *print_settings) GtkPrintSettings *print_settings)
{ {
GtkPrintOperationPrivate *priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
g_return_if_fail (GTK_IS_PRINT_OPERATION (op)); g_return_if_fail (GTK_IS_PRINT_OPERATION (op));
g_return_if_fail (print_settings == NULL || g_return_if_fail (print_settings == NULL ||
GTK_IS_PRINT_SETTINGS (print_settings)); GTK_IS_PRINT_SETTINGS (print_settings));
priv = op->priv;
if (print_settings != priv->print_settings) if (print_settings != priv->print_settings)
{ {
if (print_settings) if (print_settings)
@ -1534,13 +1521,11 @@ void
gtk_print_operation_set_job_name (GtkPrintOperation *op, gtk_print_operation_set_job_name (GtkPrintOperation *op,
const gchar *job_name) const gchar *job_name)
{ {
GtkPrintOperationPrivate *priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
g_return_if_fail (GTK_IS_PRINT_OPERATION (op)); g_return_if_fail (GTK_IS_PRINT_OPERATION (op));
g_return_if_fail (job_name != NULL); g_return_if_fail (job_name != NULL);
priv = op->priv;
if (g_strcmp0 (priv->job_name, job_name) == 0) if (g_strcmp0 (priv->job_name, job_name) == 0)
return; return;
@ -1571,12 +1556,10 @@ void
gtk_print_operation_set_n_pages (GtkPrintOperation *op, gtk_print_operation_set_n_pages (GtkPrintOperation *op,
gint n_pages) gint n_pages)
{ {
GtkPrintOperationPrivate *priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
g_return_if_fail (GTK_IS_PRINT_OPERATION (op)); g_return_if_fail (GTK_IS_PRINT_OPERATION (op));
g_return_if_fail (n_pages > 0); g_return_if_fail (n_pages > 0);
priv = op->priv;
g_return_if_fail (priv->current_page == -1 || g_return_if_fail (priv->current_page == -1 ||
priv->current_page < n_pages); priv->current_page < n_pages);
@ -1604,12 +1587,10 @@ void
gtk_print_operation_set_current_page (GtkPrintOperation *op, gtk_print_operation_set_current_page (GtkPrintOperation *op,
gint current_page) gint current_page)
{ {
GtkPrintOperationPrivate *priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
g_return_if_fail (GTK_IS_PRINT_OPERATION (op)); g_return_if_fail (GTK_IS_PRINT_OPERATION (op));
g_return_if_fail (current_page >= 0); g_return_if_fail (current_page >= 0);
priv = op->priv;
g_return_if_fail (priv->nr_of_pages == -1 || g_return_if_fail (priv->nr_of_pages == -1 ||
current_page < priv->nr_of_pages); current_page < priv->nr_of_pages);
@ -1637,14 +1618,12 @@ void
gtk_print_operation_set_use_full_page (GtkPrintOperation *op, gtk_print_operation_set_use_full_page (GtkPrintOperation *op,
gboolean full_page) gboolean full_page)
{ {
GtkPrintOperationPrivate *priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
g_return_if_fail (GTK_IS_PRINT_OPERATION (op)); g_return_if_fail (GTK_IS_PRINT_OPERATION (op));
full_page = full_page != FALSE; full_page = full_page != FALSE;
priv = op->priv;
if (priv->use_full_page != full_page) if (priv->use_full_page != full_page)
{ {
priv->use_full_page = full_page; priv->use_full_page = full_page;
@ -1666,12 +1645,10 @@ void
gtk_print_operation_set_unit (GtkPrintOperation *op, gtk_print_operation_set_unit (GtkPrintOperation *op,
GtkUnit unit) GtkUnit unit)
{ {
GtkPrintOperationPrivate *priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
g_return_if_fail (GTK_IS_PRINT_OPERATION (op)); g_return_if_fail (GTK_IS_PRINT_OPERATION (op));
priv = op->priv;
if (priv->unit != unit) if (priv->unit != unit)
{ {
priv->unit = unit; priv->unit = unit;
@ -1697,12 +1674,10 @@ void
gtk_print_operation_set_track_print_status (GtkPrintOperation *op, gtk_print_operation_set_track_print_status (GtkPrintOperation *op,
gboolean track_status) gboolean track_status)
{ {
GtkPrintOperationPrivate *priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
g_return_if_fail (GTK_IS_PRINT_OPERATION (op)); g_return_if_fail (GTK_IS_PRINT_OPERATION (op));
priv = op->priv;
if (priv->track_print_status != track_status) if (priv->track_print_status != track_status)
{ {
priv->track_print_status = track_status; priv->track_print_status = track_status;
@ -1716,7 +1691,7 @@ _gtk_print_operation_set_status (GtkPrintOperation *op,
GtkPrintStatus status, GtkPrintStatus status,
const gchar *string) const gchar *string)
{ {
GtkPrintOperationPrivate *priv = op->priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
static const gchar *status_strs[] = { static const gchar *status_strs[] = {
NC_("print operation status", "Initial state"), NC_("print operation status", "Initial state"),
NC_("print operation status", "Preparing to print"), NC_("print operation status", "Preparing to print"),
@ -1807,11 +1782,10 @@ gtk_print_operation_get_status_string (GtkPrintOperation *op)
gboolean gboolean
gtk_print_operation_is_finished (GtkPrintOperation *op) gtk_print_operation_is_finished (GtkPrintOperation *op)
{ {
GtkPrintOperationPrivate *priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
g_return_val_if_fail (GTK_IS_PRINT_OPERATION (op), TRUE); g_return_val_if_fail (GTK_IS_PRINT_OPERATION (op), TRUE);
priv = op->priv;
return return
priv->status == GTK_PRINT_STATUS_FINISHED_ABORTED || priv->status == GTK_PRINT_STATUS_FINISHED_ABORTED ||
priv->status == GTK_PRINT_STATUS_FINISHED; priv->status == GTK_PRINT_STATUS_FINISHED;
@ -1829,12 +1803,10 @@ void
gtk_print_operation_set_show_progress (GtkPrintOperation *op, gtk_print_operation_set_show_progress (GtkPrintOperation *op,
gboolean show_progress) gboolean show_progress)
{ {
GtkPrintOperationPrivate *priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
g_return_if_fail (GTK_IS_PRINT_OPERATION (op)); g_return_if_fail (GTK_IS_PRINT_OPERATION (op));
priv = op->priv;
show_progress = show_progress != FALSE; show_progress = show_progress != FALSE;
if (priv->show_progress != show_progress) if (priv->show_progress != show_progress)
@ -1858,12 +1830,10 @@ void
gtk_print_operation_set_allow_async (GtkPrintOperation *op, gtk_print_operation_set_allow_async (GtkPrintOperation *op,
gboolean allow_async) gboolean allow_async)
{ {
GtkPrintOperationPrivate *priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
g_return_if_fail (GTK_IS_PRINT_OPERATION (op)); g_return_if_fail (GTK_IS_PRINT_OPERATION (op));
priv = op->priv;
allow_async = allow_async != FALSE; allow_async = allow_async != FALSE;
if (priv->allow_async != allow_async) if (priv->allow_async != allow_async)
@ -1886,12 +1856,10 @@ void
gtk_print_operation_set_custom_tab_label (GtkPrintOperation *op, gtk_print_operation_set_custom_tab_label (GtkPrintOperation *op,
const gchar *label) const gchar *label)
{ {
GtkPrintOperationPrivate *priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
g_return_if_fail (GTK_IS_PRINT_OPERATION (op)); g_return_if_fail (GTK_IS_PRINT_OPERATION (op));
priv = op->priv;
g_free (priv->custom_tab_label); g_free (priv->custom_tab_label);
priv->custom_tab_label = g_strdup (label); priv->custom_tab_label = g_strdup (label);
@ -1917,12 +1885,10 @@ void
gtk_print_operation_set_export_filename (GtkPrintOperation *op, gtk_print_operation_set_export_filename (GtkPrintOperation *op,
const gchar *filename) const gchar *filename)
{ {
GtkPrintOperationPrivate *priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
g_return_if_fail (GTK_IS_PRINT_OPERATION (op)); g_return_if_fail (GTK_IS_PRINT_OPERATION (op));
priv = op->priv;
g_free (priv->export_filename); g_free (priv->export_filename);
priv->export_filename = g_strdup (filename); priv->export_filename = g_strdup (filename);
@ -1943,7 +1909,7 @@ gtk_print_operation_set_export_filename (GtkPrintOperation *op,
static GtkPageSetup * static GtkPageSetup *
create_page_setup (GtkPrintOperation *op) create_page_setup (GtkPrintOperation *op)
{ {
GtkPrintOperationPrivate *priv = op->priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
GtkPageSetup *page_setup; GtkPageSetup *page_setup;
GtkPrintSettings *settings; GtkPrintSettings *settings;
@ -2008,7 +1974,7 @@ pdf_end_run (GtkPrintOperation *op,
gboolean wait, gboolean wait,
gboolean cancelled) gboolean cancelled)
{ {
GtkPrintOperationPrivate *priv = op->priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
cairo_surface_t *surface = priv->platform_data; cairo_surface_t *surface = priv->platform_data;
cairo_surface_finish (surface); cairo_surface_finish (surface);
@ -2023,7 +1989,7 @@ run_pdf (GtkPrintOperation *op,
GtkWindow *parent, GtkWindow *parent,
gboolean *do_print) gboolean *do_print)
{ {
GtkPrintOperationPrivate *priv = op->priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
GtkPageSetup *page_setup; GtkPageSetup *page_setup;
cairo_surface_t *surface; cairo_surface_t *surface;
cairo_t *cr; cairo_t *cr;
@ -2090,12 +2056,10 @@ run_pdf (GtkPrintOperation *op,
static void static void
clamp_page_ranges (PrintPagesData *data) clamp_page_ranges (PrintPagesData *data)
{ {
GtkPrintOperationPrivate *priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (data->op);
gint num_of_correct_ranges; gint num_of_correct_ranges;
gint i; gint i;
priv = data->op->priv;
num_of_correct_ranges = 0; num_of_correct_ranges = 0;
for (i = 0; i < data->num_ranges; i++) for (i = 0; i < data->num_ranges; i++)
@ -2130,7 +2094,7 @@ clamp_page_ranges (PrintPagesData *data)
static void static void
increment_page_sequence (PrintPagesData *data) increment_page_sequence (PrintPagesData *data)
{ {
GtkPrintOperationPrivate *priv = data->op->priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (data->op);
gint inc; gint inc;
if (data->total == -1) if (data->total == -1)
@ -2224,10 +2188,9 @@ increment_page_sequence (PrintPagesData *data)
static void static void
print_pages_idle_done (gpointer user_data) print_pages_idle_done (gpointer user_data)
{ {
PrintPagesData *data; PrintPagesData *data = (PrintPagesData*)user_data;
GtkPrintOperationPrivate *priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (data->op);
data = (PrintPagesData*)user_data;
priv = data->op->priv; priv = data->op->priv;
priv->print_pages_idle_id = 0; priv->print_pages_idle_id = 0;
@ -2266,11 +2229,9 @@ print_pages_idle_done (gpointer user_data)
static void static void
update_progress (PrintPagesData *data) update_progress (PrintPagesData *data)
{ {
GtkPrintOperationPrivate *priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (data->op);
gchar *text = NULL; gchar *text = NULL;
priv = data->op->priv;
if (data->progress) if (data->progress)
{ {
if (priv->status == GTK_PRINT_STATUS_PREPARING) if (priv->status == GTK_PRINT_STATUS_PREPARING)
@ -2304,7 +2265,7 @@ update_progress (PrintPagesData *data)
void void
gtk_print_operation_set_defer_drawing (GtkPrintOperation *op) gtk_print_operation_set_defer_drawing (GtkPrintOperation *op)
{ {
GtkPrintOperationPrivate *priv = op->priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
g_return_if_fail (priv->page_drawing_state == GTK_PAGE_DRAWING_STATE_DRAWING); g_return_if_fail (priv->page_drawing_state == GTK_PAGE_DRAWING_STATE_DRAWING);
@ -2323,12 +2284,10 @@ void
gtk_print_operation_set_embed_page_setup (GtkPrintOperation *op, gtk_print_operation_set_embed_page_setup (GtkPrintOperation *op,
gboolean embed) gboolean embed)
{ {
GtkPrintOperationPrivate *priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
g_return_if_fail (GTK_IS_PRINT_OPERATION (op)); g_return_if_fail (GTK_IS_PRINT_OPERATION (op));
priv = op->priv;
embed = embed != FALSE; embed = embed != FALSE;
if (priv->embed_page_setup != embed) if (priv->embed_page_setup != embed)
{ {
@ -2348,9 +2307,11 @@ gtk_print_operation_set_embed_page_setup (GtkPrintOperation *op,
gboolean gboolean
gtk_print_operation_get_embed_page_setup (GtkPrintOperation *op) gtk_print_operation_get_embed_page_setup (GtkPrintOperation *op)
{ {
GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
g_return_val_if_fail (GTK_IS_PRINT_OPERATION (op), FALSE); g_return_val_if_fail (GTK_IS_PRINT_OPERATION (op), FALSE);
return op->priv->embed_page_setup; return priv->embed_page_setup;
} }
/** /**
@ -2368,7 +2329,7 @@ gtk_print_operation_get_embed_page_setup (GtkPrintOperation *op)
void void
gtk_print_operation_draw_page_finish (GtkPrintOperation *op) gtk_print_operation_draw_page_finish (GtkPrintOperation *op)
{ {
GtkPrintOperationPrivate *priv = op->priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
GtkPageSetup *page_setup; GtkPageSetup *page_setup;
GtkPrintContext *print_context; GtkPrintContext *print_context;
cairo_t *cr; cairo_t *cr;
@ -2391,7 +2352,7 @@ static void
common_render_page (GtkPrintOperation *op, common_render_page (GtkPrintOperation *op,
gint page_nr) gint page_nr)
{ {
GtkPrintOperationPrivate *priv = op->priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
GtkPageSetup *page_setup; GtkPageSetup *page_setup;
GtkPrintContext *print_context; GtkPrintContext *print_context;
cairo_t *cr; cairo_t *cr;
@ -2617,13 +2578,11 @@ common_render_page (GtkPrintOperation *op,
static void static void
prepare_data (PrintPagesData *data) prepare_data (PrintPagesData *data)
{ {
GtkPrintOperationPrivate *priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (data->op);
GtkPageSetup *page_setup; GtkPageSetup *page_setup;
gboolean paginated = FALSE; gboolean paginated = FALSE;
gint i, j, counter; gint i, j, counter;
priv = data->op->priv;
if (priv->manual_collation) if (priv->manual_collation)
{ {
data->uncollated_copies = priv->manual_num_copies; data->uncollated_copies = priv->manual_num_copies;
@ -2786,13 +2745,10 @@ prepare_data (PrintPagesData *data)
static gboolean static gboolean
print_pages_idle (gpointer user_data) print_pages_idle (gpointer user_data)
{ {
PrintPagesData *data; PrintPagesData *data = (PrintPagesData*)user_data;
GtkPrintOperationPrivate *priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (data->op);
gboolean done = FALSE; gboolean done = FALSE;
data = (PrintPagesData*)user_data;
priv = data->op->priv;
if (priv->page_drawing_state == GTK_PAGE_DRAWING_STATE_READY) if (priv->page_drawing_state == GTK_PAGE_DRAWING_STATE_READY)
{ {
if (priv->status == GTK_PRINT_STATUS_PREPARING) if (priv->status == GTK_PRINT_STATUS_PREPARING)
@ -2867,7 +2823,7 @@ print_pages (GtkPrintOperation *op,
gboolean do_print, gboolean do_print,
GtkPrintOperationResult result) GtkPrintOperationResult result)
{ {
GtkPrintOperationPrivate *priv = op->priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
PrintPagesData *data; PrintPagesData *data;
if (!do_print) if (!do_print)
@ -3095,7 +3051,7 @@ gtk_print_operation_run (GtkPrintOperation *op,
GtkWindow *parent, GtkWindow *parent,
GError **error) GError **error)
{ {
GtkPrintOperationPrivate *priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
GtkPrintOperationResult result; GtkPrintOperationResult result;
GtkPageSetup *page_setup; GtkPageSetup *page_setup;
gboolean do_print; gboolean do_print;
@ -3105,7 +3061,6 @@ gtk_print_operation_run (GtkPrintOperation *op,
GTK_PRINT_OPERATION_RESULT_ERROR); GTK_PRINT_OPERATION_RESULT_ERROR);
g_return_val_if_fail (op->priv->status == GTK_PRINT_STATUS_INITIAL, g_return_val_if_fail (op->priv->status == GTK_PRINT_STATUS_INITIAL,
GTK_PRINT_OPERATION_RESULT_ERROR); GTK_PRINT_OPERATION_RESULT_ERROR);
priv = op->priv;
run_print_pages = TRUE; run_print_pages = TRUE;
do_print = FALSE; do_print = FALSE;
@ -3203,12 +3158,10 @@ void
gtk_print_operation_set_support_selection (GtkPrintOperation *op, gtk_print_operation_set_support_selection (GtkPrintOperation *op,
gboolean support_selection) gboolean support_selection)
{ {
GtkPrintOperationPrivate *priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
g_return_if_fail (GTK_IS_PRINT_OPERATION (op)); g_return_if_fail (GTK_IS_PRINT_OPERATION (op));
priv = op->priv;
support_selection = support_selection != FALSE; support_selection = support_selection != FALSE;
if (priv->support_selection != support_selection) if (priv->support_selection != support_selection)
{ {
@ -3228,9 +3181,11 @@ gtk_print_operation_set_support_selection (GtkPrintOperation *op,
gboolean gboolean
gtk_print_operation_get_support_selection (GtkPrintOperation *op) gtk_print_operation_get_support_selection (GtkPrintOperation *op)
{ {
GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
g_return_val_if_fail (GTK_IS_PRINT_OPERATION (op), FALSE); g_return_val_if_fail (GTK_IS_PRINT_OPERATION (op), FALSE);
return op->priv->support_selection; return priv->support_selection;
} }
/** /**
@ -3248,12 +3203,10 @@ void
gtk_print_operation_set_has_selection (GtkPrintOperation *op, gtk_print_operation_set_has_selection (GtkPrintOperation *op,
gboolean has_selection) gboolean has_selection)
{ {
GtkPrintOperationPrivate *priv; GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
g_return_if_fail (GTK_IS_PRINT_OPERATION (op)); g_return_if_fail (GTK_IS_PRINT_OPERATION (op));
priv = op->priv;
has_selection = has_selection != FALSE; has_selection = has_selection != FALSE;
if (priv->has_selection != has_selection) if (priv->has_selection != has_selection)
{ {
@ -3273,9 +3226,11 @@ gtk_print_operation_set_has_selection (GtkPrintOperation *op,
gboolean gboolean
gtk_print_operation_get_has_selection (GtkPrintOperation *op) gtk_print_operation_get_has_selection (GtkPrintOperation *op)
{ {
GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
g_return_val_if_fail (GTK_IS_PRINT_OPERATION (op), FALSE); g_return_val_if_fail (GTK_IS_PRINT_OPERATION (op), FALSE);
return op->priv->has_selection; return priv->has_selection;
} }
/** /**
@ -3297,7 +3252,9 @@ gtk_print_operation_get_has_selection (GtkPrintOperation *op)
gint gint
gtk_print_operation_get_n_pages_to_print (GtkPrintOperation *op) gtk_print_operation_get_n_pages_to_print (GtkPrintOperation *op)
{ {
GtkPrintOperationPrivate *priv = gtk_print_operation_get_instance_private (op);
g_return_val_if_fail (GTK_IS_PRINT_OPERATION (op), -1); g_return_val_if_fail (GTK_IS_PRINT_OPERATION (op), -1);
return op->priv->nr_of_pages_to_print; return priv->nr_of_pages_to_print;
} }