Mercurial > pidgin3 / changeset

changeset

Merged in default (pull request #459)

Sat, 15 Dec 2018 06:25:41 +0000

author
Gary Kramlich <grim@reaperworld.com>
date
Sat, 15 Dec 2018 06:25:41 +0000
changeset 39387
4fe9f1a002fc
parent 39384
8b6af13014bc (diff)
parent 39386
3fd7e834749f (current diff)
child 39390
1771d5ac3aab

Merged in default (pull request #459)

Fix GIR warnings for proxy.h and sslconn.h

Approved-by: Gary Kramlich
Approved-by: Eion Robb

--- a/libpurple/protocols/oscar/oscar.h	Fri Dec 14 19:30:50 2018 -0600
+++ b/libpurple/protocols/oscar/oscar.h	Sat Dec 15 06:25:41 2018 +0000
@@ -75,9 +75,7 @@
 
 #include "snactypes.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
 #define FAIM_SNAC_HASH_SIZE 16
 
@@ -1375,8 +1373,6 @@
 
 void oscar_init_account_options(PurpleProtocol *protocol, gboolean is_icq);
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* _OSCAR_H_ */
--- a/libpurple/signals.h	Fri Dec 14 19:30:50 2018 -0600
+++ b/libpurple/signals.h	Sat Dec 15 06:25:41 2018 +0000
@@ -316,88 +316,522 @@
 /* Marshal Functions                                                      */
 /**************************************************************************/
 
+/**
+ * purple_marshal_VOID:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with no arguments.
+ */
 void purple_marshal_VOID(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_VOID__INT:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with a single integer
+ * argument.
+ */
 void purple_marshal_VOID__INT(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_VOID__INT_INT:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with two integer
+ * arguments.
+ */
 void purple_marshal_VOID__INT_INT(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_VOID__POINTER:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with a single pointer
+ * argument.
+ */
 void purple_marshal_VOID__POINTER(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_VOID__POINTER_UINT:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with a pointer and
+ * an unsigned integer argument.
+ */
 void purple_marshal_VOID__POINTER_UINT(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_VOID__POINTER_INT_INT:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with a pointer and
+ * two integer arguments.
+ */
 void purple_marshal_VOID__POINTER_INT_INT(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_VOID__POINTER_INT_POINTER:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with a pointer, an
+ * integer, and then another pointer argument.
+ */
 void purple_marshal_VOID__POINTER_INT_POINTER(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_VOID__POINTER_POINTER:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with two pointer
+ * arguments.
+ */
 void purple_marshal_VOID__POINTER_POINTER(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_VOID__POINTER_POINTER_UINT:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with two pointers
+ * and an unsigned integer argument.
+ */
 void purple_marshal_VOID__POINTER_POINTER_UINT(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_VOID__POINTER_POINTER_UINT_UINT:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with two pointers
+ * and two unsigned integer arguments.
+ */
 void purple_marshal_VOID__POINTER_POINTER_UINT_UINT(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_VOID__POINTER_UINT_UINT:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with a pointer and
+ * two unsigned integer arguments.
+ */
 void purple_marshal_VOID__POINTER_UINT_UINT(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_VOID__POINTER_POINTER_POINTER:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with three pointer
+ * arguments.
+ */
 void purple_marshal_VOID__POINTER_POINTER_POINTER(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_VOID__POINTER_POINTER_POINTER_POINTER:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with four pointer
+ * arguments.
+ */
 void purple_marshal_VOID__POINTER_POINTER_POINTER_POINTER(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_VOID__POINTER_POINTER_POINTER_POINTER_POINTER:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with five pointer
+ * arguments.
+ */
 void purple_marshal_VOID__POINTER_POINTER_POINTER_POINTER_POINTER(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_VOID__POINTER_POINTER_POINTER_UINT:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with three pointer
+ * and one unsigned integer arguments.
+ */
 void purple_marshal_VOID__POINTER_POINTER_POINTER_UINT(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_VOID__POINTER_POINTER_POINTER_POINTER_UINT:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with four pointer and
+ * one unsigned integer arguments.
+ */
 void purple_marshal_VOID__POINTER_POINTER_POINTER_POINTER_UINT(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_VOID__POINTER_POINTER_POINTER_UINT_UINT:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with three pointer
+ * and two unsigned integer arguments.
+ */
 void purple_marshal_VOID__POINTER_POINTER_POINTER_UINT_UINT(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
 
+/**
+ * purple_marshal_INT__INT:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with an integer argument
+ * and returns an integer.
+ */
 void purple_marshal_INT__INT(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_INT__INT_INT:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with two integer
+ * arguments and returns an integer.
+ */
 void purple_marshal_INT__INT_INT(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_INT__POINTER_POINTER:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with two pointer
+ * arguments and returns an integer.
+ */
 void purple_marshal_INT__POINTER_POINTER(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_INT__POINTER_POINTER_POINTER:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with three pointer
+ * arguments and returns an integer.
+ */
 void purple_marshal_INT__POINTER_POINTER_POINTER(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_INT__POINTER_POINTER_POINTER_POINTER_POINTER:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with five pointer
+ * arguments and returns an integer.
+ */
 void purple_marshal_INT__POINTER_POINTER_POINTER_POINTER_POINTER(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
 
+/**
+ * purple_marshal_BOOLEAN__POINTER:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with a single pointer
+ * argument and returns a boolean.
+ */
 void purple_marshal_BOOLEAN__POINTER(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_BOOLEAN__POINTER_POINTER:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with two pointer
+ * arguments and returns a boolean.
+ */
 void purple_marshal_BOOLEAN__POINTER_POINTER(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_BOOLEAN__POINTER_BOOLEAN:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with a pointer and
+ * boolean argument and returns a boolean.
+ */
 void purple_marshal_BOOLEAN__POINTER_BOOLEAN(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_BOOLEAN__POINTER_POINTER_POINTER:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with three pointer
+ * arguments and returns a boolean.
+ */
 void purple_marshal_BOOLEAN__POINTER_POINTER_POINTER(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_BOOLEAN__POINTER_POINTER_UINT:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with two pointer and
+ * one unsigned integer arguments and returns a boolean.
+ */
 void purple_marshal_BOOLEAN__POINTER_POINTER_UINT(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_UINT:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with three pointer
+ * and one unsigned integer arguments and returns a boolean.
+ */
 void purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_UINT(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with four pointer
+ * arguments and returns a boolean.
+ */
 void purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with five pointer
+ * arguments and returns a boolean.
+ */
 void purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_UINT:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with four pointer
+ * and one unsigned integer arguments and returns a boolean.
+ */
 void purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_UINT(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER_POINTER:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with six pointer
+ * arguments and returns a boolean.
+ */
 void purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER_POINTER(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
 
+/**
+ * purple_marshal_BOOLEAN__INT_POINTER:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with an integer
+ * and a pointer argument and returns a boolean.
+ */
 void purple_marshal_BOOLEAN__INT_POINTER(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
 
+/**
+ * purple_marshal_POINTER__POINTER:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with a pointer
+ * argument and returns a pointer.
+ */
 void purple_marshal_POINTER__POINTER(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_POINTER__POINTER_INT:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with a pointer and
+ * an integer argument and returns a pointer.
+ */
 void purple_marshal_POINTER__POINTER_INT(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_POINTER__POINTER_INT64:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with a pointer and
+ * a 64-bit integer argument and returns a pointer.
+ */
 void purple_marshal_POINTER__POINTER_INT64(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_POINTER__POINTER_INT_BOOLEAN:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with a pointer,
+ * integer, and boolean argument and returns a pointer.
+ */
 void purple_marshal_POINTER__POINTER_INT_BOOLEAN(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_POINTER__POINTER_INT64_BOOLEAN:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with a pointer,
+ * 64-bit integer, and boolean argument and returns a pointer.
+ */
 void purple_marshal_POINTER__POINTER_INT64_BOOLEAN(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_POINTER__POINTER_POINTER_BOOLEAN:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with two pointer
+ * and one boolean arguments and returns a pointer.
+ */
 void purple_marshal_POINTER__POINTER_POINTER_BOOLEAN(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+
+/**
+ * purple_marshal_POINTER__POINTER_POINTER:
+ * @cb: (scope call): Callback this marshaller is designed to invoke
+ * @args: va_list of arguments to be passed to the closure
+ * @data: (nullable): Data to be passed to the callback
+ * @return_val: (nullable): Value to store the callback's return value
+ *
+ * A purple marshaller function for use with signals with two pointer
+ * arguments and returns a pointer.
+ */
 void purple_marshal_POINTER__POINTER_POINTER(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
 
--- a/libpurple/version.h.in	Fri Dec 14 19:30:50 2018 -0600
+++ b/libpurple/version.h.in	Sat Dec 15 06:25:41 2018 +0000
@@ -54,9 +54,7 @@
 									 ((y) < PURPLE_MINOR_VERSION || \
 									  ((y) == PURPLE_MINOR_VERSION && (z) <= PURPLE_MICRO_VERSION)))
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
 /**
  * purple_version_check:
@@ -99,9 +97,7 @@
  */
 extern const guint purple_micro_version;
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* _PURPLE_VERSION_H_ */
 
--- a/libpurple/win32/libc_interface.h	Fri Dec 14 19:30:50 2018 -0600
+++ b/libpurple/win32/libc_interface.h	Sat Dec 15 06:25:41 2018 +0000
@@ -33,9 +33,7 @@
 #include <glib.h>
 #include "glibcompat.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #ifdef _MSC_VER
 #define S_IRUSR S_IREAD
@@ -156,8 +154,6 @@
 #define localtime_r( time, resultp ) \
 wpurple_localtime_r( time, resultp )
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _LIBC_INTERFACE_H_ */
--- a/libpurple/win32/libc_internal.h	Fri Dec 14 19:30:50 2018 -0600
+++ b/libpurple/win32/libc_internal.h	Sat Dec 15 06:25:41 2018 +0000
@@ -24,10 +24,7 @@
 #define _LIBC_INTERNAL_
 #include <glib.h>
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* sys/socket.h */
 int wpurple_socket(int domain, int style, int protocol);
@@ -114,9 +111,6 @@
 int wpurple_close(int fd);
 int wpurple_gethostname(char *name, size_t size);
 
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _LIBC_INTERNAL_ */
--- a/libpurple/win32/win32dep.h	Fri Dec 14 19:30:50 2018 -0600
+++ b/libpurple/win32/win32dep.h	Sat Dec 15 06:25:41 2018 +0000
@@ -32,10 +32,7 @@
 #include "wpurpleerror.h"
 #include "libc_interface.h"
 
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /* the winapi headers don't yet have winhttp.h, so we use the struct from msdn directly */
 typedef struct {
@@ -79,9 +76,7 @@
 void wpurple_init(void);
 void wpurple_cleanup(void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _WIN32DEP_H_ */
 
--- a/pidgin/plugins/ticker/gtkticker.h	Fri Dec 14 19:30:50 2018 -0600
+++ b/pidgin/plugins/ticker/gtkticker.h	Sat Dec 15 06:25:41 2018 +0000
@@ -30,9 +30,7 @@
 
 #include "plugins.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define GTK_TYPE_TICKER            (gtk_ticker_get_type())
 #define GTK_TICKER(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_TICKER, GtkTicker))
@@ -94,9 +92,6 @@
 void       gtk_ticker_start_scroll     (GtkTicker       *ticker);
 void       gtk_ticker_stop_scroll      (GtkTicker       *ticker);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __GTK_TICKER_H__ */
--- a/pidgin/win32/untar.h	Fri Dec 14 19:30:50 2018 -0600
+++ b/pidgin/win32/untar.h	Sat Dec 15 06:25:41 2018 +0000
@@ -8,9 +8,7 @@
 #ifndef _UNTAR_H_
 #define _UNTAR_H_
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 typedef enum {
 	UNTAR_LISTING =      (1 << 0),
@@ -23,8 +21,6 @@
 
 int untar(const char *filename, const char *destdir, untar_opt options);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif

Mercurial Repository: pidgin3

mercurial