From 71eb560c323df9e78e1381eff41002f1df9cb44b Mon Sep 17 00:00:00 2001
From: Roland Mainz <roland.mainz@nrubsig.org>
Date: Thu, 29 Jul 2004 00:40:35 +0000
Subject: Fix for https://freedesktop.org/bugzilla/show_bug.cgi?id=938 - Update
     XawPrintShell per feedback and review comments.

---
 printdialog.c | 15 +++++++++++++++
 printdialog.h | 24 ++++--------------------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/printdialog.c b/printdialog.c
index 615734f..97cf4c9 100644
--- a/printdialog.c
+++ b/printdialog.c
@@ -40,6 +40,10 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xaw/AsciiText.h>
 #include <X11/Xaw/Dialog.h>
 
+#ifdef XKB
+#include <X11/extensions/XKBbells.h>
+#endif /* XKB */
+
 #include "printdialog.h"
 #include "printdialogprivates.h"
 #include "print.h"
@@ -95,6 +99,11 @@ static
 void do_beep(PrintDialogWidget pdw)
 {
     Log(("*** Beep!\n"));
+#ifdef XKB
+    XkbStdBell(XtDisplay((Widget)pdw), XtWindow((Widget)pdw), 0, XkbBI_MinorError);
+#else
+    XBell(XtDisplay((Widget)pdw), 0);
+#endif /* XKB */
 }
 
 /* Center popup (on parent, not on screen - which would be a bad idea
@@ -972,6 +981,12 @@ createprintdialogchildren(Widget w)
             has_default_printer = True;
         }
     }
+    else
+    {
+      XtAppWarning(XtWidgetToApplicationContext(w),
+                   "No Xprint servers could be found. "
+                   "Check whether the XPSERVERLIST environment variable contains any valid Xprint server(s).");
+    }
     
     n = 0;
     XtSetArg(args[n], XtNborderWidth,     0);                        n++;
diff --git a/printdialog.h b/printdialog.h
index a549a1e..e963847 100644
--- a/printdialog.h
+++ b/printdialog.h
@@ -37,30 +37,14 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/XprintUtil/xprintutil.h>
 
 /* Resources:
-
- Name		     Class		RepType		Default Value
- ----		     -----		-------		-------------
- background	     Background		Pixel		XtDefaultBackground
- borderColor	     BorderColor	Pixel		XtDefaultForeground
- borderWidth	     BorderWidth	Dimension	1
- destroyCallback     Callback		Pointer		NULL
- height		     Height		Dimension	computed at create
- icon		     Icon		Pixmap		0
- label		     Label		String		NULL
- mappedWhenManaged   MappedWhenManaged	Boolean		True
- sensitive	     Sensitive		Boolean		True
- value		     Value		String		NULL
- width		     Width		Dimension	computed at create
- x		     Position		Position	0
- y		     Position		Position	0
-
+   NOT WRITTEN YET
 */
 
 #define XtCIcon "Icon"
 #define XtNicon "icon"
 
-#define XawNOkCallback             "XawNOkCallback"
-#define XawNCancelCallback         "XawNCancelCallback"
+#define XawNOkCallback             "okCallback"
+#define XawNCancelCallback         "cancelCallback"
 
 typedef struct
 {
@@ -82,4 +66,4 @@ void XawPrintDialogClosePrinterConnection(Widget w, Bool closeDisplay);
 
 _XFUNCPROTOEND
 
-#endif /* _XawDialog_h */
+#endif /* !XMORE_PRINTDIALOG_H */
-- 
cgit v1.2.3