diff --git a/src/mu-msg-prio.c b/src/mu-msg-prio.c index 7e406607..2b9f12d3 100644 --- a/src/mu-msg-prio.c +++ b/src/mu-msg-prio.c @@ -34,23 +34,17 @@ mu_msg_prio_name (MuMsgPrio prio) MuMsgPrio mu_msg_prio_from_char (char k) { - switch (k) { - case 'l': return MU_MSG_PRIO_LOW; - case 'n': return MU_MSG_PRIO_NORMAL; - case 'h': return MU_MSG_PRIO_HIGH; - default: g_return_val_if_reached (MU_MSG_PRIO_NONE); - } + g_return_val_if_fail (k == 'l' || k == 'n' || k == 'h', + MU_MSG_PRIO_NONE); + return (MuMsgPrio)k; } char -mu_msg_prio_to_char (MuMsgPrio prio) +mu_msg_prio_char (MuMsgPrio prio) { - switch (prio) { - case MU_MSG_PRIO_LOW : return 'l'; - case MU_MSG_PRIO_NORMAL : return 'n'; - case MU_MSG_PRIO_HIGH : return 'h'; - default : g_return_val_if_reached (0); - } + g_return_val_if_fail (prio == 'l' || prio == 'n' || prio == 'h', + 0); + return (char)prio; } diff --git a/src/mu-msg-prio.h b/src/mu-msg-prio.h index 187141f8..1712e80a 100644 --- a/src/mu-msg-prio.h +++ b/src/mu-msg-prio.h @@ -25,9 +25,9 @@ G_BEGIN_DECLS enum _MuMsgPrio { - MU_MSG_PRIO_LOW, - MU_MSG_PRIO_NORMAL, - MU_MSG_PRIO_HIGH + MU_MSG_PRIO_LOW = 'l', + MU_MSG_PRIO_NORMAL = 'n', + MU_MSG_PRIO_HIGH = 'h' }; typedef enum _MuMsgPrio MuMsgPrio; @@ -66,8 +66,7 @@ MuMsgPrio mu_msg_prio_from_char (char k) G_GNUC_CONST; * * @return a shortcut character or 0 in case of error */ -char mu_msg_prio_to_char (MuMsgPrio prio) G_GNUC_CONST; - +char mu_msg_prio_char (MuMsgPrio prio) G_GNUC_CONST; typedef void (*MuMsgPrioForeachFunc) (MuMsgPrio prio, gpointer user_data); /**