/pidgin/main: 04f9d68806c2: VV: use G_GNUC_BEGIN_IGNORE_DEPRECAT...

[Tomasz Wasilczyk]

Changeset: 04f9d68806c29346df0481ac3d761d7ec5283fe3
Author:	 Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date:	 2013-06-07 17:45 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/04f9d68806c2

Description:

VV: use G_GNUC_BEGIN_IGNORE_DEPRECATIONS for ignoring warnings related with external APIs

diffstat:

 libpurple/protocols/jabber/jingle/jingle.c |   6 ++++++
 pidgin/gtkprefs.c                          |  10 ++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diffs (66 lines):

diff --git a/libpurple/protocols/jabber/jingle/jingle.c b/libpurple/protocols/jabber/jingle/jingle.c
--- a/libpurple/protocols/jabber/jingle/jingle.c
+++ b/libpurple/protocols/jabber/jingle/jingle.c
@@ -460,7 +460,9 @@ jingle_create_relay_info(const gchar *ip
 		memset(&value, 0, sizeof(GValue));
 		g_value_init(&value, GST_TYPE_STRUCTURE);
 		gst_value_set_structure(&value, turn_setup);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 		relay_info = g_value_array_append(relay_info, &value);
+G_GNUC_END_IGNORE_DEPRECATIONS
 		gst_structure_free(turn_setup);
 	}
 	return relay_info;
@@ -500,7 +502,9 @@ jingle_get_params(JabberStream *js, cons
 		}
 
 		if (relay_ip) {
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 			GValueArray *relay_info = g_value_array_new(0);
+G_GNUC_END_IGNORE_DEPRECATIONS
 
 			if (relay_udp) {
 				relay_info =
@@ -518,9 +522,11 @@ jingle_get_params(JabberStream *js, cons
 						relay_password, "tls", relay_info);
 			}
 			params[next_index].name = "relay-info";
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 			g_value_init(&params[next_index].value, G_TYPE_VALUE_ARRAY);
 			g_value_set_boxed(&params[next_index].value, relay_info);
 			g_value_array_free(relay_info);
+G_GNUC_END_IGNORE_DEPRECATIONS
 		}
 	}
 
diff --git a/pidgin/gtkprefs.c b/pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c
+++ b/pidgin/gtkprefs.c
@@ -3198,11 +3198,10 @@ get_vv_element_devices(const gchar *elem
 		const gchar *name;
 		const gchar *device_name;
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 		/* GValueArray is in gstreamer-0.10 API */
 		device = g_value_array_get_nth(array, i);
-#pragma GCC diagnostic pop
+G_GNUC_END_IGNORE_DEPRECATIONS
 
 		if (probe_attr == PROBE_DEVICE) {
 			g_object_set_property(G_OBJECT(element), "device",
@@ -3231,11 +3230,10 @@ get_vv_element_devices(const gchar *elem
 		ret = g_list_prepend(ret, (gpointer)device_name);
 		gst_element_set_state(element, GST_STATE_NULL);
 	}
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 	/* GValueArray is in gstreamer-0.10 API */
 	g_value_array_free(array);
-#pragma GCC diagnostic pop
+G_GNUC_END_IGNORE_DEPRECATIONS
 #endif
 
 	gst_object_unref(element);