[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#95951: xlibs: [libICE] message replies do not work properly for subprotocols



On Thu, Nov 28, 2002 at 10:29:38AM +0100, Jochen Voss wrote:
> On Tue, Nov 26, 2002 at 07:56:42PM -0500, Branden Robinson wrote:
> > I've attached an updated version of your patch, which applies to
> > xf-4_2-branch.
> Did you?  I've not seen the patch, neither in the mail nor in
> the bug report log.

Oops.

-- 
G. Branden Robinson                |
Debian GNU/Linux                   |           //     // //  /     /
branden@debian.org                 |           EI 'AANIIGOO 'AHOOT'E
http://people.debian.org/~branden/ |
--- xc/lib/ICE/process.c~	2002-11-26 19:40:40.000000000 -0500
+++ xc/lib/ICE/process.c	2002-11-26 19:55:11.000000000 -0500
@@ -254,9 +254,24 @@
 	 * for the message the client is blocking on.  The second is
 	 * the replyWait for the message currently being processed
 	 * by IceProcessMessages.  We call it "useThisReplyWait".
+	 *
+	 * Note also that we translate the opcodes before comparing them,
+	 * to avoid errors.
 	 */
 
-	useThisReplyWait = _IceSearchReplyWaits (iceConn, header->majorOpcode);
+	{
+	    int op;
+	    if (header->majorOpcode == 0)
+	    {
+		op = 0;
+	    }
+	    else
+	    {
+		int idx = header->majorOpcode - iceConn->his_min_opcode;
+		op = iceConn->process_msg_info[idx].my_opcode;
+	    }
+	     useThisReplyWait = _IceSearchReplyWaits (iceConn, op);
+	}
     }
 
     if (header->majorOpcode == 0)

Attachment: pgpPbJ8QKvEDP.pgp
Description: PGP signature


Reply to: