Attachment 264 Details for Bug 597 – Slightly better patch with fixed help message

[patch] Slightly better patch with fixed help message

patch.gudiff (text/plain), 2.69 KB, created by Roland Mainz on 2004-05-05 11:47:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Mainz

Created: 2004-05-05 11:47:12 UTC

Size: 2.69 KB

patch

obsolete

>Index: xc/ChangeLog
>===================================================================
>RCS file: /cvs/xorg/xc/ChangeLog,v
>retrieving revision 1.15
>diff -u -r1.15 ChangeLog
>--- a/xc/ChangeLog	4 May 2004 22:58:59 -0000	1.15
>+++ b/xc/ChangeLog	5 May 2004 01:45:01 -0000
>@@ -1,4 +1,10 @@
> 2004-05-04 Roland Mainz <roland.mainz@nrubsig.org>
>+        * xc/programs/xset/Imakefile
>+        * xc/programs/xset/xset.c
>+        BugZilla #597: "xset" should have an option to rehash
>+        the list of available printers
>+
>+2004-05-04 Roland Mainz <roland.mainz@nrubsig.org>
>         * xc/config/cf/X11.tmpl
>         * xc/config/cf/xf86site.def
>         * xc/config/cf/xfree86.cf
>Index: xc/programs/xset/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/programs/xset/Imakefile,v
>retrieving revision 1.2
>diff -u -r1.2 Imakefile
>--- a/xc/programs/xset/Imakefile	23 Apr 2004 19:55:04 -0000	1.2
>+++ b/xc/programs/xset/Imakefile	5 May 2004 01:45:11 -0000
>@@ -9,7 +9,7 @@
> 		  FontCacheExtensionDefines \
> 		  XkbDefines
>         DEPLIBS = $(DEPXMUULIB) $(DEPXLIB) $(DEPXF86LIBS) $(DEPFONTLIBS)
>-LOCAL_LIBRARIES = $(XMUULIB) $(XF86LIBS) $(FONTLIBS) $(XLIB)
>+LOCAL_LIBRARIES = $(XMUULIB) $(XF86LIBS) $(FONTLIBS) $(XPLIB) $(XLIB)
> 
> #if BuildXF86MiscLibrary
>        DEPXF86LIBS = $(DEPXXF86MISCLIB)
>Index: xc/programs/xset/xset.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/xset/xset.c,v
>retrieving revision 1.2
>diff -u -r1.2 xset.c
>--- a/xc/programs/xset/xset.c	23 Apr 2004 19:55:04 -0000	1.2
>+++ b/xc/programs/xset/xset.c	5 May 2004 01:45:11 -0000
>@@ -88,6 +88,7 @@
> static Status set_font_cache(Display *, long, long, long);
> static void query_cache_status(Display *dpy);
> #endif
>+#include <X11/extensions/Print.h>
> 
> #define ON 1
> #define OFF 0
>@@ -353,6 +354,14 @@
>       }
>   }
> #endif
>+  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");
>+      }
>+  }
>   else if (strcmp(arg, "fp") == 0) {	       /* set font path */
>     if (i >= argc) {
> 	arg = "default";
>@@ -1500,6 +1509,8 @@
>     fprintf (stderr, "    Show font cache statistics:\n");
>     fprintf (stderr, "\t fc s\n");
> #endif
>+    fprintf (stderr, "    To control Xprint features:\n");
>+    fprintf (stderr, "\t rehashprinterlist      Recomputes the list of available printers\n");
>     fprintf (stderr, "    To set the font path:\n" );
>     fprintf (stderr, "\t fp= path[,path...]\n" );
>     fprintf (stderr, "    To restore the default font path:\n");

Actions: View | Splinter Review

Attachments on bug 597: 263 | 264

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.