Possible fix for X11 threading issues, start of new code to use blocking waits for events

1 files changed, 13 insertions, 2 deletions

diff --git a/skype_messaging_x11.c b/skype_messaging_x11.c
index 139eb89..d7cf10b 100644
--- a/skype_messaging_x11.c
+++ b/skype_messaging_x11.c
@@ -23,7 +23,8 @@ skype_connect()
 	unsigned long bytes_after_ret;

 	unsigned char *prop;

 	int status;

-	

+	
+	XInitThreads();

 	XSetErrorHandler(x11_error_handler);
 #ifdef USE_XVFB_SERVER	
 	if (getenv("SKYPEDISPLAY"))
@@ -160,6 +161,15 @@ send_message(char* message)
 		g_thread_create((GThreadFunc)skype_message_received, "CONNSTATUS LOGGEDOUT", FALSE, NULL); 

 		return;

 	}

+}
+
+Bool
+check_for_clientmessage_predicate(Display *display, XEvent *event, XPointer arg)
+{
+	printf("skype x11 debug: %d %d\n", event->type, ClientMessage);
+	if (event && event->type == ClientMessage)
+		return True;
+	return False;
 }

 

 static void

@@ -178,7 +188,8 @@ receive_message_loop(void)
 		{

 			skype_debug_error("skype_x11", "display has disappeared\n");

 			break;

-		}

+		}
+		//XIfEvent(disp, &e, check_for_clientmessage_predicate, NULL);

 		event_bool = XCheckTypedEvent(disp, ClientMessage, &e);

 		if (!event_bool)

 		{