CVS: rdesktop proto.h,1.90,1.91 xclip.c,1.37,1.38 xwin.c,1.206,1.207

Pierre Ossman <[email protected]> Tue, 28 Mar 2006 05:56:11 -0800
Newsgroups gmane.network.rdesktop.cvs
Message-ID <[email protected]>
Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10134

Modified Files:
	proto.h xclip.c xwin.c 
Log Message:
Make sure we notify other rdesktops that we exited so that they can update
their clipboard status.


Index: proto.h
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/proto.h,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -d -r1.90 -r1.91
*** proto.h	27 Mar 2006 12:29:29 -0000	1.90
--- proto.h	28 Mar 2006 13:56:08 -0000	1.91
***************
*** 210,213 ****
--- 210,214 ----
  void ui_clip_set_mode(const char *optarg);
  void xclip_init(void);
+ void xclip_deinit(void);
  /* xkeymap.c */
  BOOL xkeymap_from_locale(const char *locale);

Index: xclip.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xclip.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** xclip.c	28 Mar 2006 13:24:48 -0000	1.37
--- xclip.c	28 Mar 2006 13:56:08 -0000	1.38
***************
*** 1174,1175 ****
--- 1174,1185 ----
  	targets[num_targets++] = XA_STRING;
  }
+ 
+ void
+ xclip_deinit(void)
+ {
+ 	if (XGetSelectionOwner(g_display, primary_atom) == g_wnd)
+ 		XSetSelectionOwner(g_display, primary_atom, None, acquire_time);
+ 	if (XGetSelectionOwner(g_display, clipboard_atom) == g_wnd)
+ 		XSetSelectionOwner(g_display, clipboard_atom, None, acquire_time);
+ 	xclip_notify_change();
+ }

Index: xwin.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xwin.c,v
retrieving revision 1.206
retrieving revision 1.207
diff -C2 -d -r1.206 -r1.207
*** xwin.c	27 Mar 2006 08:17:33 -0000	1.206
--- xwin.c	28 Mar 2006 13:56:08 -0000	1.207
***************
*** 1637,1640 ****
--- 1637,1642 ----
  	}
  
+ 	xclip_deinit();
+ 
  	if (g_IM != NULL)
  		XCloseIM(g_IM);



-------------------------------------------------------
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