Re: [PATCH] gconf-helper: change to glib 2.31 compatibility. Make use of the glib compatibility layer of Network Manager.



On Wed, 2011-11-02 at 00:12 +0100, Dominique Leuenberger wrote:
> ---
>  src/gconf-helpers/gconf-helpers.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/src/gconf-helpers/gconf-helpers.c b/src/gconf-helpers/gconf-helpers.c
> index 2327c62..fe6bb29 100644
> --- a/src/gconf-helpers/gconf-helpers.c
> +++ b/src/gconf-helpers/gconf-helpers.c
> @@ -50,6 +50,7 @@
>  #include <nm-setting-ppp.h>
>  #include <nm-setting-pppoe.h>
>  #include <nm-utils.h>
> +#include <nm-glib-compat.h>
>  
>  #include "gconf-helpers.h"
>  #include "gconf-upgrade.h"
> @@ -2664,7 +2665,7 @@ copy_one_setting_value_to_gconf (NMSetting *setting,
>  	} else if (type == G_TYPE_CHAR) {
>  		nm_gconf_set_int_helper (info->client, info->dir,
>  							key, setting_name,
> -							g_value_get_char (value));
> +							g_value_get_schar (value));
>  	} else if (type == DBUS_TYPE_G_UCHAR_ARRAY) {
>  		GByteArray *ba_val = (GByteArray *) g_value_get_boxed (value);
>  

Could we just copy & paste the bits from NM that did this?  Thanks.

Dan



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]