[xine-cvs] CVS: xine-ui/src/xitk/xine-toolkit _xitk.h,1.58,1.59 inputtext.c,1.46,1.47

[Daniel Caujolle-B. <f1...@us...>]

Update of /cvsroot/xine/xine-ui/src/xitk/xine-toolkit
In directory sc8-pr-cvs1:/tmp/cvs-serv14675/xine-toolkit

Modified Files:
	_xitk.h inputtext.c 
Log Message:
oops, removed header but not usage. Remove unworkable paste.

Index: _xitk.h
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/xine-toolkit/_xitk.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- _xitk.h	10 Dec 2002 22:21:44 -0000	1.58
+++ _xitk.h	10 Dec 2002 22:33:21 -0000	1.59
@@ -65,7 +65,6 @@
 #include "intbox.h"
 #include "labelbutton.h"
 #include "label.h"
-#include "list.h"
 #include "mrlbrowser.h"
 #include "skin.h"
 #include "slider.h"

Index: inputtext.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/xine-toolkit/inputtext.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- inputtext.c	10 Dec 2002 22:21:46 -0000	1.46
+++ inputtext.c	10 Dec 2002 22:33:21 -0000	1.47
@@ -930,86 +930,6 @@
 	}
 	break;
 
-      case XK_y:
-      case XK_Y:
-	if(modifier & MODIFIER_CTRL) {
-	  //	  Atom            prop;
-#ifdef MULTICHAR_SET
-	  Atom            ct;
-#endif
-	  long            nread;
-	  unsigned long   bytes_after;
-	  XTextProperty   ct;
-#ifdef MULTICHAR_SET
-	  int             dummy_count;
-	  char          **cl;
-#endif
-	  printf("Get selection\n");
-	  XLOCK(private_data->imlibdata->x.disp);
-
-	  if(XGetSelectionOwner(private_data->imlibdata->x.disp, XA_PRIMARY) != None) {
-	    printf("OWNER FOR SELECTION\n");
-	    //       selection_paste(Xroot, XA_CUT_BUFFER0, False);
-	    //////////////////////////////
-	    
-	    for (nread = 0, bytes_after = 1; bytes_after > 0; nread += ct.nitems) {
-	      if ((XGetWindowProperty(private_data->imlibdata->x.disp,
-				      private_data->imlibdata->x.root, XA_CUT_BUFFER0,
-				      (nread / 4), 4096,
-				      0, AnyPropertyType, &ct.encoding,
-				      &ct.format, &ct.nitems, &bytes_after,
-				      &ct.value) != Success)) {
-		XFree(ct.value);
-		printf("failed\n");
-		goto _failed;
-	      }
-	      else
-		printf("success\n");
-
-	      if (ct.value == NULL) {
-		printf("continue\n");
-		continue;
-	      }
-#ifdef MULTICHAR_SET
-	      if (XmbTextPropertyToTextList(private_data->imlibdata->x.disp, &ct, &cl,
-					    &dummy_count) == Success && cl) {
-		int i = 0;
-		//		PasteIt(cl[0], strlen(cl[0]));
-		while(cl[i]) {
-		  printf("OKAY: '%s'\n", cl[i++]);
-		}
-		XFreeStringList(cl);
-	      } 
-	      else
-#endif
-		{
-		  //		  PasteIt(ct.value, ct.nitems);
-		  printf("OKAY: '%s'\n", ct.value);
-		}
-	      XFree(ct.value);
-	    }
-	  _failed:
-	    ///////////////////////////////
-	  }
-	  else {
-	    Atom prop;
-	    
-	    prop = XInternAtom(private_data->imlibdata->x.disp, "VT_SELECTION", False);
-#ifdef MULTICHAR_SET
-	    ct = XInternAtom(Xdisplay, "COMPOUND_TEXT", False);
-	    XConvertSelection(private_data->imlibdata->x.disp, XA_PRIMARY, ct, prop, TermWin.vt, tm);
-#else
-	    XConvertSelection(private_data->imlibdata->x.disp, XA_PRIMARY, 
-			      XA_STRING, XA_CUT_BUFFER0, private_data->imlibdata->x.root,
-			      CurrentTime);
-#endif
-	  }
-	  
-	  XUNLOCK(private_data->imlibdata->x.disp);
-
-	}
-	break;
-
       case XK_question:
 	if(modifier & MODIFIER_CTRL) {
 	  inputtext_erase_with_backspace(wl, w);