diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2012-02-17 20:09:12 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-03-16 14:28:13 +0100 |
| commit | a0583a46873197e07573befeb1c6df041eb2cef8 (patch) | |
| tree | bccd21ee162e56019edebac15f64b4ca7501bb08 | |
| parent | 3595b33648ce6aa78586c820c179c78b84687cf1 (diff) | |
broadband-modem: expose the current charset to UTF-8 converter
So that subclasses can also use it.
| -rw-r--r-- | src/mm-broadband-modem.c | 23 | ||||
| -rw-r--r-- | src/mm-broadband-modem.h | 6 |
2 files changed, 25 insertions, 4 deletions
diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c index 4ad3c570..8cca4a51 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -4167,8 +4167,9 @@ sms_text_part_list_ready (MMBroadbandModem *self, mm_dbg ("Failed to get message sender number"); goto next; } - number = mm_charset_take_and_convert_to_utf8 (number, - self->priv->modem_current_charset); + + number = mm_broadband_modem_take_and_convert_to_utf8 (MM_BROADBAND_MODEM (self), + number); /* Get part state */ stat = get_match_string_unquoted (match_info, 2); @@ -4182,8 +4183,8 @@ sms_text_part_list_ready (MMBroadbandModem *self, timestamp = get_match_string_unquoted (match_info, 5); /* Get and parse text */ - text = mm_charset_take_and_convert_to_utf8 (g_match_info_fetch (match_info, 6), - self->priv->modem_current_charset); + text = mm_broadband_modem_take_and_convert_to_utf8 (MM_BROADBAND_MODEM (self), + g_match_info_fetch (match_info, 6)); /* The raw SMS data can only be GSM, UCS2, or unknown (8-bit), so we * need to convert to UCS2 here. @@ -6400,6 +6401,20 @@ initialize (MMBaseModem *self, /*****************************************************************************/ +gchar * +mm_broadband_modem_take_and_convert_to_utf8 (MMBroadbandModem *self, + gchar *str) +{ + /* should only be used AFTER current charset is set */ + if (self->priv->modem_current_charset == MM_MODEM_CHARSET_UNKNOWN) + return str; + + return mm_charset_take_and_convert_to_utf8 (str, + self->priv->modem_current_charset); +} + +/*****************************************************************************/ + MMBroadbandModem * mm_broadband_modem_new (const gchar *device, const gchar *driver, diff --git a/src/mm-broadband-modem.h b/src/mm-broadband-modem.h index 6bc712b5..ada0c4ad 100644 --- a/src/mm-broadband-modem.h +++ b/src/mm-broadband-modem.h @@ -56,4 +56,10 @@ MMBroadbandModem *mm_broadband_modem_new (const gchar *device, guint16 vendor_id, guint16 product_id); +/* Convert the given string, which comes in the charset currently set in the + * modem, to UTF-8. Given in the API so that subclasses can also use it directly. + */ +gchar *mm_broadband_modem_take_and_convert_to_utf8 (MMBroadbandModem *self, + gchar *str); + #endif /* MM_BROADBAND_MODEM_H */ |