# HG changeset patch
# User ib
# Date 1307111744 0
# Node ID 2a25b5db0e7e44ef8e7e0b2ec4abc7647417438a
# Parent  47b5846b20b67992cc151ea065547ac8f2cb2466
Remove useless code.

mDisplay is always set, otherwise the GUI wouldn't have been called.
Thus, there is neither a need to call XOpenDisplay() nor to check for error.

diff -r 47b5846b20b6 -r 2a25b5db0e7e gui/wm/ws.c
--- a/gui/wm/ws.c	Fri Jun 03 14:31:13 2011 +0000
+++ b/gui/wm/ws.c	Fri Jun 03 14:35:44 2011 +0000
@@ -202,18 +202,8 @@
  int    eventbase;
  int    errorbase;
 
-if(mDisplay){
+ // NOTE TO MYSELF: Use global mDisplay, get rid of wsDisplay.
  wsDisplay=mDisplay;
-} else {
- char * DisplayName = ":0.0";
- if ( getenv( "DISPLAY" ) ) DisplayName=getenv( "DISPLAY" );
- wsDisplay=XOpenDisplay( DisplayName );
- if ( !wsDisplay )
-  {
-   mp_msg( MSGT_GPLAYER,MSGL_FATAL,MSGTR_WS_CouldNotOpenDisplay );
-   guiExit( EXIT_ERROR );
-  }
-}
 
  XSetErrorHandler( wsErrorHandler );
 
diff -r 47b5846b20b6 -r 2a25b5db0e7e help/help_mp-bg.h
--- a/help/help_mp-bg.h	Fri Jun 03 14:31:13 2011 +0000
+++ b/help/help_mp-bg.h	Fri Jun 03 14:35:44 2011 +0000
@@ -812,7 +812,6 @@
 
 // ws.c
 
-#define MSGTR_WS_CouldNotOpenDisplay "[ws] Не може да бъде отворен DISPLAY.\n"
 #define MSGTR_WS_RemoteDisplay "[ws] Отдалечен дисплей, изключване на  XMITSHM.\n"
 #define MSGTR_WS_NoXshm "[ws] За съжаление вашата система не поддържа разширението на X за споделена памет.\n"
 #define MSGTR_WS_NoXshape "[ws] За съжаление вашата система не поддържа разширението XShape.\n"
diff -r 47b5846b20b6 -r 2a25b5db0e7e help/help_mp-cs.h
--- a/help/help_mp-cs.h	Fri Jun 03 14:31:13 2011 +0000
+++ b/help/help_mp-cs.h	Fri Jun 03 14:35:44 2011 +0000
@@ -784,7 +784,6 @@
 #define MSGTR_NotAFile "Toto nevypadá jako soubor: %s !\n"
 
 // ws.c
-#define MSGTR_WS_CouldNotOpenDisplay "[ws] Nelze otevřít display.\n"
 #define MSGTR_WS_RemoteDisplay "[ws] Vzdálený display, vypínám XMITSHM.\n"
 #define MSGTR_WS_NoXshm "[ws] Promiňte, ale váš systém nepodporuje rozšíření X shared memory.\n"
 #define MSGTR_WS_NoXshape "[ws] Promiňte, ale váš systém nepodporuje rozšíření XShape.\n"
diff -r 47b5846b20b6 -r 2a25b5db0e7e help/help_mp-de.h
--- a/help/help_mp-de.h	Fri Jun 03 14:31:13 2011 +0000
+++ b/help/help_mp-de.h	Fri Jun 03 14:35:44 2011 +0000
@@ -1016,7 +1016,6 @@
 #define MSGTR_NotAFile "Dies scheint keine Datei zu sein: %s !\n"
 
 // ws.c
-#define MSGTR_WS_CouldNotOpenDisplay "[ws] Konnte das Display nicht öffnen.\n"
 #define MSGTR_WS_RemoteDisplay "[ws] Ferngesteuertes Display, deaktiviere XMITSHM.\n"
 #define MSGTR_WS_NoXshm "[ws] Sorry, dein System unterstützt die Shared-Memory-Erweiterung von X nicht.\n"
 #define MSGTR_WS_NoXshape "[ws] Sorry, dein System unterstützt die XShape-Erweiterung nicht.\n"
diff -r 47b5846b20b6 -r 2a25b5db0e7e help/help_mp-en.h
--- a/help/help_mp-en.h	Fri Jun 03 14:31:13 2011 +0000
+++ b/help/help_mp-en.h	Fri Jun 03 14:35:44 2011 +0000
@@ -807,7 +807,6 @@
 #define MSGTR_NotAFile "This does not seem to be a file: %s !\n"
 
 // ws.c
