diff options
| author | Gary Kramlich <grim@reaperworld.com> | 2016-06-19 00:16:07 -0500 |
|---|---|---|
| committer | Gary Kramlich <grim@reaperworld.com> | 2016-06-19 00:16:07 -0500 |
| commit | b8b58304e8b9a2c4aa213595eb3559a19a46540e (patch) | |
| tree | 77e2763906279cbd820d6b8d8118d05079ab4ca8 | |
| parent | f944f790b7e0143958060e552c4ddb4326635888 (diff) | |
| parent | 4e6013f8d42d86334a04603a8e12e469fd23555f (diff) | |
| download | pidgin-b8b58304e8b9a2c4aa213595eb3559a19a46540e.tar.gz | |
Pull in the last changes from the public repo
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | libpurple/media/backend-fs2.c | 4 | ||||
| -rw-r--r-- | libpurple/protocols/oscar/oscar.c | 10 |
3 files changed, 11 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index d79edfaefc..b20406fd36 100644 --- 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 index 40a289bdee..dbb0818e1b 100644 --- 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 index acfaa28dd2..f41871b55c 100644 --- a/libpurple/protocols/oscar/oscar.c +++ b/libpurple/protocols/oscar/oscar.c @@ -5784,9 +5784,9 @@ void oscar_init(PurplePlugin *plugin, gboolean is_icq) 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, gboolean is_icq) 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[] = { |