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