diff options
author | Eion Robb <eion@robbmob.com> | 2008-01-18 00:22:17 +0300 |
---|---|---|
committer | Eion Robb <eion@robbmob.com> | 2008-01-18 00:22:17 +0300 |
commit | 1ceb5be0bcc4d1ebfa0008d70d29f7564f26b02a (patch) | |
tree | 789e7e080fcf567770768af576c40bc2531756d0 /skype_messaging_x11.c | |
parent | 5a9a897b2f32983ce15acfe948fc005a0ea24b6f (diff) |
Fixed an X11 error which caused pidgin to crash if skype hadn't been started during the current X session
Diffstat (limited to 'skype_messaging_x11.c')
-rw-r--r-- | skype_messaging_x11.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/skype_messaging_x11.c b/skype_messaging_x11.c index bea8ed2..e6d3aa6 100644 --- a/skype_messaging_x11.c +++ b/skype_messaging_x11.c @@ -6,7 +6,7 @@ static Window win = (Window)-1; Window skype_win = (Window)-1;
GThread *receiving_thread;
Atom message_start, message_continue;
-static gboolean run_loop = TRUE;
+static gboolean run_loop = FALSE;
static unsigned char x11_error_code = 0;
static void receive_message_loop(void);
@@ -42,7 +42,13 @@ skype_connect() purple_debug_info("skype", "Could not create X11 messaging window\n");
return FALSE;
}
- skype_inst = XInternAtom(disp, "_SKYPE_INSTANCE", True);
+ skype_inst = XInternAtom(disp, "_SKYPE_INSTANCE", True); + if (skype_inst == None) + { + skype_win = (Window)-1; + purple_debug_info("skype_x11", "Could not create skype Atom\n"); + return FALSE; + }
status = XGetWindowProperty(disp, root, skype_inst, 0, 1, False, XA_WINDOW, &type_ret, &format_ret, &nitems_ret, &bytes_after_ret, &prop);
if(status != Success || format_ret != 32 || nitems_ret != 1)
{
|