X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=libview%2Fev-print-operation.c;h=04e327d0327df57bc6bec72dbfa8327d1612773c;hb=032bcdd3c1d1fd84fdd8414ef661103be36cfe9c;hp=a1a3332d2dc4c9a4a475d8fa0733d3a5daf5d891;hpb=764836d36a1391ed0bc03841c68ed768e7ec94b6;p=evince.git

diff --git a/libview/ev-print-operation.c b/libview/ev-print-operation.c
index a1a3332d..04e327d0 100644
--- a/libview/ev-print-operation.c
+++ b/libview/ev-print-operation.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include <config.h>
@@ -1679,13 +1679,11 @@ ev_print_operation_print_done (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);
-#endif
 }
 
 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);
-#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);
-#endif
 	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);
-	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;
@@ -1864,10 +1861,10 @@ ev_print_operation_print_create_custom_widget (EvPrintOperationPrint *print,
 	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, 0, 0, 0);
 	gtk_widget_show (label);
 
-	print->scale_combo = gtk_combo_box_new_text ();
-	gtk_combo_box_append_text (GTK_COMBO_BOX (print->scale_combo), _("None"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (print->scale_combo), _("Shrink to Printable Area"));
-	gtk_combo_box_append_text (GTK_COMBO_BOX (print->scale_combo), _("Fit to Printable Area"));
+	print->scale_combo = gtk_combo_box_text_new ();
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (print->scale_combo), _("None"));
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (print->scale_combo), _("Shrink to Printable Area"));
+	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (print->scale_combo), _("Fit to Printable Area"));
 	gtk_combo_box_set_active (GTK_COMBO_BOX (print->scale_combo), page_scale);
 	gtk_widget_set_tooltip_text (print->scale_combo,
 		_("Scale document pages to fit the selected printer page. Select from one of the following:\n"