New upstream version 5.2.13

5 files changed, 18 insertions, 19 deletions

diff --git a/src/gutenprintui2/gammacurve.c b/src/gutenprintui2/gammacurve.c
index 0572abd..ffff1ba 100644
--- a/src/gutenprintui2/gammacurve.c
+++ b/src/gutenprintui2/gammacurve.c
@@ -479,4 +479,3 @@ stpui_gamma_curve_destroy (GtkObject *object)
   if (GTK_OBJECT_CLASS (parent_class)->destroy)
     (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
 }
-
diff --git a/src/gutenprintui2/panel.c b/src/gutenprintui2/panel.c
index 1f19d01..92d18f9 100644
--- a/src/gutenprintui2/panel.c
+++ b/src/gutenprintui2/panel.c
@@ -1616,7 +1616,7 @@ create_copy_number_frame(void)
   copy_count_spin_button = gtk_spin_button_new (adj, 0, 0);
   gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (copy_count_spin_button), FALSE);
   gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (copy_count_spin_button), TRUE);
-  gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (copy_count_spin_button), 
+  gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (copy_count_spin_button),
 				     GTK_UPDATE_IF_VALID);
 
   g_signal_connect(G_OBJECT (adj), "value_changed",
@@ -2924,7 +2924,7 @@ compute_printable_region(void)
   stp_get_imageable_area(pv->v, &left, &right, &bottom, &top);
   printable_width  = right - left;
   printable_height = bottom - top;
-}  
+}
 
 static void
 set_orientation(int orientation)
@@ -3753,7 +3753,7 @@ command_type_callback(GtkWidget *widget, gpointer data)
       gtk_widget_set_sensitive(file_button, TRUE);
       gtk_widget_set_sensitive(copy_count_spin_button, FALSE);
       stpui_plist_set_command_type(pv, COMMAND_TYPE_FILE);
-    }      
+    }
 }
 
 static void
@@ -3988,7 +3988,7 @@ ppd_file_callback(GtkWidget *widget, gpointer data)
     }
   else
     gtk_label_set_text(GTK_LABEL(ppd_model), "");
-}  
+}
 
 /*
  *  setup_open_callback() -
diff --git a/src/gutenprintui2/plist.c b/src/gutenprintui2/plist.c
index bbc4eed..c95fb11 100644
--- a/src/gutenprintui2/plist.c
+++ b/src/gutenprintui2/plist.c
@@ -190,7 +190,7 @@ stpui_build_standard_print_command(const stpui_plist_t *plist,
     raw = 0;
   else
     raw = 1;
-  
+
   if (copy_count > 1)
     stp_asprintf(&count_string, "%s %d ",
 		 global_printing_system->copy_count_command, copy_count);
@@ -370,7 +370,7 @@ stpui_printer_initialize(stpui_plist_t *printer)
   stp_set_errdata(printer->v, stderr);
   stpui_plist_set_copy_count(printer, 1);
   stp_set_string_parameter(printer->v, "InputImageType", image_type);
-  stp_set_string_parameter(printer->v, "JobMode", "Page");  
+  stp_set_string_parameter(printer->v, "JobMode", "Page");
   if (image_raw_channels)
     {
       (void) sprintf(tmp, "%d", image_raw_channels);
@@ -742,7 +742,7 @@ stpui_printrc_load_v0(FILE *fp)
 	}
       else
 	continue;
-      
+
       if (!get_mandatory_string_param(key.v, "Resolution", &lineptr))
 	continue;
       if (!get_mandatory_string_param(key.v, "PageSize", &lineptr))
@@ -952,7 +952,7 @@ stpui_printrc_load_v1(FILE *fp)
 	if (strcmp(current_printer, stpui_plist[i].name) == 0)
 	  stpui_plist_current = i;
     }
-}  
+}
 
 char *stpui_printrc_current_printer = NULL;
 extern FILE *yyin;
@@ -1374,7 +1374,7 @@ usr1_handler (int sig)
  * x,y refers to file descriptor y duplicated onto file descriptor x.
  * So "<0,3" means input file descriptor 3 (pipefd[0]) dup2'ed onto
  * file descriptor 0.
- * 
+ *
  * fd0 = fd 0
  * fd1 = fd 1
  * fd2 = fd 2
@@ -1385,9 +1385,9 @@ usr1_handler (int sig)
  * fd7 = errfd[0]
  * fd8 = errfd[1]
  *
- * 
+ *
  *                            NORMAL CASE
- * 
+ *
  * PARENT             CHILD 1              CHILD 2          CHILD 3
  * (print generator)  (lpr monitor)        (print command)  (error monitor)
  * |
@@ -1459,9 +1459,9 @@ usr1_handler (int sig)
  * | return
  * X
  *
- * 
+ *
  *                            ERROR CASE (job cancelled)
- * 
+ *
  * PARENT             CHILD 1              CHILD 2          CHILD 3
  * (print generator)  (lpr monitor)        (print command)  (error monitor)
  * |
@@ -1592,7 +1592,7 @@ stpui_print(const stpui_plist_t *printer, stpui_image_t *image)
 		      if (opid < 0)
 			_exit(1);
 		      else if (opid == 0) /* Child 3 (monitors stderr) */
-			{ 
+			{
 			  stp_outfunc_t errfunc = stpui_get_errfunc();
 			  void *errdata = stpui_get_errdata();
 			  /* calls g_message on anything it sees */
diff --git a/src/gutenprintui2/printrcy.c b/src/gutenprintui2/printrcy.c
index 9639cbe..7fb4d1b 100644
--- a/src/gutenprintui2/printrcy.c
+++ b/src/gutenprintui2/printrcy.c
@@ -1623,7 +1623,7 @@ yyreduce:
 #line 165 "printrcy.y"
     {
 	  if (current_printer)
-	    current_printer->scaling = (yyvsp[(2) - (2)].dval); 
+	    current_printer->scaling = (yyvsp[(2) - (2)].dval);
 	}
     break;
 
@@ -1650,7 +1650,7 @@ yyreduce:
 #line 186 "printrcy.y"
     {
 	  if (current_printer)
-	    current_printer->unit = (yyvsp[(2) - (2)].ival); 
+	    current_printer->unit = (yyvsp[(2) - (2)].ival);
 	}
     break;
 
diff --git a/src/gutenprintui2/printrcy.y b/src/gutenprintui2/printrcy.y
index cbad294..bf6f9a1 100644
--- a/src/gutenprintui2/printrcy.y
+++ b/src/gutenprintui2/printrcy.y
@@ -164,7 +164,7 @@ Command_Type: COMMAND_TYPE tINT
 Scaling: SCALING tDOUBLE
 	{
 	  if (current_printer)
-	    current_printer->scaling = $2; 
+	    current_printer->scaling = $2;
 	}
 ;
 
@@ -185,7 +185,7 @@ Autosize_Roll_Paper: AUTOSIZE_ROLL_PAPER tINT
 Unit: UNIT tINT
 	{
 	  if (current_printer)
-	    current_printer->unit = $2; 
+	    current_printer->unit = $2;
 	}
 ;