[shell] Dialogues have no separators on gtk 3

[evince.git] / libview / ev-print-operation.c

diff --git a/libview/ev-print-operation.c b/libview/ev-print-operation.c
index fc631a055476de07b2d81960a80f2b21084590e6..d14c9e7b5c8c9514f6054ff9470bcae7fef81bd9 100644 (file)
--- a/libview/ev-print-operation.c
+++ b/libview/ev-print-operation.c
@@ -1679,13 +1679,11 @@ ev_print_operation_print_done (EvPrintOperationPrint  *print,
 static void
 ev_print_operation_print_status_changed (EvPrintOperationPrint *print)
 {
 static void
 ev_print_operation_print_status_changed (EvPrintOperationPrint *print)
 {

-#ifdef HAVE_GTK_PRINT_OPERATION_GET_N_PAGES_TO_PRINT

        GtkPrintStatus status;
 
        status = gtk_print_operation_get_status (print->op);
        if (status == GTK_PRINT_STATUS_GENERATING_DATA)
                print->n_pages_to_print = gtk_print_operation_get_n_pages_to_print (print->op);
        GtkPrintStatus status;
 
        status = gtk_print_operation_get_status (print->op);
        if (status == GTK_PRINT_STATUS_GENERATING_DATA)
                print->n_pages_to_print = gtk_print_operation_get_n_pages_to_print (print->op);

-#endif

 }
 
 static void
 }
 
 static void


@@ -1695,12 +1693,11 @@ print_job_finished (EvJobPrint            *job,
        EvPrintOperation *op = EV_PRINT_OPERATION (print);
 
        gtk_print_operation_draw_page_finish (print->op);
        EvPrintOperation *op = EV_PRINT_OPERATION (print);
 
        gtk_print_operation_draw_page_finish (print->op);

-#ifdef HAVE_GTK_PRINT_OPERATION_GET_N_PAGES_TO_PRINT
+

        print->total++;
        ev_print_operation_update_status (op, print->total,
                                          print->n_pages_to_print,
                                          print->total / (gdouble)print->n_pages_to_print);
        print->total++;
        ev_print_operation_update_status (op, print->total,
                                          print->n_pages_to_print,
                                          print->total / (gdouble)print->n_pages_to_print);

-#endif

        ev_job_print_set_cairo (job, NULL);
 }
 
        ev_job_print_set_cairo (job, NULL);
 }
 


@@ -1849,7 +1846,7 @@ ev_print_operation_print_create_custom_widget (EvPrintOperationPrint *print,
        gboolean          use_source_size;
 
        settings = gtk_print_operation_get_print_settings (print->op);
        gboolean          use_source_size;
 
        settings = gtk_print_operation_get_print_settings (print->op);

-       page_scale = gtk_print_settings_get_int_with_default (settings, EV_PRINT_SETTING_PAGE_SCALE, 0);
+       page_scale = gtk_print_settings_get_int_with_default (settings, EV_PRINT_SETTING_PAGE_SCALE, 1);

        autorotate = gtk_print_settings_has_key (settings, EV_PRINT_SETTING_AUTOROTATE) ?
                gtk_print_settings_get_bool (settings, EV_PRINT_SETTING_AUTOROTATE) :
                TRUE;
        autorotate = gtk_print_settings_has_key (settings, EV_PRINT_SETTING_AUTOROTATE) ?
                gtk_print_settings_get_bool (settings, EV_PRINT_SETTING_AUTOROTATE) :
                TRUE;