From 510f5629294efe1247898b6eb8ea334cf08755fa Mon Sep 17 00:00:00 2001 From: Gildas Bazin Date: Sat, 14 Jun 2003 18:49:02 +0000 Subject: [PATCH] * modules/gui/skins/x11/x11_window.cpp: small bugfix for icons support. --- modules/gui/skins/src/skin_main.cpp | 4 ++-- modules/gui/skins/x11/x11_window.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/gui/skins/src/skin_main.cpp b/modules/gui/skins/src/skin_main.cpp index edcded6228..754c4d66f2 100644 --- a/modules/gui/skins/src/skin_main.cpp +++ b/modules/gui/skins/src/skin_main.cpp @@ -2,7 +2,7 @@ * skin-main.cpp: skins plugin for VLC ***************************************************************************** * Copyright (C) 2003 VideoLAN - * $Id: skin_main.cpp,v 1.39 2003/06/13 21:18:53 asmax Exp $ + * $Id: skin_main.cpp,v 1.40 2003/06/14 18:49:02 gbazin Exp $ * * Authors: Olivier Teulière * Emmanuel Puig @@ -167,7 +167,7 @@ static int Open ( vlc_object_t *p_this ) imlib_render_pixmaps_for_whole_image( &p_intf->p_sys->iconPixmap, &p_intf->p_sys->iconMask ); imlib_free_image(); - } + } #elif defined WIN32 diff --git a/modules/gui/skins/x11/x11_window.cpp b/modules/gui/skins/x11/x11_window.cpp index 8a36e435a9..5633bbe096 100644 --- a/modules/gui/skins/x11/x11_window.cpp +++ b/modules/gui/skins/x11/x11_window.cpp @@ -2,7 +2,7 @@ * x11_window.cpp: X11 implementation of the Window class ***************************************************************************** * Copyright (C) 2003 VideoLAN - * $Id: x11_window.cpp,v 1.22 2003/06/13 21:18:54 asmax Exp $ + * $Id: x11_window.cpp,v 1.23 2003/06/14 18:49:02 gbazin Exp $ * * Authors: Cyril Deguet * @@ -102,12 +102,12 @@ X11Window::X11Window( intf_thread_t *p_intf, Window wnd, int x, int y, { hints = XAllocWMHints(); } - if( hints->icon_pixmap != None ) + if( p_intf->p_sys->iconPixmap != None ) { hints->icon_pixmap = p_intf->p_sys->iconPixmap; hints->flags |= IconPixmapHint; } - if( hints->icon_mask != None ) + if( p_intf->p_sys->iconMask != None ) { hints->icon_mask = p_intf->p_sys->iconMask; hints->flags |= IconMaskHint; -- 2.39.5