glabels-libgnomeprint_fix.patch

   1 diff -aurN glabels-1.91.20030513.orig/configure.in glabels-1.91.20030513/configure.in
   2 --- glabels-1.91.20030513.orig/configure.in     Sun Apr 27 05:55:45 2003
   3 +++ glabels-1.91.20030513/configure.in  Tue May 13 14:26:18 2003
   4 @@ -42,8 +42,8 @@
   5  libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \
   6  libbonobo-2.0 >= $LIBBONOBO_REQUIRED \
   7  libxml-2.0 >= $LIBXML_REQUIRED \
   8 -libgnomeprint-2.0 >= $LIBGNOMEPRINT_REQUIRED \
   9 -libgnomeprintui-2.0 >= $LIBGNOMEPRINTUI_REQUIRED \
  10 +libgnomeprint-2.2 >= $LIBGNOMEPRINT_REQUIRED \
  11 +libgnomeprintui-2.2 >= $LIBGNOMEPRINTUI_REQUIRED \
  12  libgnomecanvas-2.0 >= $LIBGNOMECANVAS_REQUIRED \
  13  gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED \
  14  )
  15 diff -aurN glabels-1.91.20030513.orig/src/glabels-batch.c glabels-1.91.20030513/src/glabels-batch.c
  16 --- glabels-1.91.20030513.orig/src/glabels-batch.c      Tue Dec  3 03:50:13 2002
  17 +++ glabels-1.91.20030513/src/glabels-batch.c   Tue May 13 14:29:40 2003
  18 @@ -23,7 +23,7 @@
  19  #include <config.h>
  20
  21  #include <gnome.h>
  22 -#include <libgnomeprint/gnome-print-master.h>
  23 +#include <libgnomeprint/gnome-print-job.h>
  24
  25  #include "merge-init.h"
  26  #include "xml-label.h"
  27 @@ -74,7 +74,7 @@
  28         gint               rc;
  29         GSList            *p, *file_list = NULL;
  30         gint               n_files;
  31 -       GnomePrintMaster  *master = NULL;
  32 +       GnomePrintJob     *master = NULL;
  33         gchar             *abs_fn;
  34         GnomePrintConfig  *config = NULL;
  35         glLabel           *label = NULL;
  36 @@ -127,7 +127,7 @@
  37                 if ( status == XML_LABEL_OK ) {
  38
  39                         if ( master == NULL ) {
  40 -                               master = gnome_print_master_new ();
  41 +                               master = gnome_print_job_new (NULL);
  42                         }
  43
  44                         gl_print_batch (master, label, n_sheets, n_copies,
  45 @@ -143,11 +143,11 @@
  46         if ( master != NULL ) {
  47
  48                 abs_fn = gl_util_make_absolute ( output );
  49 -               gnome_print_master_print_to_file (master, abs_fn);
  50 +               gnome_print_job_print_to_file (master, abs_fn);
  51                 g_free( abs_fn );
  52
  53 -               gnome_print_master_close (master);
  54 -               gnome_print_master_print (master);
  55 +               gnome_print_job_close (master);
  56 +               gnome_print_job_print (master);
  57
  58                 g_object_unref (master);
  59         }
  60 diff -aurN glabels-1.91.20030513.orig/src/print-dialog.c glabels-1.91.20030513/src/print-dialog.c
  61 --- glabels-1.91.20030513.orig/src/print-dialog.c       Fri Dec 27 17:55:18 2002
  62 +++ glabels-1.91.20030513/src/print-dialog.c    Tue May 13 15:05:42 2003
  63 @@ -26,10 +26,9 @@
  64  #include <ctype.h>
  65  #include <gtk/gtk.h>
  66  #include <libgnomeprint/gnome-print-paper.h>
  67 -#include <libgnomeprintui/gnome-printer-dialog.h>
  68  #include <libgnomeprintui/gnome-print-dialog.h>
  69 -#include <libgnomeprint/gnome-print-master.h>
  70 -#include <libgnomeprintui/gnome-print-master-preview.h>
  71 +#include <libgnomeprint/gnome-print-job.h>
  72 +#include <libgnomeprintui/gnome-print-job-preview.h>
  73
  74  #include "print-dialog.h"
  75  #include "hig.h"
  76 @@ -222,7 +221,7 @@
  77         vbox = gl_hig_vbox_new (GL_HIG_VBOX_OUTER);
  78
  79         printer_select =
  80 -               gnome_printer_selection_new (gnome_print_config_default ());
  81 +               gnome_printer_selector_new (gnome_print_config_default ());
  82         gtk_widget_show (printer_select);
  83         gl_hig_vbox_add_widget (GL_HIG_VBOX(vbox), printer_select);
  84
  85 @@ -258,7 +257,7 @@
  86                 printer_select = g_object_get_data (G_OBJECT(dlg),
  87                                                     "printer_select");
  88
  89 -               config = gnome_printer_selection_get_config (GNOME_PRINTER_SELECTION(printer_select));
  90 +               config = gnome_printer_selector_get_config (printer_select);
  91
  92                 outline_flag =
  93                         gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
  94 @@ -314,19 +313,19 @@
  95               gboolean          outline_flag,
  96               gboolean          reverse_flag)
  97  {
  98 -       GnomePrintMaster *master;
  99 +       GnomePrintJob *master;
 100
 101 -       master = gnome_print_master_new_from_config (config);
 102 +       master = gnome_print_job_new (config);
 103         gl_print_simple (master, label, n_sheets, first, last,
 104                          outline_flag, reverse_flag);
 105 -       gnome_print_master_close (master);
 106 +       gnome_print_job_close (master);
 107
 108         if (preview_flag) {
 109                 GtkWidget *preview_widget =
 110 -                   gnome_print_master_preview_new (master, _("Print preview"));
 111 +                   gnome_print_job_preview_new (master, _("Print preview"));
 112                 gtk_widget_show (GTK_WIDGET (preview_widget));
 113         } else {
 114 -               gnome_print_master_print (master);
 115 +               gnome_print_job_print (master);
 116         }
 117
 118         g_object_unref (G_OBJECT (master));
 119 @@ -345,9 +344,9 @@
 120                     gboolean          outline_flag,
 121                     gboolean          reverse_flag)
 122  {
 123 -       GnomePrintMaster *master;
 124 +       GnomePrintJob *master;
 125
 126 -       master = gnome_print_master_new_from_config (config);
 127 +       master = gnome_print_job_new (config);
 128         if ( collate_flag ) {
 129                 gl_print_merge_collated (master, label,
 130                                          n_copies, first,
 131 @@ -357,14 +356,14 @@
 132                                            n_copies, first,
 133                                            outline_flag, reverse_flag);
 134         }
 135 -       gnome_print_master_close (master);
 136 +       gnome_print_job_close (master);
 137
 138         if (preview_flag) {
 139                 GtkWidget *preview_widget =
 140 -                   gnome_print_master_preview_new (master, _("Print preview"));
 141 +                   gnome_print_job_preview_new (master, _("Print preview"));
 142                 gtk_widget_show (GTK_WIDGET (preview_widget));
 143         } else {
 144 -               gnome_print_master_print (master);
 145 +               gnome_print_job_print (master);
 146         }
 147
 148         g_object_unref (G_OBJECT (master));
 149 diff -aurN glabels-1.91.20030513.orig/src/print.c glabels-1.91.20030513/src/print.c
 150 --- glabels-1.91.20030513.orig/src/print.c      Sat Jan 25 01:43:45 2003
 151 +++ glabels-1.91.20030513/src/print.c   Tue May 13 14:33:19 2003
 152 @@ -26,7 +26,7 @@
 153  #include <ctype.h>
 154  #include <gtk/gtk.h>
 155  #include <libgnomeprint/gnome-print-paper.h>
 156 -#include <libgnomeprintui/gnome-printer-dialog.h>
 157 +#include <libgnomeprintui/gnome-print-dialog.h>
 158
 159  #include "print.h"
 160  #include "label.h"
 161 @@ -74,7 +74,7 @@
 162  /*=========================================================================*/
 163  /* Private function prototypes.                                            */
 164  /*=========================================================================*/
 165 -static PrintInfo *print_info_new              (GnomePrintMaster *master,
 166 +static PrintInfo *print_info_new              (GnomePrintJob *master,
 167                                                glLabel          *label);
 168
 169  static void       print_info_free             (PrintInfo       **pi);
 170 @@ -162,7 +162,7 @@
 171  /* Simple (no merge data) print command.                                     */
 172  /*****************************************************************************/
 173  void
 174 -gl_print_simple (GnomePrintMaster *master,
 175 +gl_print_simple (GnomePrintJob *master,
 176                  glLabel          *label,
 177                  gint              n_sheets,
 178                  gint              first,
 179 @@ -206,7 +206,7 @@
 180  /* Merge print command (collated copies)                                     */
 181  /*****************************************************************************/
 182  void
 183 -gl_print_merge_collated (GnomePrintMaster *master,
 184 +gl_print_merge_collated (GnomePrintJob *master,
 185                          glLabel          *label,
 186                          gint              n_copies,
 187                          gint              first,
 188 @@ -274,7 +274,7 @@
 189  /* Merge print command (uncollated copies)                                   */
 190  /*****************************************************************************/
 191  void
 192 -gl_print_merge_uncollated (GnomePrintMaster *master,
 193 +gl_print_merge_uncollated (GnomePrintJob *master,
 194                            glLabel          *label,
 195                            gint              n_copies,
 196                            gint              first,
 197 @@ -344,7 +344,7 @@
 198  /* Batch print.  Call appropriate function above.                            */
 199  /*****************************************************************************/
 200  void
 201 -gl_print_batch (GnomePrintMaster *master,
 202 +gl_print_batch (GnomePrintJob *master,
 203                 glLabel          *label,
 204                 gint              n_sheets,
 205                 gint              n_copies,
 206 @@ -380,7 +380,7 @@
 207  /* PRIVATE.  new print info structure                                        */
 208  /*---------------------------------------------------------------------------*/
 209  static PrintInfo *
 210 -print_info_new (GnomePrintMaster *master,
 211 +print_info_new (GnomePrintJob *master,
 212                 glLabel          *label)
 213  {
 214         PrintInfo            *pi = g_new0 (PrintInfo, 1);
 215 @@ -395,8 +395,8 @@
 216                 return NULL;
 217         }
 218
 219 -       pi->pc = gnome_print_master_get_context (master);
 220 -       pi->config = gnome_print_master_get_config (master);
 221 +       pi->pc = gnome_print_job_get_context (master);
 222 +       pi->config = gnome_print_job_get_config (master);
 223
 224         if ((template != NULL) && (template->page_size != NULL)) {
 225
 226 diff -aurN glabels-1.91.20030513.orig/src/print.h glabels-1.91.20030513/src/print.h
 227 --- glabels-1.91.20030513.orig/src/print.h      Sun Dec  8 07:31:57 2002
 228 +++ glabels-1.91.20030513/src/print.h   Tue May 13 14:39:40 2003
 229 @@ -23,13 +23,13 @@
 230  #define __PRINT_H__
 231
 232  #include <gnome.h>
 233 -#include <libgnomeprint/gnome-print-master.h>
 234 -#include <libgnomeprintui/gnome-print-master-preview.h>
 235 +#include <libgnomeprint/gnome-print-job.h>
 236 +#include <libgnomeprintui/gnome-print-job-preview.h>
 237  #include "label.h"
 238
 239  G_BEGIN_DECLS
 240
 241 -void gl_print_simple           (GnomePrintMaster *master,
 242 +void gl_print_simple           (GnomePrintJob *master,
 243                                 glLabel          *label,
 244                                 gint              n_sheets,
 245                                 gint              first,
 246 @@ -37,21 +37,21 @@
 247                                 gboolean          outline_flag,
 248                                 gboolean          reverse_flag);
 249
 250 -void gl_print_merge_collated   (GnomePrintMaster *master,
 251 +void gl_print_merge_collated   (GnomePrintJob *master,
 252                                 glLabel          *label,
 253                                 gint              n_copies,
 254                                 gint              first,
 255                                 gboolean          outline_flag,
 256                                 gboolean          reverse_flag);
 257
 258 -void gl_print_merge_uncollated (GnomePrintMaster *master,
 259 +void gl_print_merge_uncollated (GnomePrintJob *master,
 260                                 glLabel          *label,
 261                                 gint              n_copies,
 262                                 gint              first,
 263                                 gboolean          outline_flag,
 264                                 gboolean          reverse_flag);
 265
 266 -void gl_print_batch            (GnomePrintMaster *master,
 267 +void gl_print_batch            (GnomePrintJob *master,
 268                                 glLabel          *label,
 269                                 gint              n_sheets,
 270                                 gint              n_bcopies,