-#define MSGTR_WS_CouldNotOpenDisplay "[ws] Could not open the display.\n"
 #define MSGTR_WS_RemoteDisplay "[ws] Remote display, disabling XMITSHM.\n"
 #define MSGTR_WS_NoXshm "[ws] Sorry, your system does not support the X shared memory extension.\n"
 #define MSGTR_WS_NoXshape "[ws] Sorry, your system does not support the XShape extension.\n"
diff -r 47b5846b20b6 -r 2a25b5db0e7e help/help_mp-es.h
--- a/help/help_mp-es.h	Fri Jun 03 14:31:13 2011 +0000
+++ b/help/help_mp-es.h	Fri Jun 03 14:35:44 2011 +0000
@@ -800,7 +800,6 @@
 #define MSGTR_NotAFile "Esto no parece ser un archivo: %s !\n"
 
 // ws.c
-#define MSGTR_WS_CouldNotOpenDisplay "[ws] No puede abrir el display.\n"
 #define MSGTR_WS_RemoteDisplay "[ws] Display remoto, desactivando XMITSHM.\n"
 #define MSGTR_WS_NoXshm "[ws] Lo lamento, su sistema no soporta la extensión de memoria compartida X.\n"
 #define MSGTR_WS_NoXshape "[ws] Lo lamento, su sistema no soporta la extensión XShape.\n"
diff -r 47b5846b20b6 -r 2a25b5db0e7e help/help_mp-fr.h
--- a/help/help_mp-fr.h	Fri Jun 03 14:31:13 2011 +0000
+++ b/help/help_mp-fr.h	Fri Jun 03 14:35:44 2011 +0000
@@ -967,7 +967,6 @@
 
 // ws.c
 
-#define MSGTR_WS_CouldNotOpenDisplay "[ws] Impossible d'ouvrir l'affichage.\n"
 #define MSGTR_WS_RemoteDisplay "[ws] Affichage à distance, désactive XMITSHM.\n"
 #define MSGTR_WS_NoXshm "[ws] Désolé, votre système ne supporte pas l'extension de mémoire partagée X.\n"
 #define MSGTR_WS_NoXshape "[ws] Désolé, votre système ne supporte pas l'extension XShape.\n"
diff -r 47b5846b20b6 -r 2a25b5db0e7e help/help_mp-hu.h
--- a/help/help_mp-hu.h	Fri Jun 03 14:31:13 2011 +0000
+++ b/help/help_mp-hu.h	Fri Jun 03 14:35:44 2011 +0000
@@ -797,7 +797,6 @@
 #define MSGTR_NotAFile "Úgy tűnik, hogy ez nem fájl: %s !\n"
 
 // ws.c
-#define MSGTR_WS_CouldNotOpenDisplay "[ws] A képernyő nem nyitható meg.\n"
 #define MSGTR_WS_RemoteDisplay "[ws] Távoli képernyő, XMITSHM kikapcsolva.\n"
 #define MSGTR_WS_NoXshm "[ws] Bocs, a rendszered nem támogatja az X osztott memória kiterjesztést.\n"
 #define MSGTR_WS_NoXshape "[ws] Bocs, a rendszered nem támogatja az XShape kiterjesztést.\n"
diff -r 47b5846b20b6 -r 2a25b5db0e7e help/help_mp-it.h
--- a/help/help_mp-it.h	Fri Jun 03 14:31:13 2011 +0000
+++ b/help/help_mp-it.h	Fri Jun 03 14:35:44 2011 +0000
@@ -794,7 +794,6 @@
 #define MSGTR_NotAFile "Questo non pare essere un file: %s !\n"
 
 // ws.c
-#define MSGTR_WS_CouldNotOpenDisplay "[ws] Non posso aprire il display.\n"
 #define MSGTR_WS_RemoteDisplay "[ws] Display remoto, disabilito XMITSHM.\n"
 #define MSGTR_WS_NoXshm "[ws] Spiacente, il tuo sistema non supporta l'estensione 'X shared memory'.\n"
 #define MSGTR_WS_NoXshape "[ws] Spiacente, il tuo sistema non supporta l'estensione XShape.\n"
diff -r 47b5846b20b6 -r 2a25b5db0e7e help/help_mp-pl.h
--- a/help/help_mp-pl.h	Fri Jun 03 14:31:13 2011 +0000
+++ b/help/help_mp-pl.h	Fri Jun 03 14:35:44 2011 +0000
@@ -938,7 +938,6 @@
 
 // ws.c
 
-#define MSGTR_WS_CouldNotOpenDisplay "[ws] Nie udało sie otworzyć ekranu.\n"
 #define MSGTR_WS_RemoteDisplay "[ws] Ekran zdalny, wyłączam XMITSHM.\n"
 #define MSGTR_WS_NoXshm "[ws] Niestety Twój system nie obsługuje rozszerzeń dzielonej pamięci X.\n"
 #define MSGTR_WS_NoXshape "[ws] Niestety Twój system nie obsługuje rozszerzenia XShape.\n"
