/pidgin/main: 5ebc548740cc: Fix rest of _get_instance_private er...
Tomasz Wasilczyk <[email protected]>
| Newsgroups | gmane.comp.gnome.gaim.cvs |
|---|---|
| Message-ID | <[email protected]> |
Changeset: 5ebc548740ccfa6545042a26ae6aa89deaf87598 Author: Tomasz Wasilczyk <[email protected]> Date: 2014-12-09 10:24 +0100 Branch: default URL: https://hg.pidgin.im/pidgin/main/rev/5ebc548740cc Description: Fix rest of _get_instance_private errors for glib < 2.37.3 diffstat: libpurple/media/backend-fs2.c | 2 ++ libpurple/media/codec.c | 2 ++ libpurple/mediamanager.c | 2 ++ 3 files changed, 6 insertions(+), 0 deletions(-) diffs (42 lines): diff --git a/libpurple/media/backend-fs2.c b/libpurple/media/backend-fs2.c --- a/libpurple/media/backend-fs2.c +++ b/libpurple/media/backend-fs2.c @@ -175,8 +175,10 @@ enum { static void purple_media_backend_fs2_init(PurpleMediaBackendFs2 *self) { +#if GLIB_CHECK_VERSION(2, 37, 3) /* silence a warning */ (void)purple_media_backend_fs2_get_instance_private; +#endif } static FsCandidateType diff --git a/libpurple/media/codec.c b/libpurple/media/codec.c --- a/libpurple/media/codec.c +++ b/libpurple/media/codec.c @@ -75,8 +75,10 @@ purple_media_codec_init(PurpleMediaCodec priv->encoding_name = NULL; priv->optional_params = NULL; +#if GLIB_CHECK_VERSION(2, 37, 3) /* silence a warning */ (void)purple_media_codec_get_instance_private; +#endif } static void diff --git a/libpurple/mediamanager.c b/libpurple/mediamanager.c --- a/libpurple/mediamanager.c +++ b/libpurple/mediamanager.c @@ -1258,8 +1258,10 @@ purple_media_element_info_get_id(PurpleM #ifdef USE_VV gchar *id; +#if GLIB_CHECK_VERSION(2, 37, 3) /* Silence a warning. This could be anywhere below G_DEFINE_TYPE */ (void)purple_media_element_info_get_instance_private; +#endif g_return_val_if_fail(PURPLE_IS_MEDIA_ELEMENT_INFO(info), NULL); g_object_get(info, "id", &id, NULL);