diff options
| author | Bastien Nocera <hadess@hadess.net> | 2011-01-21 13:48:59 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2011-01-21 13:48:59 +0000 |
| commit | 8bb22b742366f294015a9fce44ab86c8366c8d5b (patch) | |
| tree | e1b87e91f0e5d22b528517d5fc702cb4e95e2531 | |
| parent | 0957585686082022c973110a0a7cd81ebc878485 (diff) | |
| download | gdm-8bb22b742366f294015a9fce44ab86c8366c8d5b.tar.gz | |
Return gboolean from gdm_parse_language_name()
If the parsing succeeded, as used by the user accounts panel
in gnome-control-center.
| -rw-r--r-- | gui/simple-greeter/gdm-languages.c | 8 | ||||
| -rw-r--r-- | gui/simple-greeter/gdm-languages.h | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/gui/simple-greeter/gdm-languages.c b/gui/simple-greeter/gdm-languages.c index aae345a3..a7fa2ae5 100644 --- a/gui/simple-greeter/gdm-languages.c +++ b/gui/simple-greeter/gdm-languages.c @@ -115,7 +115,7 @@ normalize_codeset (const char *codeset) * locale names are of the form: * [language[_territory][.codeset][@modifier]] */ -void +gboolean gdm_parse_language_name (const char *name, char **language_codep, char **territory_codep, @@ -128,8 +128,10 @@ gdm_parse_language_name (const char *name, GError *error; gchar *normalized_codeset = NULL; gchar *normalized_name = NULL; + gboolean retval; match_info = NULL; + retval = FALSE; error = NULL; re = g_regex_new ("^(?P<language>[^_.@[:space:]]+)" @@ -154,6 +156,8 @@ gdm_parse_language_name (const char *name, goto out; } + retval = TRUE; + if (language_codep != NULL) { *language_codep = g_match_info_fetch_named (match_info, "language"); } @@ -207,6 +211,8 @@ gdm_parse_language_name (const char *name, out: g_match_info_free (match_info); g_regex_unref (re); + + return retval; } static char * diff --git a/gui/simple-greeter/gdm-languages.h b/gui/simple-greeter/gdm-languages.h index ab716620..5b4560fd 100644 --- a/gui/simple-greeter/gdm-languages.h +++ b/gui/simple-greeter/gdm-languages.h @@ -29,7 +29,7 @@ G_BEGIN_DECLS char * gdm_get_language_from_name (const char *name, const char *locale); char ** gdm_get_all_language_names (void); -void gdm_parse_language_name (const char *name, +gboolean gdm_parse_language_name (const char *name, char **language_codep, char **territory_codep, char **codesetp, |