UTF8 to UTF-8 name patch for obexd

UTF8 to UTF-8 name patch for obexd

[Neal Peacock]

[-- Attachment #1: Type: text/plain, Size: 531 bytes --]

My first post here so I hope I am doing this the right way.

This is a short patch for obexd to change the charset name passed into 
glib from UTF8 to UTF-8, which I think is the proper name.  I was 
working on an embedded system that didn't have the aliases setup to 
convert the names like typical desktops.  I was pulling my hair out 
trying to figure out how to add the charsets in glib until I realized I 
could just change the name in obexd and UTF-8 seems to be universally 
included unlike UTF8.

Thanks.

--
Neal Peacock


[-- Attachment #2: fix-UTFName.patch --]
[-- Type: text/plain, Size: 751 bytes --]

>From abe899bbdeac414610970cdcad31dc2d02463085 Mon Sep 17 00:00:00 2001
From: Neal Peacock <neal@coinfree.com>
Date: Fri, 29 Jun 2012 18:15:57 -0400
Subject: [PATCH] Changed UTF name to standard

---
 gobex/gobex-header.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gobex/gobex-header.c b/gobex/gobex-header.c
index 77dcc6e..56dd9b2 100644
--- a/gobex/gobex-header.c
+++ b/gobex/gobex-header.c
@@ -187,7 +187,7 @@ GObexHeader *g_obex_header_decode(const void *data, gsize len,
 		}
 
 		header->v.string = g_convert((const char *) ptr, hdr_len - 5,
-						"UTF8", "UTF16BE",
+						"UTF-8", "UTF-16BE",
 						NULL, &str_len, &conv_err);
 		if (header->v.string == NULL) {
 			g_set_error(err, G_OBEX_ERROR,
-- 
1.7.2.5

Re: UTF8 to UTF-8 name patch for obexd

[Johan Hedberg]

Hi Neal,

On Fri, Jun 29, 2012, Neal Peacock wrote:
> Subject: [PATCH] Changed UTF name to standard
> 
> ---
>  gobex/gobex-header.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/gobex/gobex-header.c b/gobex/gobex-header.c
> index 77dcc6e..56dd9b2 100644
> --- a/gobex/gobex-header.c
> +++ b/gobex/gobex-header.c
> @@ -187,7 +187,7 @@ GObexHeader *g_obex_header_decode(const void *data, gsize len,
>  		}
>  
>  		header->v.string = g_convert((const char *) ptr, hdr_len - 5,
> -						"UTF8", "UTF16BE",
> +						"UTF-8", "UTF-16BE",
>  						NULL, &str_len, &conv_err);
>  		if (header->v.string == NULL) {
>  			g_set_error(err, G_OBEX_ERROR,

The patch looks good and has been applied to obexd.git. Thanks.

Johan