Make it so only libpurple can directly include libpurple header files.
This is part of our on going effort to make it easier to develop against libpurple as well as making our filenames not part of our api.
Make it so only libpurple can directly include libpurple header files.
Testing Done:
Just a normal compile to make sure everything builds again.
Reviewed at https://reviews.imfreedom.org/r/8/
--- a/finch/gntmedia.c Thu Jun 18 09:03:17 2020 +0000
+++ b/finch/gntmedia.c Sun Jun 21 04:16:15 2020 -0500
@@ -37,7 +37,6 @@
/* An incredibly large part of the following is from gtkmedia.c */
--- a/libpurple/account.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/account.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/accounts.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/accounts.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_ACCOUNTS_H
#define PURPLE_ACCOUNTS_H
--- a/libpurple/action.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/action.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/attention.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/attention.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_ATTENTION_H
#define PURPLE_ATTENTION_H
--- a/libpurple/blistnode.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/blistnode.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_BLIST_NODE_H
#define PURPLE_BLIST_NODE_H
--- a/libpurple/buddy.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/buddy.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/buddyicon.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/buddyicon.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_BUDDYICON_H
#define PURPLE_BUDDYICON_H
--- a/libpurple/buddylist.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/buddylist.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_BUDDY_LIST_H
#define PURPLE_BUDDY_LIST_H
@@ -43,6 +47,20 @@
+ * _purple_blist_get_localized_default_group_name: + * Returns the name of default group for previously used non-English + * localization. It's used for merging default group, in cases when roster + * contains localized name. + * Please note, prpls shouldn't save default group name depending on current + * locale. So, this function is mostly for libpurple2 compatibility. And for + * improperly written prpls. +_purple_blist_get_localized_default_group_name(void); * @node: The node that's being iterated
* @data: User supplied data.
--- a/libpurple/chat.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/chat.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/circularbuffer.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/circularbuffer.h Sun Jun 21 04:16:15 2020 -0500
@@ -17,6 +17,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_CIRCULAR_BUFFER_H
#define PURPLE_CIRCULAR_BUFFER_H
--- a/libpurple/cmds.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/cmds.h Sun Jun 21 04:16:15 2020 -0500
@@ -16,6 +16,10 @@
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/connection.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/connection.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_CONNECTION_H
#define PURPLE_CONNECTION_H
@@ -43,6 +47,12 @@
typedef struct _PurpleConnectionErrorInfo PurpleConnectionErrorInfo;
+/* This is meant to track use-after-free errors. + * TODO: it should be disabled in released code. */ +#define PURPLE_ASSERT_CONNECTION_IS_VALID(gc) \ + _purple_assert_connection_is_valid(gc, __FILE__, __LINE__) * @PURPLE_CONNECTION_FLAG_HTML: Connection sends/receives in 'HTML'
@@ -283,6 +293,13 @@
+/****************************************************************************** + * To be deleted in the future + *****************************************************************************/ +_purple_assert_connection_is_valid(PurpleConnection *gc, + const gchar *file, int line); /**************************************************************************/
/**************************************************************************/
--- a/libpurple/contact.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/contact.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/conversation.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/conversation.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_CONVERSATION_H
#define PURPLE_CONVERSATION_H
--- a/libpurple/conversations.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/conversations.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_CONVERSATIONS_H
#define PURPLE_CONVERSATIONS_H
--- a/libpurple/conversationtypes.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/conversationtypes.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_CONVERSATION_TYPES_H
#define PURPLE_CONVERSATION_TYPES_H
--- a/libpurple/core.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/core.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/countingnode.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/countingnode.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_COUNTING_NODE_H
#define PURPLE_COUNTING_NODE_H
--- a/libpurple/debug.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/debug.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/enums.h.in Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/enums.h.in Sun Jun 21 04:16:15 2020 -0500
@@ -20,6 +20,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/eventloop.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/eventloop.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_EVENTLOOP_H
#define PURPLE_EVENTLOOP_H
--- a/libpurple/glibcompat.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/glibcompat.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_GLIBCOMPAT_H
#define PURPLE_GLIBCOMPAT_H
--- a/libpurple/group.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/group.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/idle.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/idle.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/image-store.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/image-store.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_IMAGE_STORE_H
#define PURPLE_IMAGE_STORE_H
--- a/libpurple/image.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/image.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/internal.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/internal.h Sun Jun 21 04:16:15 2020 -0500
@@ -28,8 +28,8 @@
* @title: Internal definitions and includes
-#if !defined(PURPLE_COMPILATION)
-#error "internal.h included outside of libpurple"
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef GLIB_VERSION_MIN_REQUIRED
--- a/libpurple/keyring.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/keyring.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/log.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/log.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/media-gst.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/media-gst.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_MEDIA_GST_H
#define PURPLE_MEDIA_GST_H
--- a/libpurple/media.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/media.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/media/backend-fs2.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/media/backend-fs2.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_MEDIA_BACKEND_FS2_H
#define PURPLE_MEDIA_BACKEND_FS2_H
--- a/libpurple/media/backend-iface.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/media/backend-iface.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_MEDIA_BACKEND_IFACE_H
#define PURPLE_MEDIA_BACKEND_IFACE_H
--- a/libpurple/media/candidate.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/media/candidate.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_MEDIA_CANDIDATE_H
#define PURPLE_MEDIA_CANDIDATE_H
--- a/libpurple/media/codec.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/media/codec.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,8 +19,13 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_MEDIA_CODEC_H
#define PURPLE_MEDIA_CODEC_H
* @section_id: libpurple-codec
--- a/libpurple/media/enum-types.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/media/enum-types.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_MEDIA_ENUM_TYPES_H
#define PURPLE_MEDIA_ENUM_TYPES_H
--- a/libpurple/mediamanager.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/mediamanager.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_MEDIA_MANAGER_H
#define PURPLE_MEDIA_MANAGER_H
--- a/libpurple/memorypool.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/memorypool.h Sun Jun 21 04:16:15 2020 -0500
@@ -20,6 +20,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_MEMORY_POOL_H
#define PURPLE_MEMORY_POOL_H
--- a/libpurple/meson.build Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/meson.build Sun Jun 21 04:16:15 2020 -0500
@@ -316,7 +316,7 @@
gplugin_include_directories,
- extra_args : ['--quiet'])
+ extra_args : ['-DPURPLE_COMPILATION', '--quiet']) --- a/libpurple/message.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/message.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/nat-pmp.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/nat-pmp.h Sun Jun 21 04:16:15 2020 -0500
@@ -24,6 +24,10 @@
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/network.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/network.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" @@ -36,6 +40,14 @@
+ struct sockaddr_in6 in6; + struct sockaddr_storage storage; /**************************************************************************/
@@ -324,6 +336,16 @@
void purple_network_remove_port_mapping(gint fd);
+ * Sets most commonly used socket flags: O_NONBLOCK and FD_CLOEXEC. + * @param fd The file descriptor for the socket. + * @return TRUE if succeeded, FALSE otherwise. +_purple_network_set_common_socket_flags(int fd); * Initializes the network subsystem.
--- a/libpurple/notify.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/notify.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/options.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/options.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/pluginpref.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/pluginpref.h Sun Jun 21 04:16:15 2020 -0500
@@ -20,6 +20,10 @@
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_PLUGINPREF_H
#define PURPLE_PLUGINPREF_H
--- a/libpurple/plugins.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/plugins.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/pounce.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/pounce.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/prefs.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/prefs.h Sun Jun 21 04:16:15 2020 -0500
@@ -20,6 +20,10 @@
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/presence.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/presence.h Sun Jun 21 04:16:15 2020 -0500
@@ -20,6 +20,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_PRESENCE_H
#define PURPLE_PRESENCE_H
--- a/libpurple/protocol.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/protocol.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_PROTOCOL_H
#define PURPLE_PROTOCOL_H
--- a/libpurple/protocols.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/protocols.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_PROTOCOLS_H
#define PURPLE_PROTOCOLS_H
--- a/libpurple/protocols/bonjour/bonjour_ft.c Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/protocols/bonjour/bonjour_ft.c Sun Jun 21 04:16:15 2020 -0500
@@ -31,8 +31,6 @@
-#include "purpleprivate.h"
--- a/libpurple/protocols/bonjour/xmpp.c Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/protocols/bonjour/xmpp.c Sun Jun 21 04:16:15 2020 -0500
@@ -23,7 +23,6 @@
#include <glib/gi18n-lib.h>
-#include "purpleprivate.h"
--- a/libpurple/protocols/gg/avatar.c Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/protocols/gg/avatar.c Sun Jun 21 04:16:15 2020 -0500
@@ -33,8 +33,6 @@
#include "oauth/oauth-purple.h"
-#include "purpleprivate.h"
#define GGP_AVATAR_USERAGENT "GG Client build 11.0.0.7562"
--- a/libpurple/protocols/gg/edisc.c Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/protocols/gg/edisc.c Sun Jun 21 04:16:15 2020 -0500
@@ -35,7 +35,7 @@
#include <glib/gi18n-lib.h>
-#include "purpleprivate.h"
#define GGP_EDISC_OS "WINNT x86-msvc"
#define GGP_EDISC_TYPE "desktop"
--- a/libpurple/protocols/gg/gg.c Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/protocols/gg/gg.c Sun Jun 21 04:16:15 2020 -0500
@@ -29,7 +29,6 @@
#include <glib/gi18n-lib.h>
-#include "purpleprivate.h"
--- a/libpurple/protocols/gg/oauth/oauth-purple.c Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/protocols/gg/oauth/oauth-purple.c Sun Jun 21 04:16:15 2020 -0500
@@ -35,7 +35,6 @@
-#include "purpleprivate.h"
#define GGP_OAUTH_RESPONSE_MAX 10240
--- a/libpurple/protocols/gg/pubdir-prpl.c Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/protocols/gg/pubdir-prpl.c Sun Jun 21 04:16:15 2020 -0500
@@ -29,6 +29,8 @@
#include <glib/gi18n-lib.h>
@@ -37,8 +39,6 @@
-#include "purpleprivate.h"
--- a/libpurple/protocols/gg/roster.c Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/protocols/gg/roster.c Sun Jun 21 04:16:15 2020 -0500
@@ -36,8 +36,6 @@
-#include "purpleprivate.h"
#define GGP_ROSTER_SYNC_SETT "gg-synchronized"
#define GGP_ROSTER_DEBUG 0
#define GGP_ROSTER_GROUPID_DEFAULT "00000000-0000-0000-0000-000000000000"
--- a/libpurple/protocols/gg/tcpsocket.c Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/protocols/gg/tcpsocket.c Sun Jun 21 04:16:15 2020 -0500
@@ -30,7 +30,6 @@
-#include "purpleprivate.h"
--- a/libpurple/protocols/irc/dcc_send.c Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/protocols/irc/dcc_send.c Sun Jun 21 04:16:15 2020 -0500
@@ -28,7 +28,6 @@
-#include "purpleprivate.h"
--- a/libpurple/protocols/jabber/auth.c Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/protocols/jabber/auth.c Sun Jun 21 04:16:15 2020 -0500
@@ -29,9 +29,6 @@
-#include "purpleprivate.h"
static GSList *auth_mechs = NULL;
--- a/libpurple/protocols/jabber/auth_cyrus.c Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/protocols/jabber/auth_cyrus.c Sun Jun 21 04:16:15 2020 -0500
@@ -27,8 +27,6 @@
-#include "purpleprivate.h"
--- a/libpurple/protocols/jabber/buddy.c Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/protocols/jabber/buddy.c Sun Jun 21 04:16:15 2020 -0500
@@ -24,7 +24,6 @@
--- a/libpurple/protocols/jabber/iq.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/protocols/jabber/iq.h Sun Jun 21 04:16:15 2020 -0500
@@ -25,6 +25,8 @@
#ifndef PURPLE_JABBER_IQ_H
#define PURPLE_JABBER_IQ_H
@@ -34,7 +36,6 @@
typedef struct _JabberIq JabberIq;
typedef struct _JabberIqCallbackData JabberIqCallbackData;
--- a/libpurple/protocols/jabber/jabber.c Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/protocols/jabber/jabber.c Sun Jun 21 04:16:15 2020 -0500
@@ -28,7 +28,6 @@
#include <glib/gi18n-lib.h>
-#include "purpleprivate.h"
--- a/libpurple/protocols/jabber/jabber.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/protocols/jabber/jabber.h Sun Jun 21 04:16:15 2020 -0500
@@ -68,7 +68,6 @@
--- a/libpurple/protocols/jabber/jingle/transport.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/protocols/jabber/jingle/transport.h Sun Jun 21 04:16:15 2020 -0500
@@ -28,8 +28,9 @@
--- a/libpurple/protocols/jabber/presence.c Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/protocols/jabber/presence.c Sun Jun 21 04:16:15 2020 -0500
@@ -33,8 +33,6 @@
#include "adhoccommands.h"
-#include "purpleprivate.h"
--- a/libpurple/protocols/jabber/roster.c Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/protocols/jabber/roster.c Sun Jun 21 04:16:15 2020 -0500
@@ -21,7 +21,6 @@
-#include "purpleprivate.h"
--- a/libpurple/protocols/jabber/si.c Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/protocols/jabber/si.c Sun Jun 21 04:16:15 2020 -0500
@@ -33,7 +33,6 @@
#include <glib/gi18n-lib.h>
-#include "purpleprivate.h"
--- a/libpurple/protocols/jabber/si.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/protocols/jabber/si.h Sun Jun 21 04:16:15 2020 -0500
@@ -25,7 +25,7 @@
#ifndef PURPLE_JABBER_SI_H
#define PURPLE_JABBER_SI_H
--- a/libpurple/protocols/novell/nmconn.c Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/protocols/novell/nmconn.c Sun Jun 21 04:16:15 2020 -0500
@@ -31,8 +31,6 @@
#define NO_ESCAPE(ch) ((ch == 0x20) || (ch >= 0x30 && ch <= 0x39) || \
(ch >= 0x41 && ch <= 0x5a) || (ch >= 0x61 && ch <= 0x7a))
--- a/libpurple/protocols/simple/simple.c Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/protocols/simple/simple.c Sun Jun 21 04:16:15 2020 -0500
@@ -25,7 +25,6 @@
#include <glib/gi18n-lib.h>
-#include "purpleprivate.h"
--- a/libpurple/protocols/zephyr/ZAsyncLocate.c Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/protocols/zephyr/ZAsyncLocate.c Sun Jun 21 04:16:15 2020 -0500
@@ -9,7 +9,8 @@
ZRequestLocations(const char *user, ZAsyncLocateData_t *zald,
--- a/libpurple/protocols/zephyr/ZLocations.c Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/protocols/zephyr/ZLocations.c Sun Jun 21 04:16:15 2020 -0500
@@ -10,7 +10,8 @@
--- a/libpurple/protocols/zephyr/ZRetSubs.c Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/protocols/zephyr/ZRetSubs.c Sun Jun 21 04:16:15 2020 -0500
@@ -10,7 +10,8 @@
static Code_t Z_RetSubs(ZNotice_t *notice, int *nsubs, Z_AuthProc auth_routine);
--- a/libpurple/protocols/zephyr/ZVariables.c Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/protocols/zephyr/ZVariables.c Sun Jun 21 04:16:15 2020 -0500
@@ -13,7 +13,8 @@
--- a/libpurple/protocols/zephyr/zephyr.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/protocols/zephyr/zephyr.h Sun Jun 21 04:16:15 2020 -0500
@@ -25,7 +25,7 @@
#define ZEPHYR_TYPE_PROTOCOL (zephyr_protocol_get_type())
#define ZEPHYR_PROTOCOL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ZEPHYR_TYPE_PROTOCOL, ZephyrProtocol))
--- a/libpurple/proxy.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/proxy.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/purple-gio.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/purple-gio.h Sun Jun 21 04:16:15 2020 -0500
@@ -21,6 +21,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/purpleaccountoption.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/purpleaccountoption.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_ACCOUNT_OPTION_H
#define PURPLE_ACCOUNT_OPTION_H
--- a/libpurple/purpleaccountusersplit.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/purpleaccountusersplit.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_ACCOUNT_USER_SPLIT_H
#define PURPLE_ACCOUNT_USER_SPLIT_H
--- a/libpurple/purplekeyvaluepair.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/purplekeyvaluepair.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_KEY_VALUE_PAIR_H
#define PURPLE_KEY_VALUE_PAIR_H
--- a/libpurple/purpleprivate.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/purpleprivate.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" @@ -33,19 +37,6 @@
[(condition) ? 1 : -1]; static_assertion_failed_ ## message dummy; \
-/* This is meant to track use-after-free errors.
- * TODO: it should be disabled in released code. */
-#define PURPLE_ASSERT_CONNECTION_IS_VALID(gc) \
- _purple_assert_connection_is_valid(gc, __FILE__, __LINE__)
- struct sockaddr_in6 in6;
- struct sockaddr_storage storage;
@@ -187,30 +178,6 @@
int *_purple_statuses_get_primitive_scores(void);
- * _purple_blist_get_localized_default_group_name:
- * Returns the name of default group for previously used non-English
- * localization. It's used for merging default group, in case when roster
- * contains localized name.
- * Please note, prpls shouldn't save default group name depending on current
- * locale. So, this function is mostly for libpurple2 compatibility. And for
- * improperly written prpls.
-_purple_blist_get_localized_default_group_name(void);
- * Sets most commonly used socket flags: O_NONBLOCK and FD_CLOEXEC.
- * @param fd The file descriptor for the socket.
- * @return TRUE if succeeded, FALSE otherwise.
-_purple_network_set_common_socket_flags(int fd);
* A fstat alternative, like g_stat for stat.
* @param fd The file descriptor.
@@ -237,10 +204,6 @@
_purple_message_uninit(void);
-_purple_assert_connection_is_valid(PurpleConnection *gc,
- const gchar *file, int line);
* _purple_conversation_write_common:
* @conv: The conversation.
--- a/libpurple/purpleprotocolfactory.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/purpleprotocolfactory.h Sun Jun 21 04:16:15 2020 -0500
@@ -20,6 +20,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_PROTOCOL_FACTORY_H
#define PURPLE_PROTOCOL_FACTORY_H
--- a/libpurple/purpleuiinfo.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/purpleuiinfo.h Sun Jun 21 04:16:15 2020 -0500
@@ -20,6 +20,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/queuedoutputstream.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/queuedoutputstream.h Sun Jun 21 04:16:15 2020 -0500
@@ -21,6 +21,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_QUEUED_OUTPUT_STREAM_H
#define PURPLE_QUEUED_OUTPUT_STREAM_H
--- a/libpurple/request-datasheet.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/request-datasheet.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_REQUEST_DATA_H
#define PURPLE_REQUEST_DATA_H
--- a/libpurple/request.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/request.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/roomlist.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/roomlist.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_ROOMLIST_H
#define PURPLE_ROOMLIST_H
--- a/libpurple/savedstatuses.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/savedstatuses.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_SAVEDSTATUSES_H
#define PURPLE_SAVEDSTATUSES_H
--- a/libpurple/server.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/server.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/signals.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/signals.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/smiley-custom.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/smiley-custom.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_SMILEY_CUSTOM_H
#define PURPLE_SMILEY_CUSTOM_H
--- a/libpurple/smiley-list.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/smiley-list.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_SMILEY_LIST_H
#define PURPLE_SMILEY_LIST_H
--- a/libpurple/smiley-parser.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/smiley-parser.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_SMILEY_PARSER_H
#define PURPLE_SMILEY_PARSER_H
--- a/libpurple/smiley-theme.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/smiley-theme.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_SMILEY_THEME_H
#define PURPLE_SMILEY_THEME_H
--- a/libpurple/smiley.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/smiley.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/sound-theme-loader.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/sound-theme-loader.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_SOUND_THEME_LOADER_H
#define PURPLE_SOUND_THEME_LOADER_H
--- a/libpurple/sound-theme.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/sound-theme.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_SOUND_THEME_H
#define PURPLE_SOUND_THEME_H
--- a/libpurple/sound.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/sound.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/status.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/status.h Sun Jun 21 04:16:15 2020 -0500
@@ -20,6 +20,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/stun.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/stun.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/theme-loader.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/theme-loader.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_THEME_LOADER_H
#define PURPLE_THEME_LOADER_H
--- a/libpurple/theme-manager.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/theme-manager.h Sun Jun 21 04:16:15 2020 -0500
@@ -20,6 +20,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_THEME_MANAGER_H
#define PURPLE_THEME_MANAGER_H
--- a/libpurple/theme.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/theme.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/trie.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/trie.h Sun Jun 21 04:16:15 2020 -0500
@@ -20,6 +20,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/upnp.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/upnp.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/util.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/util.h Sun Jun 21 04:16:15 2020 -0500
@@ -22,6 +22,10 @@
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/version.h.in Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/version.h.in Sun Jun 21 04:16:15 2020 -0500
@@ -20,6 +20,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/whiteboard.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/whiteboard.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" #ifndef PURPLE_WHITEBOARD_H
#define PURPLE_WHITEBOARD_H
--- a/libpurple/xfer.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/xfer.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/libpurple/xmlnode.h Thu Jun 18 09:03:17 2020 +0000
+++ b/libpurple/xmlnode.h Sun Jun 21 04:16:15 2020 -0500
@@ -19,6 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
+#if !defined(PURPLE_GLOBAL_HEADER_INSIDE) && !defined(PURPLE_COMPILATION) +# error "only <purple.h> may be included directly" --- a/pidgin/gtkmedia.c Thu Jun 18 09:03:17 2020 +0000
+++ b/pidgin/gtkmedia.c Sun Jun 21 04:16:15 2020 -0500
@@ -33,7 +33,6 @@
#ifdef GDK_WINDOWING_WIN32
#include <gdk/gdkwin32.h>
--- a/pidgin/gtkprefs.c Thu Jun 18 09:03:17 2020 +0000
+++ b/pidgin/gtkprefs.c Sun Jun 21 04:16:15 2020 -0500
@@ -48,7 +48,6 @@
#include <gst/video/videooverlay.h>
#ifdef GDK_WINDOWING_WIN32
#include <gdk/gdkwin32.h>
--- a/pidgin/gtksmiley-theme.h Thu Jun 18 09:03:17 2020 +0000
+++ b/pidgin/gtksmiley-theme.h Sun Jun 21 04:16:15 2020 -0500
@@ -36,8 +36,6 @@
-#include "smiley-theme.h"
#define PIDGIN_TYPE_SMILEY_THEME pidgin_smiley_theme_get_type()
--- a/pidgin/gtkutils.c Thu Jun 18 09:03:17 2020 +0000
+++ b/pidgin/gtkutils.c Sun Jun 21 04:16:15 2020 -0500
@@ -28,7 +28,8 @@
#include <glib/gi18n-lib.h>
-#include "glibcompat.h" /* for purple_g_stat on win32 */
--- a/pidgin/gtkxfer.c Thu Jun 18 09:03:17 2020 +0000
+++ b/pidgin/gtkxfer.c Sun Jun 21 04:16:15 2020 -0500
@@ -26,7 +26,6 @@
--- a/pidgin/pidginaccountchooser.h Thu Jun 18 09:03:17 2020 +0000
+++ b/pidgin/pidginaccountchooser.h Sun Jun 21 04:16:15 2020 -0500
@@ -30,9 +30,9 @@
--- a/pidgin/pidginstock.c Thu Jun 18 09:03:17 2020 +0000
+++ b/pidgin/pidginstock.c Sun Jun 21 04:16:15 2020 -0500
@@ -30,7 +30,6 @@
#include "gtkicon-theme-loader.h"
-#include "theme-manager.h"