CVS: rdesktop xwin.c,1.205.2.18,1.205.2.19

Pierre Ossman <[email protected]> Thu, 16 Mar 2006 02:14:22 -0800
Newsgroups gmane.network.rdesktop.cvs
Message-ID <[email protected]>
Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6870

Modified Files:
      Tag: seamlessrdp-branch
	xwin.c 
Log Message:
Only allocate the XWMHints structure where we need it.


Index: xwin.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xwin.c,v
retrieving revision 1.205.2.18
retrieving revision 1.205.2.19
diff -C2 -d -r1.205.2.18 -r1.205.2.19
*** xwin.c	16 Mar 2006 08:41:53 -0000	1.205.2.18
--- xwin.c	16 Mar 2006 10:14:18 -0000	1.205.2.19
***************
*** 56,60 ****
  	unsigned long id;
  	unsigned long parent;
- 	XWMHints *hints;
  	int xoffset, yoffset;
  	int width, height;
--- 56,59 ----
***************
*** 296,300 ****
  		{
  			*prevnext = sw->next;
- 			XFree(sw->hints);
  			xfree(sw);
  			return;
--- 295,298 ----
***************
*** 3115,3120 ****
  	sw->id = id;
  	sw->parent = parent;
- 	sw->hints = XAllocWMHints();
- 	sw->hints->flags = 0;
  	sw->xoffset = 0;
  	sw->yoffset = 0;
--- 3113,3116 ----
***************
*** 3231,3237 ****
  			if (sw->state == SEAMLESSRDP_NOTYETMAPPED)
  			{
! 				sw->hints->flags |= StateHint;
! 				sw->hints->initial_state = IconicState;
! 				XSetWMHints(g_display, sw->wnd, sw->hints);
  				XMapWindow(g_display, sw->wnd);
  			}
--- 3227,3236 ----
  			if (sw->state == SEAMLESSRDP_NOTYETMAPPED)
  			{
! 				XWMHints *hints;
! 				hints = XAllocWMHints();
! 				hints->flags = StateHint;
! 				hints->initial_state = IconicState;
! 				XSetWMHints(g_display, sw->wnd, hints);
! 				XFree(hints);
  				XMapWindow(g_display, sw->wnd);
  			}



-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642