diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2009-09-03 15:29:33 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2009-09-03 15:29:33 +0100 |
| commit | d55ca0431c20127d6e6f3b0da394b69f303cc3b9 (patch) | |
| tree | 5b25cf3cae88d3fc724c8db5c8bb08085d229e12 /util/mc-tool.c | |
| parent | 8ce49d5c7a6d03f5244dbf3943b0df1a94ff51ce (diff) | |
| parent | 3b8dd4652f69764bb3c7e270d73df4fee83f0147 (diff) | |
Merge branch 'telepathy-mission-control-5.2'
Conflicts:
configure.ac
Diffstat (limited to 'util/mc-tool.c')
| -rw-r--r-- | util/mc-tool.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/util/mc-tool.c b/util/mc-tool.c index fba91c45..cbb58c50 100644 --- a/util/mc-tool.c +++ b/util/mc-tool.c @@ -293,30 +293,30 @@ show_presence (gchar const *what, struct presence *presence) static TpConnectionPresenceType get_presence_type_for_status(char const *status) { - if (g_strcasecmp(status, "unset") == 0) + if (g_ascii_strcasecmp(status, "unset") == 0) return TP_CONNECTION_PRESENCE_TYPE_UNSET; - if (g_strcasecmp(status, "unknown") == 0) + if (g_ascii_strcasecmp(status, "unknown") == 0) return TP_CONNECTION_PRESENCE_TYPE_UNKNOWN; - if (g_strcasecmp(status, "offline") == 0) + if (g_ascii_strcasecmp(status, "offline") == 0) return TP_CONNECTION_PRESENCE_TYPE_OFFLINE; - if (g_strcasecmp(status, "available") == 0 || - g_strcasecmp(status, "online") == 0) + if (g_ascii_strcasecmp(status, "available") == 0 || + g_ascii_strcasecmp(status, "online") == 0) return TP_CONNECTION_PRESENCE_TYPE_AVAILABLE; - if (g_strcasecmp(status, "away") == 0 || - g_strcasecmp(status, "brb") == 0) + if (g_ascii_strcasecmp(status, "away") == 0 || + g_ascii_strcasecmp(status, "brb") == 0) return TP_CONNECTION_PRESENCE_TYPE_AWAY; - if (g_strcasecmp(status, "xa") == 0 || - g_strcasecmp(status, "extended-away") == 0 || - g_strcasecmp(status, "extendedaway") == 0) + if (g_ascii_strcasecmp(status, "xa") == 0 || + g_ascii_strcasecmp(status, "extended-away") == 0 || + g_ascii_strcasecmp(status, "extendedaway") == 0) return TP_CONNECTION_PRESENCE_TYPE_EXTENDED_AWAY; - if (g_strcasecmp(status, "hidden") == 0) + if (g_ascii_strcasecmp(status, "hidden") == 0) return TP_CONNECTION_PRESENCE_TYPE_HIDDEN; - if (g_strcasecmp(status, "busy") == 0 || - g_strcasecmp(status, "dnd") == 0 || - g_strcasecmp(status, "do_not_disturb") == 0 || - g_strcasecmp(status, "donotdisturb") == 0) + if (g_ascii_strcasecmp(status, "busy") == 0 || + g_ascii_strcasecmp(status, "dnd") == 0 || + g_ascii_strcasecmp(status, "do_not_disturb") == 0 || + g_ascii_strcasecmp(status, "donotdisturb") == 0) return TP_CONNECTION_PRESENCE_TYPE_BUSY; - if (g_strcasecmp(status, "error") == 0) + if (g_ascii_strcasecmp(status, "error") == 0) return TP_CONNECTION_PRESENCE_TYPE_ERROR; return TP_CONNECTION_PRESENCE_TYPE_UNKNOWN; @@ -1048,13 +1048,13 @@ parse (int argc, char **argv) command.ready.account = command_auto_connect; command.common.account = argv[2]; if (argv[3] == NULL || - g_strcasecmp (argv[3], "on") == 0 || - g_strcasecmp (argv[3], "true") == 0 || - g_strcasecmp (argv[3], "1") == 0) + g_ascii_strcasecmp (argv[3], "on") == 0 || + g_ascii_strcasecmp (argv[3], "true") == 0 || + g_ascii_strcasecmp (argv[3], "1") == 0) command.boolean.value = TRUE; - else if (g_strcasecmp (argv[3], "off") == 0 || - g_strcasecmp (argv[3], "false") == 0 || - g_strcasecmp (argv[3], "0") == 0) + else if (g_ascii_strcasecmp (argv[3], "off") == 0 || + g_ascii_strcasecmp (argv[3], "false") == 0 || + g_ascii_strcasecmp (argv[3], "0") == 0) command.boolean.value = FALSE; else show_help ("Invalid auto-connect command."); |