Commit 510f5629 authored by Gildas Bazin's avatar Gildas Bazin

* modules/gui/skins/x11/x11_window.cpp: small bugfix for icons support.
parent a1f11b40
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* skin-main.cpp: skins plugin for VLC * skin-main.cpp: skins plugin for VLC
***************************************************************************** *****************************************************************************
* Copyright (C) 2003 VideoLAN * 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 Teulire <ipkiss@via.ecp.fr> * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr> * Emmanuel Puig <karibu@via.ecp.fr>
...@@ -167,7 +167,7 @@ static int Open ( vlc_object_t *p_this ) ...@@ -167,7 +167,7 @@ static int Open ( vlc_object_t *p_this )
imlib_render_pixmaps_for_whole_image( &p_intf->p_sys->iconPixmap, imlib_render_pixmaps_for_whole_image( &p_intf->p_sys->iconPixmap,
&p_intf->p_sys->iconMask ); &p_intf->p_sys->iconMask );
imlib_free_image(); imlib_free_image();
} }
#elif defined WIN32 #elif defined WIN32
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* x11_window.cpp: X11 implementation of the Window class * x11_window.cpp: X11 implementation of the Window class
***************************************************************************** *****************************************************************************
* Copyright (C) 2003 VideoLAN * 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 <asmax@videolan.org> * Authors: Cyril Deguet <asmax@videolan.org>
* *
...@@ -102,12 +102,12 @@ X11Window::X11Window( intf_thread_t *p_intf, Window wnd, int x, int y, ...@@ -102,12 +102,12 @@ X11Window::X11Window( intf_thread_t *p_intf, Window wnd, int x, int y,
{ {
hints = XAllocWMHints(); hints = XAllocWMHints();
} }
if( hints->icon_pixmap != None ) if( p_intf->p_sys->iconPixmap != None )
{ {
hints->icon_pixmap = p_intf->p_sys->iconPixmap; hints->icon_pixmap = p_intf->p_sys->iconPixmap;
hints->flags |= IconPixmapHint; hints->flags |= IconPixmapHint;
} }
if( hints->icon_mask != None ) if( p_intf->p_sys->iconMask != None )
{ {
hints->icon_mask = p_intf->p_sys->iconMask; hints->icon_mask = p_intf->p_sys->iconMask;
hints->flags |= IconMaskHint; hints->flags |= IconMaskHint;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment