[QA] Extra output for failing date/timezone string generation.

[andy/viking.git] / src / print.c

diff --git a/src/print.c b/src/print.c
index e606205b6313ff6706479a2aecf8422ec027d0ec..285e3af2a53fd9752d698f19a561328f7251a764 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -30,8 +30,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 

-#if GTK_CHECK_VERSION(2,10,0)
-

 #include "viking.h"
 #include "print.h"
 #include "print-preview.h"
 #include "viking.h"
 #include "print.h"
 #include "print-preview.h"


@@ -107,7 +105,7 @@ void a_print(VikWindow *vw, VikViewport *vvp)
   data.width         = vik_viewport_get_width(vvp);
   data.height        = vik_viewport_get_height(vvp);
 
   data.width         = vik_viewport_get_width(vvp);
   data.height        = vik_viewport_get_height(vvp);
 

-  data.xres = data.yres = 230;   /* FIXME */
+  data.xres = data.yres = 1; // This forces it to default to a 100% page size

 
   if (print_settings != NULL) 
     gtk_print_operation_set_print_settings (print_oper, print_settings);
 
   if (print_settings != NULL) 
     gtk_print_operation_set_print_settings (print_oper, print_settings);


@@ -240,6 +238,7 @@ static void draw_page_cairo(GtkPrintContext *context, PrintData *data)
       case 4:
         copy_row_from_rgba (surface_pixels, pixbuf_pixels, data->width);
         break;
       case 4:
         copy_row_from_rgba (surface_pixels, pixbuf_pixels, data->width);
         break;

+      default: break;

     }
   }
 
     }
   }
 


@@ -485,7 +484,9 @@ static void update_offsets (CustomWidgetInfo *info)
       data->offset_x = offset_x_max / 2.0;
       data->offset_y = offset_y_max / 2.0;
       break;
       data->offset_x = offset_x_max / 2.0;
       data->offset_y = offset_y_max / 2.0;
       break;

-    }
+
+    default: break;
+  }

 }
 
 static void center_changed_cb (GtkWidget *combo, CustomWidgetInfo *info)
 }
 
 static void center_changed_cb (GtkWidget *combo, CustomWidgetInfo *info)


@@ -671,5 +672,3 @@ static GtkWidget *create_custom_widget_cb(GtkPrintOperation *operation, PrintDat
   
   return layout;
 }
   
   return layout;
 }

-
-#endif