From 48da357ce5714f1375a6ef5358c4380c8c3232b8 Mon Sep 17 00:00:00 2001
From: pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 6 May 2002 15:48:07 +0000
Subject: [PATCH] upsz, 10l

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5999 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libvo/x11_common.c | 9 +++++----
 libvo/x11_common.h | 3 ---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index e9fd3343ac..2a9b9a6c95 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -3,6 +3,7 @@
 #include <stdlib.h>
 
 #include "config.h"
+#include "mp_msg.h"
 
 #ifdef X11_FULLSCREEN
 
@@ -304,7 +305,7 @@ int vo_init( void )
   type=XInternAtom( mDisplay,"_NET_SUPPORTED",False );
   if ( Success == XGetWindowProperty( mDisplay,mRootWin,type,0,65536 / sizeof( long ),False,AnyPropertyType,&type,&format,&nitems,&bytesafter,&args ) && nitems > 0 )
    {
-    mp_dbg( MSGT_GPLAYER,MSGL_STATUS,"[x11] Detected wm is NetWM.\n" );
+    mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is NetWM.\n" );
     XFree( args );
     vo_wm_type=vo_wm_NetWM;
    }
@@ -570,17 +571,17 @@ int vo_x11_check_events(Display *mydisplay){
 	    
             if ( !strncmp( name,"_ICEWM_TRAY",11 ) )
 	      {
-	       mp_dbg( MSGT_GPLAYER,MSGL_STATUS,"[x11] Detected wm is IceWM.\n" );
+	       mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is IceWM.\n" );
 	       vo_wm_type=vo_wm_IceWM;
 	      }
 	    if ( !strncmp( name,"_KDE_",5 ) )
 	      {
-	       mp_dbg( MSGT_GPLAYER,MSGL_STATUS,"[x11] Detected wm is KDE.\n" );
+	       mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is KDE.\n" );
 	       vo_wm_type=vo_wm_KDE;
 	      }
 	    if ( !strncmp( name,"KWM_WIN_DESKTOP",15 ) )
 	      {
-	       mp_dbg( MSGT_GPLAYER,MSGL_STATUS,"[x11] Detected wm is WindowMaker style.\n" );
+	       mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is WindowMaker style.\n" );
 	       vo_wm_type=vo_wm_WMakerStyle;
 	     }
 
diff --git a/libvo/x11_common.h b/libvo/x11_common.h
index 6c921a34ba..06c3bc54b7 100644
--- a/libvo/x11_common.h
+++ b/libvo/x11_common.h
@@ -43,9 +43,6 @@ extern XSizeHints vo_hint;
  extern void vo_setwindow( Window w,GC g );
  extern void vo_x11_putkey(int key);
 #endif
-#ifdef HAVE_GUI
- extern Display * vo_display;
-#endif
 
 void saver_off( Display * );
 void saver_on( Display * );