gtk+3-papi.patch

   1 --- gtk+-3.2.3/modules/printbackends/papi/gtkprintbackendpapi.c.orig    2011-08-16 04:04:35.000000000 +0200
   2 +++ gtk+-3.2.3/modules/printbackends/papi/gtkprintbackendpapi.c 2011-12-23 18:55:39.354135443 +0100
   3 @@ -378,9 +378,9 @@
   4    else if (val == GTK_PRINT_DUPLEX_VERTICAL)
   5      papiAttributeListAddString (&attrs, PAPI_ATTR_EXCL, "Duplex", "DuplexTumble");
   6
   7 -  if (job->num_copies > 1)
   8 +  if (gtk_print_job_get_num_copies(job) > 1)
   9      {
  10 -      papiAttributeListAddInteger (&attrs, PAPI_ATTR_EXCL, "copies", job->num_copies);
  11 +      papiAttributeListAddInteger (&attrs, PAPI_ATTR_EXCL, "copies", gtk_print_job_get_num_copies(job));
  12      }
  13
  14    prtnm = strdup (gtk_printer_get_name (GTK_PRINTER(printer)));
  15 @@ -723,37 +723,40 @@
  16    GtkPageSet page_set;
  17    double scale;
  18    GtkPaperSize *papersize = NULL;
  19 +  GtkPrintPages print_pages = gtk_print_settings_get_print_pages (settings);
  20    char *ppd_paper_name;
  21
  22 -  print_job->print_pages = gtk_print_settings_get_print_pages (settings);
  23 -  print_job->page_ranges = NULL;
  24 -  print_job->num_page_ranges = 0;
  25 +  gtk_print_job_set_pages(print_job, print_pages);
  26 +  gtk_print_job_set_page_ranges(print_job, NULL, 0);
  27
  28 -  if (print_job->print_pages == GTK_PRINT_PAGES_RANGES)
  29 -    print_job->page_ranges =
  30 +  if (print_pages == GTK_PRINT_PAGES_RANGES) {
  31 +    gint num_page_ranges;
  32 +    GtkPageRange *page_ranges =
  33        gtk_print_settings_get_page_ranges (settings,
  34 -                                         &print_job->num_page_ranges);
  35 +                                         &num_page_ranges);
  36 +    gtk_print_job_set_page_ranges(print_job, page_ranges, num_page_ranges);
  37 +  }
  38
  39 -  print_job->collate = gtk_print_settings_get_collate (settings);
  40 -  print_job->reverse = gtk_print_settings_get_reverse (settings);
  41 -  print_job->num_copies = gtk_print_settings_get_n_copies (settings);
  42 +  gtk_print_job_set_collate(print_job, gtk_print_settings_get_collate (settings));
  43 +  gtk_print_job_set_reverse(print_job, gtk_print_settings_get_reverse (settings));
  44 +  gtk_print_job_set_num_copies(print_job, gtk_print_settings_get_n_copies (settings));
  45
  46    scale = gtk_print_settings_get_scale (settings);
  47    if (scale != 100.0)
  48 -    print_job->scale = scale/100.0;
  49 +    gtk_print_job_set_scale(print_job, scale/100.0);
  50
  51    papersize = gtk_page_setup_get_paper_size (page_setup);
  52    ppd_paper_name = gtk_paper_size_get_ppd_name (papersize);
  53
  54    page_set = gtk_print_settings_get_page_set (settings);
  55    if (page_set == GTK_PAGE_SET_EVEN)
  56 -    print_job->page_set = GTK_PAGE_SET_EVEN;
  57 +    gtk_print_job_set_page_set(print_job, GTK_PAGE_SET_EVEN);
  58    else if (page_set == GTK_PAGE_SET_ODD)
  59 -    print_job->page_set = GTK_PAGE_SET_ODD;
  60 +    gtk_print_job_set_page_set(print_job, GTK_PAGE_SET_ODD);
  61    else
  62 -    print_job->page_set = GTK_PAGE_SET_ALL;
  63 +    gtk_print_job_set_page_set(print_job, GTK_PAGE_SET_ALL);
  64
  65 -  print_job->rotate_to_orientation = TRUE;
  66 +  gtk_print_job_set_rotate(print_job, TRUE);
  67
  68  }
  69
  70 --- gtk+-3.2.3/modules/printbackends/papi/Makefile.am.orig      2011-11-07 19:47:37.000000000 +0100
  71 +++ gtk+-3.2.3/modules/printbackends/papi/Makefile.am   2011-12-23 19:55:00.277588009 +0100
  72 @@ -16,7 +16,7 @@
  73         $(top_builddir)/gtk/libgtk-3.la \
  74         $(GTK_DEP_LIBS)
  75
  76 -backenddir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/printbackends
  77 +backenddir = $(libdir)/gtk-3.0/$(GTK_BINARY_VERSION)/printbackends
  78
  79  backend_LTLIBRARIES = libprintbackend-papi.la
  80