*** ./libsn/sn-xmessages.c.ORIG	Thu Nov 11 08:25:57 2010
--- ./libsn/sn-xmessages.c	Thu Nov 11 08:24:22 2010
***************
*** 39,45 ****
    Atom           type_atom_begin;
    char          *message_type;
    SnXmessageFunc func;
!   void          *func_data;
    SnFreeFunc     free_data_func;
  } SnXmessageHandler;
  
--- 39,45 ----
    Atom           type_atom_begin;
    char          *message_type;
    SnXmessageFunc func;
!   void          *AIXfunc_data;
    SnFreeFunc     free_data_func;
  } SnXmessageHandler;
  
***************
*** 57,63 ****
                                 const char     *message_type,
                                 const char     *message_type_begin,
                                 SnXmessageFunc  func,
!                                void           *func_data,
                                 SnFreeFunc      free_data_func)
  {
    SnXmessageHandler *handler;
--- 57,63 ----
                                 const char     *message_type,
                                 const char     *message_type_begin,
                                 SnXmessageFunc  func,
!                                void           *AIXfunc_data,
                                 SnFreeFunc      free_data_func)
  {
    SnXmessageHandler *handler;
***************
*** 74,80 ****
    handler->type_atom_begin = sn_internal_atom_get (display, message_type_begin);
    handler->message_type = sn_internal_strdup (message_type);
    handler->func = func;
!   handler->func_data = func_data;
    handler->free_data_func = free_data_func;
    
    sn_list_prepend (xmessage_funcs, handler);
--- 74,80 ----
    handler->type_atom_begin = sn_internal_atom_get (display, message_type_begin);
    handler->message_type = sn_internal_strdup (message_type);
    handler->func = func;
!   handler->AIXfunc_data = AIXfunc_data;
    handler->free_data_func = free_data_func;
    
    sn_list_prepend (xmessage_funcs, handler);
***************
*** 84,90 ****
  {
    const char *message_type;
    SnXmessageFunc func;
!   void *func_data;
    Window root;
    SnXmessageHandler *handler;
  } FindHandlerData;
--- 84,90 ----
  {
    const char *message_type;
    SnXmessageFunc func;
!   void *AIXfunc_data;
    Window root;
    SnXmessageHandler *handler;
  } FindHandlerData;
***************
*** 97,103 ****
    SnXmessageHandler *handler = value;
  
    if (handler->func == fhd->func &&
!       handler->func_data == fhd->func_data &&
        handler->root == fhd->root &&
        strcmp (fhd->message_type, handler->message_type) == 0)
      {
--- 97,103 ----
    SnXmessageHandler *handler = value;
  
    if (handler->func == fhd->func &&
!       handler->AIXfunc_data == fhd->AIXfunc_data &&
        handler->root == fhd->root &&
        strcmp (fhd->message_type, handler->message_type) == 0)
      {
***************
*** 113,119 ****
                                    int             screen,
                                    const char     *message_type,
                                    SnXmessageFunc  func,
!                                   void           *func_data)
  {
    FindHandlerData fhd;
    SnList *xmessage_funcs;
--- 113,119 ----
                                    int             screen,
                                    const char     *message_type,
                                    SnXmessageFunc  func,
!                                   void           *AIXfunc_data)
  {
    FindHandlerData fhd;
    SnList *xmessage_funcs;
***************
*** 123,129 ****
  
    fhd.message_type = message_type;
    fhd.func = func;
!   fhd.func_data = func_data;
    fhd.handler = NULL;
    fhd.root = sn_internal_display_get_root_window (display, screen);
    
--- 123,129 ----
  
    fhd.message_type = message_type;
    fhd.func = func;
!   fhd.AIXfunc_data = AIXfunc_data;
    fhd.handler = NULL;
    fhd.root = sn_internal_display_get_root_window (display, screen);
    
***************
*** 137,143 ****
        sn_free (fhd.handler->message_type);
        
        if (fhd.handler->free_data_func)
!         (* fhd.handler->free_data_func) (fhd.handler->func_data);
        
        sn_free (fhd.handler);
      }
--- 137,143 ----
        sn_free (fhd.handler->message_type);
        
        if (fhd.handler->free_data_func)
!         (* fhd.handler->free_data_func) (fhd.handler->AIXfunc_data);
        
        sn_free (fhd.handler);
      }
***************
*** 486,492 ****
      (* handler->func) (mdd->display,
                         handler->message_type,
                         mdd->message->message,
!                        handler->func_data);
    
    return TRUE;
  }
--- 486,492 ----
      (* handler->func) (mdd->display,
                         handler->message_type,
                         mdd->message->message,
!                        handler->AIXfunc_data);
    
    return TRUE;
  }
*** ./libsn/sn-xmessages.h.ORIG	Thu Nov 11 08:26:10 2010
--- ./libsn/sn-xmessages.h	Thu Nov 11 08:22:42 2010
***************
*** 39,51 ****
                                         const char     *message_type,
                                         const char     *message_type_begin,
                                         SnXmessageFunc  func,
!                                        void           *func_data,
                                         SnFreeFunc      free_data_func);
  void sn_internal_remove_xmessage_func (SnDisplay      *display,
                                         int             screen,
                                         const char     *message_type,
                                         SnXmessageFunc  func,
!                                        void           *func_data);
  void sn_internal_broadcast_xmessage   (SnDisplay      *display,
                                         int             screen,
                                         const char     *message_type,
--- 39,51 ----
                                         const char     *message_type,
                                         const char     *message_type_begin,
                                         SnXmessageFunc  func,
!                                        void           *AIXfunc_data,
                                         SnFreeFunc      free_data_func);
  void sn_internal_remove_xmessage_func (SnDisplay      *display,
                                         int             screen,
                                         const char     *message_type,
                                         SnXmessageFunc  func,
!                                        void           *AIXfunc_data);
  void sn_internal_broadcast_xmessage   (SnDisplay      *display,
                                         int             screen,
                                         const char     *message_type,