pidgin/pidgin

Make PurplePluginProtocolInfo definitions consistent
release-2.x.y
2020-05-20, David Woodhouse
159344ba2a49
Parents f89008fda181
Children 93bf0203f935
Make PurplePluginProtocolInfo definitions consistent

Since we can't use C99 structure initialisers, we have to manually add
new NULL fields to all protocols whenever we extend the structure.

Make it slightly easier to script that, by making the current last
field (get_cb_alias) consistent in all cases. In particular, there's
no reason *not* to have the trailing comma, as most already do.

Now I can add a new field to the PRPL by doing something like this...

PROTOFILES=`grep -rl '[A-Za-z_][A-Za-z0-9_]*,[[:space:]]*/\* get_cb_alias \*/' libpurple/protocols/ `
sed '/\/\* get_cb_alias \*\//{p;s/[A-Za-z_][A-Za-
5 files changed, 5 insertions(+), 5 deletions(-)
  • +1 -1
    libpurple/protocols/bonjour/bonjour.c
  • +1 -1
    libpurple/protocols/jabber/libxmpp.c
  • +1 -1
    libpurple/protocols/null/nullprpl.c
  • +1 -1
    libpurple/protocols/sametime/sametime.c
  • +1 -1
    libpurple/protocols/silc10/silc.c
    • --- a/libpurple/protocols/bonjour/bonjour.c Tue May 19 09:34:10 2020 +0000
    +++ b/libpurple/protocols/bonjour/bonjour.c Wed May 20 11:33:10 2020 +0100
    @@ -537,7 +537,7 @@
    NULL, /* get_public_alias */
    NULL, /* add_buddy_with_invite */
    NULL, /* add_buddies_with_invite */
    - NULL /* get_cb_alias */
    + NULL, /* get_cb_alias */
    };
    static PurplePluginInfo info =
    --- a/libpurple/protocols/jabber/libxmpp.c Tue May 19 09:34:10 2020 +0000
    +++ b/libpurple/protocols/jabber/libxmpp.c Wed May 20 11:33:10 2020 +0100
    @@ -132,7 +132,7 @@
    NULL, /* get_public_alias */
    NULL, /* add_buddy_with_invite */
    NULL, /* add_buddies_with_invite */
    - NULL /* get_cb_alias */
    + NULL, /* get_cb_alias */
    };
    static gboolean load_plugin(PurplePlugin *plugin)
    --- a/libpurple/protocols/null/nullprpl.c Tue May 19 09:34:10 2020 +0000
    +++ b/libpurple/protocols/null/nullprpl.c Wed May 20 11:33:10 2020 +0100
    @@ -1124,7 +1124,7 @@
    NULL, /* get_public_alias */
    NULL, /* add_buddy_with_invite */
    NULL, /* add_buddies_with_invite */
    - NULL /* get_cb_alias */
    + NULL, /* get_cb_alias */
    };
    static void nullprpl_init(PurplePlugin *plugin)
    --- a/libpurple/protocols/sametime/sametime.c Tue May 19 09:34:10 2020 +0000
    +++ b/libpurple/protocols/sametime/sametime.c Wed May 20 11:33:10 2020 +0100
    @@ -5156,7 +5156,7 @@
    NULL,
    NULL,
    NULL,
    - NULL
    + NULL, /* get_cb_alias */
    };
    --- a/libpurple/protocols/silc10/silc.c Tue May 19 09:34:10 2020 +0000
    +++ b/libpurple/protocols/silc10/silc.c Wed May 20 11:33:10 2020 +0100
    @@ -1848,7 +1848,7 @@
    NULL, /* get_public_alias */
    NULL, /* add_buddy_with_invite */
    NULL, /* add_buddies_with_invite */
    - NULL /* get_cb_alias */
    + NULL, /* get_cb_alias */
    };
    static PurplePluginInfo info =