[PATCH app-xset 2/2] xprint: remove conditional code regarding xprint

Gaetan Nadon memsize at videotron.ca
Fri Mar 26 16:05:29 PDT 2010


Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 xset.c |   25 -------------------------
 1 files changed, 0 insertions(+), 25 deletions(-)

diff --git a/xset.c b/xset.c
index 7458ee9..7fbb162 100644
--- a/xset.c
+++ b/xset.c
@@ -50,10 +50,6 @@ in this Software without prior written authorization from The Open Group.
 # define XF86MISC
 #endif
 
-#if defined(HAVE_X11_EXTENSIONS_PRINT_H)
-# define BUILD_PRINTSUPPORT
-#endif
-
 #if defined(HAVE_X11_EXTENSIONS_FONTCACHE_H) && defined(HAVE_X11_EXTENSIONS_FONTCACHEP_H)
 # define FONTCACHE
 #endif
@@ -108,9 +104,6 @@ in this Software without prior written authorization from The Open Group.
 static Status set_font_cache(Display *, long, long, long);
 static void query_cache_status(Display *dpy);
 #endif
-#ifdef BUILD_PRINTSUPPORT
-# include <X11/extensions/Print.h>
-#endif
 
 #define ON 1
 #define OFF 0
@@ -379,19 +372,6 @@ main(int argc, char *argv[])
 	    }
 	}
 #endif
-#ifdef BUILD_PRINTSUPPORT
-	else if (strcmp(arg, "rehashprinterlist") == 0) {
-	    /* rehash list of printers */
-	    short dummy;
-
-	    if (XpQueryVersion(dpy, &dummy, &dummy)) {
-		XpRehashPrinterList(dpy);
-	    } else {
-		fprintf(stderr,
-			"server does not have extension for rehashprinterlist option\n");
-	    }
-	}
-#endif
 	else if (strcmp(arg, "fp") == 0) {	/* set font path */
 	    if (i >= argc) {
 		arg = "default";
@@ -1682,11 +1662,6 @@ usage(char *fmt, ...)
     fprintf(stderr, "    Show font cache statistics:\n");
     fprintf(stderr, "\t fc s\n");
 #endif
-#ifdef BUILD_PRINTSUPPORT
-    fprintf(stderr, "    To control Xprint features:\n");
-    fprintf(stderr,
-	"\t rehashprinterlist      Recomputes the list of available printers\n");
-#endif
     fprintf(stderr, "    To set the font path:\n");
     fprintf(stderr, "\t fp= path[,path...]\n");
     fprintf(stderr, "    To restore the default font path:\n");
-- 
1.6.0.4



More information about the xorg-devel mailing list