svn merge ^/branches/released .

1 files changed, 2 insertions, 18 deletions

diff --git a/xorg-server/hw/xquartz/pbproxy/main.m b/xorg-server/hw/xquartz/pbproxy/main.m
index cfdc7696d..bae23dada 100644
--- a/xorg-server/hw/xquartz/pbproxy/main.m
+++ b/xorg-server/hw/xquartz/pbproxy/main.m
@@ -105,7 +105,7 @@ int xpbproxy_run (void) {
     }

     

     if (xpbproxy_dpy == NULL) {

-        fprintf (stderr, "xpbproxy: can't open default display\n");

+        ErrorF("xpbproxy: can't open default display\n");

         [pool release];

         return EXIT_FAILURE;

     }

@@ -115,7 +115,7 @@ int xpbproxy_run (void) {
     

     if (!XAppleWMQueryExtension (xpbproxy_dpy, &xpbproxy_apple_wm_event_base,

                                  &xpbproxy_apple_wm_error_base)) {

-        fprintf (stderr, "xpbproxy: can't open AppleWM server extension\n");

+        ErrorF("xpbproxy: can't open AppleWM server extension\n");

         [pool release];

         return EXIT_FAILURE;

     }

@@ -147,19 +147,3 @@ Time xpbproxy_current_timestamp (void) {
     /* FIXME: may want to fetch a timestamp from the server.. */

     return CurrentTime;

 }

-

-void debug_printf (const char *fmt, ...) {

-    static int spew = -1;

-    

-    if (spew == -1) {

-        char *x = getenv ("DEBUG");

-        spew = (x != NULL && atoi (x) != 0);

-    }

-    

-    if (spew) {

-        va_list args;

-        va_start(args, fmt);

-        vfprintf (stderr, fmt, args);

-        va_end(args);

-    }

-}