[OTR-dev] Gaim 2.0 Update

[Ian Goldberg]

On Wed, Jan 18, 2006 at 01:55:46PM -0500, Andrew Rodland wrote:
> @@ -437,7 +441,7 @@
>  #if GAIM_MAJOR_VERSION < 2
>      act = gaim_blist_node_action_new("OTR Settings", otr_options_cb, NULL);
>  #else
> -    act = gaim_blist_node_action_new("OTR Settings", otr_options_cb, NULL, NULL);
> +    act = gaim_menu_action_new("OTR Settings", otr_options_cb, NULL, NULL);
>  #endif
>      *menu = g_list_append(*menu, act);
>  }

This can't be right.  The type of the second parameter to
gaim_menu_action_new isn't the same as the type of the second parameter
to gaim_blist_node_action_new.  The latter should be a
void (*callback)(GaimBlistNode *, gpointer), which otr_options_cb is,
but gaim_menu_action_new takes a GaimCallback, which is a
void(*callback)(void) there instead.

But looking through the gaim code, it seems that callback is actually
called with arguments, so I guess just a typecast to (GaimCallback) in
front of the second parameter is in order.

Thanks for the patch,

   - Ian