Moved out text_style_* to src/misc/text_style.c

[vlc] / src / video_output / window.c

diff --git a/src/video_output/window.c b/src/video_output/window.c
index 093bad58964bcb7da14bb826f4c9619ee9d277a0..a8ef7976076f7d2dcf94f2cf232354dc60e47f7d 100644 (file)
--- a/src/video_output/window.c
+++ b/src/video_output/window.c
@@ -67,7 +67,7 @@ vout_window_t *vout_window_New(vlc_object_t *obj,
     case VOUT_WINDOW_TYPE_XID:
         type = "vout window xid";
         window->handle.xid = 0;
-        window->x11_display = NULL;
+        window->display.x11 = NULL;
         break;
     default:
         assert(0);
@@ -80,7 +80,7 @@ vout_window_t *vout_window_New(vlc_object_t *obj,
     }
 
     /* Hook for screensaver inhibition */
-    if (cfg->type == VOUT_WINDOW_TYPE_XID) {
+    if ( var_InheritBool( obj, "disable-screensaver" ) && cfg->type == VOUT_WINDOW_TYPE_XID) {
         w->inhibit = vlc_inhibit_Create (VLC_OBJECT (window),
                                          window->handle.xid);
         if (w->inhibit != NULL)