[Pidgin] #3965: Compiling with external libzephyr causes UI hangs in Zephyr prpl

[Pidgin]

#3965: Compiling with external libzephyr causes UI hangs in Zephyr prpl
-------------------+--------------------------------------------------------
Reporter:  ari     |       Owner:  seanegan
    Type:  defect  |      Status:  new     
Priority:  minor   |   Component:  Zephyr  
 Version:  2.2.2   |    Keywords:          
 Pending:  0       |  
-------------------+--------------------------------------------------------
 From Debian bug report http://bugs.debian.org/451165:

 I'm getting long UI hangs from the zephyr library blocking on
 Z_WaitForNotice. The problem seems to be that the zephyr protocol handler
 is using the internal header for its structure definitions, even when it's
 using the system-provided zephyr libraries.

 I was able to solve the problem in pidgin by renaming zephyr.h to
 zephyr_internal.h, and then applying the following patch:
 {{{
 --- orig/pidgin-2.2.2/libpurple/protocols/zephyr/zephyr.h
 2007-10-23 15:55:59.000000000 -0500
 +++ pidgin-2.2.2/libpurple/protocols/zephyr/zephyr_internal.h
 2007-11-14 11:35:02.000000000 -0600
 @@ -11,6 +11,10 @@
  #ifndef __ZEPHYR_H__
  #define __ZEPHYR_H__

 +#ifndef STATIC_ZEPHYR
 +#error should use the system zephyr headers when using the system
 zephyr libs
 +#endif
 +
  #include <config.h>

  #include <glib.h>

 --- orig/pidgin-2.2.2/libpurple/protocols/zephyr/internal.h
 2007-10-23 15:55:59.000000000 -0500
 +++ pidgin-2.2.2/libpurple/protocols/zephyr/internal.h  2007-11-14
 11:34:44.000000000 -0600
 @@ -1,10 +1,14 @@
 -
  #ifndef __INTERNAL_H__
  #define __INTERNAL_H__

  #include <sysdep.h>

 -#include <zephyr.h>
 +#ifdef STATIC_ZEPHYR
 +#include "zephyr_internal.h"
 +#else
 +#include <zephyr/zephyr.h>
 +#endif
 +
  #ifndef WIN32
  #include <netdb.h>
  #endif
 --- orig/pidgin-2.2.2/libpurple/protocols/zephyr/zephyr.c
 2007-10-23 15:55:59.000000000 -0500
 +++ pidgin-2.2.2/libpurple/protocols/zephyr/zephyr.c    2007-11-14
 11:34:17.000000000 -0600
 @@ -38,7 +39,6 @@
  #include "privacy.h"
  #include "version.h"

 -#include "zephyr.h"
  #include "internal.h"
 }}}

-- 
Ticket URL: <http://developer.pidgin.im/ticket/3965>
Pidgin <http://pidgin.im>
Pidgin