/pidgin/main: 317a20508a49: Pull in the last changes from the pu...

[Gary Kramlich]

Changeset: 317a20508a49030d9a1c87bd8884290a756c7df1
Author:	 Gary Kramlich <grim at reaperworld.com>
Date:	 2016-06-19 00:16 -0500
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/317a20508a49

Description:

Pull in the last changes from the public repo

diffstat:

 configure.ac                      |   4 ++--
 libpurple/media/backend-fs2.c     |   4 ++++
 libpurple/protocols/oscar/oscar.c |  10 +++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

diffs (62 lines):

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -47,7 +47,7 @@ m4_define([purple_lt_current], [11])
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [11])
 m4_define([purple_micro_version], [0])
-m4_define([purple_version_suffix], [devel])
+m4_define([purple_version_suffix], [])
 m4_define([purple_version],
           [purple_major_version.purple_minor_version.purple_micro_version])
 m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix]))
@@ -56,7 +56,7 @@ m4_define([gnt_lt_current], [8])
 m4_define([gnt_major_version], [2])
 m4_define([gnt_minor_version], [8])
 m4_define([gnt_micro_version], [10])
-m4_define([gnt_version_suffix], [devel])
+m4_define([gnt_version_suffix], [])
 m4_define([gnt_version],
           [gnt_major_version.gnt_minor_version.gnt_micro_version])
 m4_define([gnt_display_version], gnt_version[]m4_ifdef([gnt_version_suffix],[gnt_version_suffix]))
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
@@ -44,6 +44,10 @@
 #include <gst/gststructure.h>
 #endif
 
+#if !GST_CHECK_VERSION(1,0,0)
+#define gst_registry_get() gst_registry_get_default()
+#endif
+
 /** @copydoc _PurpleMediaBackendFs2Class */
 typedef struct _PurpleMediaBackendFs2Class PurpleMediaBackendFs2Class;
 /** @copydoc _PurpleMediaBackendFs2Private */
diff --git a/libpurple/protocols/oscar/oscar.c b/libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c
+++ b/libpurple/protocols/oscar/oscar.c
@@ -5784,9 +5784,9 @@ void oscar_init(PurplePlugin *plugin, gb
 		NULL
 	};
 	static const gchar *aim_login_keys[] = {
-		N_("Use clientLogin authentication"),
-		N_("Use Kerberos-based authentication"),
-		N_("Use MD5 based authentication"),
+		N_("clientLogin"),
+		N_("Kerberos"),
+		N_("MD5-based"),
 		NULL
 	};
 	static const gchar *aim_login_values[] = {
@@ -5796,8 +5796,8 @@ void oscar_init(PurplePlugin *plugin, gb
 		NULL
 	};
 	static const gchar *icq_login_keys[] = {
-		N_("Use clientLogin authentication"),
-		N_("Use MD5 based authentication"),
+		N_("clientLogin"),
+		N_("MD5-based"),
 		NULL
 	};
 	static const gchar *icq_login_values[] = {