lxdream.org :: lxdream/android/deps/glib-2.26.0.diff r1239:be3121267597

filename	android/deps/glib-2.26.0.diff
changeset	1239:be3121267597
author	nkeynes
date	Sat Mar 03 15:52:59 2012 +1000 (12 years ago)
permissions	-rw-r--r--
last change	Swap between run + pause icons when pressed

view

     1 diff -ur glib-2.26.0/glib/gstrfuncs.c glib-2.26.0/glib/gstrfuncs.c

     2 --- glib-2.26.0/glib/gstrfuncs.c	2010-09-14 01:57:51.000000000 +1000

     3 +++ glib-2.26.0/glib/gstrfuncs.c	2012-02-16 17:36:27.000000000 +1000

     4 @@ -442,8 +442,12 @@

     6    fail_pos = NULL;

     8 +#ifdef __ANDROID__

     9 +  decimal_point = ".";

    10 +#else

    11    locale_data = localeconv ();

    12    decimal_point = locale_data->decimal_point;

    13 +#endif

    14    decimal_point_len = strlen (decimal_point);

    16    g_assert (decimal_point_len != 0);

    17 @@ -656,8 +660,12 @@

    19    _g_snprintf (buffer, buf_len, format, d);

    21 +#ifdef __ANDROID__

    22 +  decimal_point = ".";

    23 +#else

    24    locale_data = localeconv ();

    25    decimal_point = locale_data->decimal_point;

    26 +#endif

    27    decimal_point_len = strlen (decimal_point);

    29    g_assert (decimal_point_len != 0);

    30 diff -ur glib-2.26.0/glib/gutils.c glib-2.26.0/glib/gutils.c

    31 --- glib-2.26.0/glib/gutils.c	2010-09-14 01:57:51.000000000 +1000

    32 +++ glib-2.26.0/glib/gutils.c	2012-02-16 17:35:33.000000000 +1000

    33 @@ -1694,14 +1694,12 @@

    35      if (!pw)

    36        {

    37 -	setpwent ();

    38  	pw = getpwuid (getuid ());

    39 -	endpwent ();

    40        }

    41      if (pw)

    42        {

    43  	g_user_name = g_strdup (pw->pw_name);

    44 -

    45 +#ifndef __ANDROID__

    46  	if (pw->pw_gecos && *pw->pw_gecos != '\0')

    47  	  {

    48  	    gchar **gecos_fields;

    49 @@ -1715,7 +1713,7 @@

    50  	    g_strfreev (gecos_fields);

    51  	    g_strfreev (name_parts);

    52  	  }

    53 -

    54 +#endif

    55  	if (!g_home_dir)

    56  	  g_home_dir = g_strdup (pw->pw_dir);

    57        }