pidgin/pidgin

Revert RR 903

2021-09-02, Gary Kramlich
f108e108784e
Parents bdfe2c1acf5d
Children 4be2eda9548a
Revert RR 903

Also make sure that internal.h is included before glib so that
GLIB_VERSION_MIN_REQUIRED will actually work.

Testing Done:
Compiled and verified the deprecation warnings didn't show up.

Reviewed at https://reviews.imfreedom.org/r/909/
1 files changed, 4 insertions(+), 3 deletions(-)
  • +4 -3
    libpurple/util.c
    • --- a/libpurple/util.c Thu Sep 02 21:12:54 2021 -0500
    +++ b/libpurple/util.c Thu Sep 02 21:22:55 2021 -0500
    @@ -17,9 +17,10 @@
    * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    */
    +#include "internal.h"
    +
    #include <glib/gi18n-lib.h>
    -#include "internal.h"
    #include "purpleprivate.h"
    #include "core.h"
    @@ -409,11 +410,11 @@
    if (str != end) {
    /* Trim anything trailing a purely numeric time zone. */
    gchar *tzstr = g_strndup(str, end - str);
    - tz = g_time_zone_new_identifier(tzstr);
    + tz = g_time_zone_new(tzstr);
    g_free(tzstr);
    } else {
    /* Just try whatever is there. */
    - tz = g_time_zone_new_identifier(str);
    + tz = g_time_zone_new(str);
    }
    }
    }