xfree86 merge

2 files changed, 0 insertions, 66 deletions

diff --git a/modules/im/ximcp/imDefLkup.c b/modules/im/ximcp/imDefLkup.c
index 627e5f09..fda84cb7 100644
--- a/modules/im/ximcp/imDefLkup.c
+++ b/modules/im/ximcp/imDefLkup.c
@@ -1166,65 +1166,3 @@ _XimProtoUtf8LookupString(
 
     return ret;
 }
-
-Public int
-_XimProtoUtf8LookupString(xic, ev, buffer, bytes, keysym, state)
-    XIC			 xic;
-    XKeyEvent		*ev;
-    char		*buffer;
-    int			 bytes;
-    KeySym		*keysym;
-    Status		*state;
-{
-    Xic			 ic = (Xic)xic;
-    Xim			 im = (Xim)ic->core.im;
-    int			 ret;
-    Status		 tmp_state;
-    XimCommitInfo	 info;
-
-    if (!IS_SERVER_CONNECTED(im))
-	return 0;
-
-    if (!state)
-	state = &tmp_state;
-
-    if (ev->type == KeyPress && ev->keycode == 0) { /* Filter function */
-	if (!(info = ic->private.proto.commit_info)) {
-	    if (state)
-		*state = XLookupNone;
-	    return 0;
-	}
-
-	ret = im->methods->ctstoutf8((XIM)im, info->string,
-			 	info->string_len, buffer, bytes, state);
-	if (*state == XBufferOverflow)
-	    return 0;
-	if (keysym && (info->keysym && *(info->keysym))) {
-	    *keysym = *(info->keysym);
-	    if (*state == XLookupChars)
-		*state = XLookupBoth;
-	    else
-		*state = XLookupKeySym;
-	}
-	_XimUnregCommitInfo(ic);
-
-    } else if (ev->type == KeyPress) {
-	ret = _XimLookupUTF8Text(ic, ev, buffer, bytes, keysym, NULL);
-	if (ret > 0) {
-	    if (keysym && *keysym != NoSymbol)
-		*state = XLookupBoth;
-	    else
-		*state = XLookupChars;
-	} else {
-	    if (keysym && *keysym != NoSymbol)
-		*state = XLookupKeySym;
-	    else
-		*state = XLookupNone;
-	}
-    } else {
-	*state = XLookupNone;
-	ret = 0;
-    }
-
-    return ret;
-}
diff --git a/modules/om/generic/omText.c b/modules/om/generic/omText.c
index 865d2f1f..6d6c41f8 100644
--- a/modules/om/generic/omText.c
+++ b/modules/om/generic/omText.c
@@ -236,10 +236,6 @@ DrawStringWithFontSet(
 		       (font = fd->font) == (XFontStruct *) NULL)
 			break;
 		}
-
-	    case XOMOrientation_Context:
-	      /* never used? */
-	      break;
 	    }
 
 	    if(is_xchar2b)