1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64
|
Description: Move old Debian inline changes to quilt patch.
Author: Barry deFreese <bdefreese@debian.org>
Index: xpp-1.5-cvs20081009/cupshelper.cxx
===================================================================
--- xpp-1.5-cvs20081009.orig/cupshelper.cxx 2008-10-09 05:17:48.000000000 -0400
+++ xpp-1.5-cvs20081009/cupshelper.cxx 2013-07-15 22:37:52.852799253 -0400
@@ -36,6 +36,7 @@
#include "passworddialog.h"
#include <stdlib.h>
+#include <stdio.h>
#include <cups/language.h>
//*******************************************************
Index: xpp-1.5-cvs20081009/mainwindow.fl
===================================================================
--- xpp-1.5-cvs20081009.orig/mainwindow.fl 2008-10-09 05:17:48.000000000 -0400
+++ xpp-1.5-cvs20081009/mainwindow.fl 2013-07-15 22:38:59.789131172 -0400
@@ -1427,7 +1427,7 @@
} else {
sprintf(buffer,"Do you really want to delete default instance of the queue \\"%s\\"?",s);
}
- if (!fl_ask(buffer)) return;
+ if (!fl_ask("%s", buffer)) return;
}
val=instancelist->value();
if ((copybutton->value()) || (renamebutton->value())) {
Index: xpp-1.5-cvs20081009/xpp.cxx
===================================================================
--- xpp-1.5-cvs20081009.orig/xpp.cxx 2008-10-09 05:17:48.000000000 -0400
+++ xpp-1.5-cvs20081009/xpp.cxx 2013-07-15 22:42:01.398031722 -0400
@@ -317,7 +317,7 @@
ipp_t *request = CupsHelper::newIppRequest();
char buf[1024];
- char *state = NULL, *type = NULL, *location = NULL, *comment = NULL;
+ const char *state = NULL, *type = NULL, *location = NULL, *comment = NULL;
sprintf(buf,"ipp://%s:%d/printers/%s",CupsHelper::host(),
CupsHelper::port(),dests[i].name);
ippAddString(request,IPP_TAG_OPERATION,IPP_TAG_URI,"printer-uri",NULL,buf);
Index: xpp-1.5-cvs20081009/xpp.h
===================================================================
--- xpp-1.5-cvs20081009.orig/xpp.h 2008-10-09 05:17:48.000000000 -0400
+++ xpp-1.5-cvs20081009/xpp.h 2013-07-15 22:44:38.590811199 -0400
@@ -38,6 +38,7 @@
#include <cups/cups.h>
#include <cups/ipp.h>
#include <cups/language.h>
+#include <cups/ppd.h>
#include <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Box.H>
@@ -83,9 +84,9 @@
const char *STDIN_STR; /* Key word representing standard
input in 'filelist' */
int job_id; /* Job ID */
- const char *dest; /* Destination printer */
+ char *dest; /* Destination printer */
const char *instance; /* instance of destination printer */
- const char *default_pr; /* Default printer defined under CUPS */
+ char *default_pr; /* Default printer defined under CUPS */
int dest_pos; /* Position of destination entry in list */
const char *title; /* Job title */
const char *extra_options; /* Extra options */
|