pidgin/pidgin

Make PurplePluginProtocolInfo definitions consistent
release-2.x.y
2020-05-20, David Woodhouse
159344ba2a49
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-
EXTRA_DIST = \
dbus-analyze-functions.py \
dbus-analyze-signals.py \
dbus-analyze-types.py \
marshallers.list \
purple-notifications-example \
purple-remote \
purple-send \
purple-send-async \
purple-url-handler \
purple.h.in \
version.h.in \
Makefile.mingw \
data/purple.pc.in \
data/purple-uninstalled.pc.in \
win32/global.mak \
win32/libc_interface.c \
win32/libc_interface.h \
win32/libc_internal.h \
win32/libpurplerc.rc.in \
win32/rules.mak \
win32/targets.mak \
win32/wpurpleerror.h \
win32/win32dep.c \
win32/giowin32.c \
win32/win32dep.h
if USE_GCONFTOOL
GCONF_DIR=data/gconf
endif
SUBDIRS = $(GCONF_DIR) plugins protocols ciphers . tests example
purple_coresources = \
account.c \
accountopt.c \
blist.c \
buddyicon.c \
certificate.c \
cipher.c \
circbuffer.c \
cmds.c \
connection.c \
conversation.c \
core.c \
debug.c \
desktopitem.c \
eventloop.c \
ft.c \
glibcompat.c \
idle.c \
imgstore.c \
log.c \
media/backend-fs2.c \
media/backend-iface.c \
media/candidate.c \
media/codec.c \
media/enum-types.c \
media.c \
mediamanager.c \
mime.c \
nat-pmp.c \
network.c \
ntlm.c \
notify.c \
plugin.c \
pluginpref.c \
pounce.c \
prefs.c \
privacy.c \
proxy.c \
prpl.c \
request.c \
roomlist.c \
savedstatuses.c \
server.c \
signals.c \
smiley.c \
dnsquery.c \
dnssrv.c\
status.c \
stringref.c \
stun.c \
sound.c \
sound-theme.c \
sound-theme-loader.c \
sslconn.c \
theme.c \
theme-loader.c \
theme-manager.c \
upnp.c \
util.c \
value.c \
version.c \
xmlnode.c \
whiteboard.c
purple_builtsources = \
marshallers.c
purple_coreheaders = \
account.h \
accountopt.h \
blist.h \
buddyicon.h \
certificate.h \
cipher.h \
circbuffer.h \
cmds.h \
connection.h \
conversation.h \
core.h \
dbus-maybe.h \
debug.h \
desktopitem.h \
eventloop.h \
ft.h \
gaim-compat.h \
glibcompat.h \
idle.h \
imgstore.h \
log.h \
media.h \
media-gst.h \
mediamanager.h \
mime.h \
nat-pmp.h \
network.h \
notify.h \
ntlm.h \
plugin.h \
pluginpref.h \
pounce.h \
prefs.h \
privacy.h \
proxy.h \
prpl.h \
request.h \
roomlist.h \
savedstatuses.h \
server.h \
signals.h \
smiley.h \
dnsquery.h \
dnssrv.h \
status.h \
stringref.h \
stun.h \
sound.h \
sound-theme.h \
sound-theme-loader.h \
sslconn.h \
theme.h \
theme-loader.h \
theme-manager.h \
upnp.h \
util.h \
value.h \
xmlnode.h \
whiteboard.h
purple_mediaheaders = \
backend-iface.h \
candidate.h \
codec.h \
enum-types.h
purple_builtheaders = purple.h version.h marshallers.h
marshallers.h: marshallers.list
$(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=purple_smarshal $(srcdir)/marshallers.list --header > marshallers.h
marshallers.c: marshallers.list marshallers.h
$(AM_V_GEN)echo "#include \"marshallers.h\"" > marshallers.c
$(AM_V_at)$(GLIB_GENMARSHAL) --prefix=purple_smarshal $(srcdir)/marshallers.list --body >> marshallers.c
if ENABLE_DBUS
CLEANFILES = \
dbus-bindings.c \
dbus-client-binding.c \
dbus-client-binding.h \
dbus-signals.c \
dbus-types.c \
dbus-types.h \
marshallers.c \
marshallers.h \
purple-client-bindings.c \
purple-client-bindings.h \
purple.service
# purple dbus server
dbus_sources = dbus-server.c dbus-useful.c
dbus_headers = dbus-bindings.h dbus-purple.h dbus-server.h dbus-useful.h dbus-define-api.h dbus-types.h
dbus_exported = dbus-useful.h dbus-define-api.h account.h blist.h buddyicon.h \
connection.h conversation.h core.h ft.h log.h notify.h prefs.h roomlist.h \
savedstatuses.h smiley.h status.h server.h util.h xmlnode.h prpl.h
purple_build_coreheaders = $(addprefix $(srcdir)/, $(purple_coreheaders)) \
$(addprefix $(srcdir)/media/, $(purple_mediaheaders)) \
$(purple_builtheaders)
dbus_build_exported = $(addprefix $(srcdir)/, $(dbus_exported))
# We should probably make this better
dbus_signals = $(addprefix $(srcdir)/, $(purple_coresources)) \
$(srcdir)/protocols/irc/irc.c \
$(srcdir)/protocols/jabber/libxmpp.c
dbus-types.c: dbus-analyze-types.py $(purple_build_coreheaders)
$(AM_V_GEN)cat $(purple_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --pattern=PURPLE_DBUS_DEFINE_TYPE\(%s\) > $@
dbus-types.h: dbus-analyze-types.py $(purple_build_coreheaders)
$(AM_V_GEN)cat $(purple_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --pattern=PURPLE_DBUS_DECLARE_TYPE\(%s\) > $@
dbus-bindings.c: dbus-analyze-functions.py $(dbus_exported)
$(AM_V_GEN)cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py > $@
dbus-signals.c: dbus-analyze-signals.py $(dbus_signals)
$(AM_V_GEN)cat $(dbus_signals) | $(PYTHON) $(srcdir)/dbus-analyze-signals.py > $@
dbus-server.$(OBJEXT): dbus-bindings.c dbus-signals.c dbus-types.c dbus-types.h
dbus-server.lo: dbus-bindings.c dbus-signals.c dbus-types.c dbus-types.h
$(libpurple_la_OBJECTS): dbus-types.h
# libpurple-client
libpurple_client_lib = libpurple-client.la
libpurple_client_la_SOURCES = purple-client.c purple-client.h
libpurple_client_la_LDFLAGS = -version-info $(PURPLE_LT_VERSION_INFO) -no-undefined
libpurple_client_la_LIBADD = $(DBUS_LIBS)
purple-client-bindings.c: dbus-analyze-functions.py $(dbus_exported)
$(AM_V_GEN)cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client > $@
purple-client-bindings.h: dbus-analyze-types.py dbus-analyze-functions.py $(purple_coreheaders) $(addprefix media/, $(purple_mediaheaders)) $(purple_builtheaders) $(dbus_exported)
$(AM_V_GEN)cat $(purple_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --keyword=enum --verbatim > $@
$(AM_V_at)cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client --headers >> $@
$(libpurple_client_la_OBJECTS): purple-client-bindings.h purple-client-bindings.c
# purple-client-example
purple_client_example_SOURCES = purple-client-example.c
purple_client_example_DEPENDENCIES = libpurple-client.la
purple_client_example_LDADD = \
libpurple-client.la \
$(GLIB_LIBS) \
$(DBUS_LIBS)
bin_PROGRAMS = purple-client-example
purple-client-example.$(OBJEXT): purple-client-bindings.h
# scripts
bin_SCRIPTS = purple-remote purple-send purple-send-async purple-url-handler
BUILT_SOURCES = $(purple_builtheaders) \
$(purple_builtsources) \
dbus-bindings.c \
dbus-signals.c \
dbus-types.c \
dbus-types.h \
purple-client-bindings.c \
purple-client-bindings.h
else
BUILT_SOURCES = $(purple_builtheaders) $(purple_builtsources)
endif
lib_LTLIBRARIES = libpurple.la $(libpurple_client_lib)
libpurple_la_SOURCES = \
$(purple_coresources) \
$(purple_builtsources) \
$(dbus_sources)
noinst_HEADERS= \
internal.h \
media/backend-fs2.h \
valgrind.h
libpurpleincludedir=$(includedir)/libpurple
libpurpleinclude_HEADERS = \
$(purple_coreheaders) \
$(purple_builtheaders) \
$(dbus_headers)
mediaincludedir=$(includedir)/libpurple/media
mediainclude_HEADERS = \
$(addprefix $(srcdir)/media/, $(purple_mediaheaders))
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = data/purple.pc
libpurple_la_DEPENDENCIES = $(STATIC_LINK_LIBS)
libpurple_la_LDFLAGS = -export-dynamic -version-info $(PURPLE_LT_VERSION_INFO) -no-undefined
libpurple_la_LIBADD = \
$(STATIC_LINK_LIBS) \
$(DBUS_LIBS) \
$(GLIB_LIBS) \
$(LIBXML_LIBS) \
$(NETWORKMANAGER_LIBS) \
$(INTLLIBS) \
$(FARSTREAM_LIBS) \
$(GSTREAMER_LIBS) \
$(GSTVIDEO_LIBS) \
$(GSTAPP_LIBS) \
$(GSTINTERFACES_LIBS) \
$(IDN_LIBS) \
ciphers/libpurple-ciphers.la \
-lm
AM_CPPFLAGS = \
-DDATADIR=\"$(datadir)\" \
-DLIBDIR=\"$(libdir)/purple-$(PURPLE_MAJOR_VERSION)/\" \
-DLOCALEDIR=\"$(datadir)/locale\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
$(GLIB_CFLAGS) \
$(DEBUG_CFLAGS) \
$(DBUS_CFLAGS) \
$(LIBXML_CFLAGS) \
$(FARSTREAM_CFLAGS) \
$(GSTREAMER_CFLAGS) \
$(GSTVIDEO_CFLAGS) \
$(GSTAPP_CFLAGS) \
$(GSTINTERFACES_CFLAGS) \
$(IDN_CFLAGS) \
$(NETWORKMANAGER_CFLAGS)
# INSTALL_SSL_CERTIFICATES is true when SSL_CERTIFICATES_DIR is empty.
# We want to use SSL_CERTIFICATES_DIR when it's not empty.
if ! INSTALL_SSL_CERTIFICATES
AM_CPPFLAGS += -DSSL_CERTIFICATES_DIR=\"$(SSL_CERTIFICATES_DIR)\"
endif