CVS: rdesktop xclip.c,1.31,1.32

Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11153

Modified Files:
	xclip.c 
Log Message:
Reorder construction of the target list so that we do not insert an atom that
isn't yet created. Also make sure that we order targets in order of preference.


Index: xclip.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xclip.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** xclip.c	27 Mar 2006 09:20:24 -0000	1.31
--- xclip.c	27 Mar 2006 10:41:22 -0000	1.32
***************
*** 993,1011 ****
  	format_utf8_string_atom = XInternAtom(g_display, "UTF8_STRING", False);
  	format_unicode_atom = XInternAtom(g_display, "text/unicode", False);
  	num_targets = 0;
  	targets[num_targets++] = targets_atom;
  	targets[num_targets++] = timestamp_atom;
  	targets[num_targets++] = rdesktop_clipboard_formats_atom;
- 	targets[num_targets++] = format_string_atom;
  #ifdef USE_UNICODE_CLIPBOARD
  	targets[num_targets++] = format_utf8_string_atom;
  #endif
  	targets[num_targets++] = format_unicode_atom;
  	targets[num_targets++] = XA_STRING;
- 
- 	/* rdesktop sets _RDESKTOP_CLIPBOARD_FORMATS on the root window when acquiring the clipboard.
- 	   Other interested rdesktops can use this to notify their server of the available formats. */
- 	rdesktop_clipboard_formats_atom =
- 		XInternAtom(g_display, "_RDESKTOP_CLIPBOARD_FORMATS", False);
- 	XSelectInput(g_display, DefaultRootWindow(g_display), PropertyChangeMask);
  }
--- 993,1012 ----
  	format_utf8_string_atom = XInternAtom(g_display, "UTF8_STRING", False);
  	format_unicode_atom = XInternAtom(g_display, "text/unicode", False);
+ 
+ 	/* rdesktop sets _RDESKTOP_CLIPBOARD_FORMATS on the root window when acquiring the clipboard.
+ 	   Other interested rdesktops can use this to notify their server of the available formats. */
+ 	rdesktop_clipboard_formats_atom =
+ 		XInternAtom(g_display, "_RDESKTOP_CLIPBOARD_FORMATS", False);
+ 	XSelectInput(g_display, DefaultRootWindow(g_display), PropertyChangeMask);
+ 
  	num_targets = 0;
  	targets[num_targets++] = targets_atom;
  	targets[num_targets++] = timestamp_atom;
  	targets[num_targets++] = rdesktop_clipboard_formats_atom;
  #ifdef USE_UNICODE_CLIPBOARD
  	targets[num_targets++] = format_utf8_string_atom;
  #endif
  	targets[num_targets++] = format_unicode_atom;
+ 	targets[num_targets++] = format_string_atom;
  	targets[num_targets++] = XA_STRING;
  }



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