pidgin/pidgin

Fix the gevolution plugin.
release-2.x.y
2021-04-09, Gary Kramlich
a2a16969a8fa
Fix the gevolution plugin.

This pulls the patches from PIDGIN-15353 (Ed Catmur) and
https://bugs.gentoo.org/526644 (Lars Wendler) to fix everything.

Testing Done:
Loaded the plugin and verified that configuration worked. I don't have any good accounts to actually sync with evolution so I didn't try that part but gentoo has been carrying the patch from PIDGIN-15353 for very long time.

Bugs closed: PIDGIN-15353

Reviewed at https://reviews.imfreedom.org/r/610/
/* This file contains macros that wrap calls to the purple dbus module.
These macros call the appropriate functions if the build includes
dbus support and do nothing otherwise. See "dbus-server.h" for
documentation. */
#ifndef _PURPLE_DBUS_MAYBE_H_
#define _PURPLE_DBUS_MAYBE_H_
#ifdef HAVE_DBUS
#ifndef DBUS_API_SUBJECT_TO_CHANGE
#define DBUS_API_SUBJECT_TO_CHANGE
#endif
#include "dbus-server.h"
/* this provides a type check */
#define PURPLE_DBUS_REGISTER_POINTER(ptr, type) { \
type *typed_ptr = ptr; \
purple_dbus_register_pointer(typed_ptr, PURPLE_DBUS_TYPE(type)); \
}
#define PURPLE_DBUS_UNREGISTER_POINTER(ptr) purple_dbus_unregister_pointer(ptr)
#else /* !HAVE_DBUS */
#define PURPLE_DBUS_REGISTER_POINTER(ptr, type) { \
if (ptr) {} \
}
#define PURPLE_DBUS_UNREGISTER_POINTER(ptr)
#define DBUS_EXPORT
#endif /* HAVE_DBUS */
#endif