diff -r 47b5846b20b6 -r 2a25b5db0e7e help/help_mp-ru.h
--- a/help/help_mp-ru.h	Fri Jun 03 14:31:13 2011 +0000
+++ b/help/help_mp-ru.h	Fri Jun 03 14:35:44 2011 +0000
@@ -786,7 +786,6 @@
 #define MSGTR_NotAFile "Это не похоже на файл: '%s' !\n"
 
 // ws.c
-#define MSGTR_WS_CouldNotOpenDisplay "[ws] Не могу открыть дисплей.\n"
 #define MSGTR_WS_RemoteDisplay "[ws] Удалённый дисплей, отключаю XMITSHM.\n"
 #define MSGTR_WS_NoXshm "[ws] Извините, ваша система не поддерживает расширение разделяемой памяти X'ов.\n"
 #define MSGTR_WS_NoXshape "[ws] Извините, ваша система не поддерживает расширение XShape.\n"
diff -r 47b5846b20b6 -r 2a25b5db0e7e help/help_mp-tr.h
--- a/help/help_mp-tr.h	Fri Jun 03 14:31:13 2011 +0000
+++ b/help/help_mp-tr.h	Fri Jun 03 14:35:44 2011 +0000
@@ -981,7 +981,6 @@
 
 // ws.c
 
-#define MSGTR_WS_CouldNotOpenDisplay "[ws] Gösterge açılamadı.\n"
 #define MSGTR_WS_RemoteDisplay "[ws] uzaktan kumanda göstergesi, XMITSHM devredışı bırakılıyor.\n"
 #define MSGTR_WS_NoXshm "[ws] Üzgünüm, sisteminiz X paylaşımlı bellek genişletmesini desteklemiyor.\n"
 #define MSGTR_WS_NoXshape "[ws] Üzgünüm, sisteminiz Xshape genişletmesini desteklemiyor.\n"
diff -r 47b5846b20b6 -r 2a25b5db0e7e help/help_mp-uk.h
--- a/help/help_mp-uk.h	Fri Jun 03 14:31:13 2011 +0000
+++ b/help/help_mp-uk.h	Fri Jun 03 14:35:44 2011 +0000
@@ -779,7 +779,6 @@
 #define MSGTR_NotAFile "Здається, це не файл: %s !\n"
 
 // ws.c
-#define MSGTR_WS_CouldNotOpenDisplay "[ws] Не можу відкрити дисплей.\n"
 #define MSGTR_WS_RemoteDisplay "[ws] Віддалений дисплей, вимикаю XMITSHM.\n"
 #define MSGTR_WS_NoXshm "[ws] Вибачте, ваша система не підтримує розширення загальної пам'яті X.\n"
 #define MSGTR_WS_NoXshape "[ws] Вибачте, здається, ваша система не підтримує розширення XShape.\n"
diff -r 47b5846b20b6 -r 2a25b5db0e7e help/help_mp-zh_CN.h
--- a/help/help_mp-zh_CN.h	Fri Jun 03 14:31:13 2011 +0000
+++ b/help/help_mp-zh_CN.h	Fri Jun 03 14:35:44 2011 +0000
@@ -807,7 +807,6 @@
 #define MSGTR_NotAFile "这好像不是文件：%s！\n"
 
 // ws.c
-#define MSGTR_WS_CouldNotOpenDisplay "[ws] 无法打开显示界面。\n"
 #define MSGTR_WS_RemoteDisplay "[ws] 远程显示界面，禁用 XMITSHM。\n"
 #define MSGTR_WS_NoXshm "[ws] 抱歉，你的系统不支持 X 共享内存扩展组件。\n"
 #define MSGTR_WS_NoXshape "[ws] 抱歉，你的系统不支持 XShape 扩展组件。\n"
diff -r 47b5846b20b6 -r 2a25b5db0e7e help/help_mp-zh_TW.h
--- a/help/help_mp-zh_TW.h	Fri Jun 03 14:31:13 2011 +0000
+++ b/help/help_mp-zh_TW.h	Fri Jun 03 14:35:44 2011 +0000
@@ -953,7 +953,6 @@
 
 // ws.c
 
-#define MSGTR_WS_CouldNotOpenDisplay "[ws] 打不開顯示。\n"
 #define MSGTR_WS_RemoteDisplay "[ws] 遠程顯示, 停用 XMITSHM。\n"
 #define MSGTR_WS_NoXshm "[ws] 抱歉, 你的係統不支持 X 共享内存擴展。\n"
 #define MSGTR_WS_NoXshape "[ws] 抱歉, 你的係統不支持 XShape 擴展。\n"