[PATCH] Add out-of-band DTMF support and dialpad to use it

[David Woodhouse]

On Wed, 2014-10-08 at 23:36 +0100, David Woodhouse wrote:
> diff --git a/libpurple/protocols/null/nullprpl.c b/libpurple/protocols/null/nullprpl.c
> index bbb446a..f5cf653 100644
> --- a/libpurple/protocols/null/nullprpl.c
> +++ b/libpurple/protocols/null/nullprpl.c
> @@ -1083,7 +1083,8 @@ static PurplePluginProtocolInfo prpl_info =
>    NULL,                                /* get_moods */
>    NULL,                                /* set_public_alias */
>    NULL,                                /* get_public_alias */
> -  NULL                                 /* get_max_message_size */
> +  NULL,                                /* get_max_message_size */
> +  NULL                                 /* media_send_dtmf */
>  };
>  
>  static void nullprpl_init(PurplePlugin *plugin)
> diff --git a/libpurple/protocols/oscar/libaim.c b/libpurple/protocols/oscar/libaim.c
> index 6d65906..d44bdaf 100644
> --- a/libpurple/protocols/oscar/libaim.c
> +++ b/libpurple/protocols/oscar/libaim.c
> @@ -99,7 +99,8 @@ static PurplePluginProtocolInfo prpl_info =
>         NULL,                                   /* get_moods */
>         NULL,                                   /* set_public_alias */
>         NULL,                                   /* get_public_alias */
> -       oscar_get_max_message_size              /* get_max_message_size */
> +       oscar_get_max_message_size,             /* get_max_message_size */
> +       NULL                                    /* media_send_dtmf */
>  };
>  
>  static PurplePluginInfo info =

Btw, by the end of this I was really *hating* the fact that you don't
keep the trailing comma on the final entry in the structure, causing me
to have to edit the (now-)penultimate entry of each one. In an editor
where the act of *typing* a comma makes it reformat the line. Where
every file I was touching seemed to have its own *different* indentation
rules.

I understand that we can't rely on C99 struct initialisers because
Microsoft's toolchain is so horrifically poorly maintained that it
hasn't managed to join us in the 21st century yet. But surely the
trailing comma wouldn't hurt?

-- 
dwmw2
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 5745 bytes
Desc: not available
URL: <https://pidgin.im/pipermail/devel/attachments/20141009/35a0d36c/attachment-0001.bin>