X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=shell%2Fev-print-operation.c;h=8498dceb7b1677cd0b6fc9e4235d15c876ebdc31;hb=refs%2Ftags%2FEVINCE_2_25_92;hp=17b7913b94cb6b285ee27ac998ba56addff70bb1;hpb=15343165c8199172e620ad3addf7b2a5b7dfa942;p=evince.git

diff --git a/shell/ev-print-operation.c b/shell/ev-print-operation.c
index 17b7913b..8498dceb 100644
--- a/shell/ev-print-operation.c
+++ b/shell/ev-print-operation.c
@@ -927,10 +927,10 @@ export_print_page (EvPrintOperationExport *export)
 	
 	if (!export->job_export) {
 		export->job_export = ev_job_export_new (op->document);
-		g_signal_connect (G_OBJECT (export->job_export), "finished",
+		g_signal_connect (export->job_export, "finished",
 				  G_CALLBACK (export_job_finished),
 				  (gpointer)export);
-		g_signal_connect (G_OBJECT (export->job_export), "cancelled",
+		g_signal_connect (export->job_export, "cancelled",
 				  G_CALLBACK (export_job_cancelled),
 				  (gpointer)export);
 	}
@@ -1004,10 +1004,10 @@ ev_print_operation_export_print_dialog_response_cb (GtkDialog              *dial
 	if (!gtk_printer_accepts_ps (export->printer)) {
 		gtk_widget_destroy (GTK_WIDGET (dialog));
 		
-		g_set_error (&export->error,
-			     GTK_PRINT_ERROR,
-			     GTK_PRINT_ERROR_GENERAL,
-			     "%s", _("Printing is not supported on this printer."));
+		g_set_error_literal (&export->error,
+                                     GTK_PRINT_ERROR,
+                                     GTK_PRINT_ERROR_GENERAL,
+                                     _("Printing is not supported on this printer."));
 		g_signal_emit (op, signals[DONE], 0, GTK_PRINT_OPERATION_RESULT_ERROR);
 		
 		return;
@@ -1072,7 +1072,7 @@ ev_print_operation_export_print_dialog_response_cb (GtkDialog              *dial
 		height *= scale;
 	}
 
-	export->pages_per_sheet = gtk_print_settings_get_number_up (print_settings);
+	export->pages_per_sheet = MAX (1, gtk_print_settings_get_number_up (print_settings));
 	
 	export->copies = gtk_print_settings_get_n_copies (print_settings);
 	export->collate = gtk_print_settings_get_collate (print_settings);
@@ -1108,7 +1108,7 @@ ev_print_operation_export_print_dialog_response_cb (GtkDialog              *dial
 	export->fc.paper_width = width;
 	export->fc.paper_height = height;
 	export->fc.duplex = FALSE;
-	export->fc.pages_per_sheet = MAX (1, export->pages_per_sheet);
+	export->fc.pages_per_sheet = export->pages_per_sheet;
 
 	if (ev_print_queue_is_empty (op->document))
 		ev_print_operation_export_begin (export);
@@ -1151,7 +1151,7 @@ ev_print_operation_export_run (EvPrintOperation *op,
 		gtk_print_unix_dialog_set_page_setup (GTK_PRINT_UNIX_DIALOG (dialog),
 						      export->page_setup);
 	
-	g_signal_connect (G_OBJECT (dialog), "response",
+	g_signal_connect (dialog, "response",
 			  G_CALLBACK (ev_print_operation_export_print_dialog_response_cb),
 			  export);