pidgin/pidgin

Pull in the last changes from the public repo
release-2.x.y
2016-06-19, Gary Kramlich
317a20508a49
Parents d5f8a33997822c04b241e1c6
Children 0b7591cc7360
Pull in the last changes from the public repo
3 files changed, 11 insertions(+), 7 deletions(-)
  • +2 -2
    configure.ac
  • +4 -0
    libpurple/media/backend-fs2.c
  • +5 -5
    libpurple/protocols/oscar/oscar.c
    • --- a/configure.ac Sat Jun 18 21:11:40 2016 -0500
    +++ b/configure.ac Sun Jun 19 00:16:07 2016 -0500
    @@ -47,7 +47,7 @@
    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_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]))
    --- a/libpurple/media/backend-fs2.c Sat Jun 18 21:11:40 2016 -0500
    +++ b/libpurple/media/backend-fs2.c Sun Jun 19 00:16:07 2016 -0500
    @@ -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 */
    --- a/libpurple/protocols/oscar/oscar.c Sat Jun 18 21:11:40 2016 -0500
    +++ b/libpurple/protocols/oscar/oscar.c Sun Jun 19 00:16:07 2016 -0500
    @@ -5784,9 +5784,9 @@
    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 @@
    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[] = {