diff options
author | Olli Salli <olli.salli@collabora.co.uk> | 2007-12-27 20:02:51 +0000 |
---|---|---|
committer | Olli Salli <olli.salli@collabora.co.uk> | 2007-12-27 20:02:51 +0000 |
commit | 0a81e75a123eee5fb4f49d5f9fe7d0590d3571fb (patch) | |
tree | 45edb1df61439e65b2ed762bea541500456715a7 /src/idle-text.c | |
parent | 929901419cdf62466ffeec49232a3daf4beb9187 (diff) |
Unify coding style part 1 (mostly bracing style)
Diffstat (limited to 'src/idle-text.c')
-rw-r--r-- | src/idle-text.c | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/src/idle-text.c b/src/idle-text.c index 51ad5e5..f05258a 100644 --- a/src/idle-text.c +++ b/src/idle-text.c @@ -51,8 +51,7 @@ void idle_text_decode(const gchar *text, TpChannelTextMessageType *type, gchar * g_free(tmp); } -void idle_text_send (GObject *obj, guint type, const gchar *recipient, const gchar *text, IdleConnection *conn, DBusGMethodInvocation *context) -{ +void idle_text_send (GObject *obj, guint type, const gchar *recipient, const gchar *text, IdleConnection *conn, DBusGMethodInvocation *context) { gchar msg[IRC_MSG_MAXLEN+1]; time_t timestamp; const gchar *final_text = text; @@ -61,8 +60,7 @@ void idle_text_send (GObject *obj, guint type, const gchar *recipient, const gch gsize headerlen; GError *error; - if ((recipient == NULL) || (strlen(recipient) == 0)) - { + if ((recipient == NULL) || (strlen(recipient) == 0)) { IDLE_DEBUG("invalid recipient"); error = g_error_new(TP_ERRORS, TP_ERROR_NOT_AVAILABLE, "invalid recipient"); @@ -76,19 +74,12 @@ void idle_text_send (GObject *obj, guint type, const gchar *recipient, const gch part = (gchar*)final_text; if (type == TP_CHANNEL_TEXT_MESSAGE_TYPE_NORMAL) - { g_snprintf(msg, IRC_MSG_MAXLEN+1, "PRIVMSG %s :", recipient); - } else if (type == TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION) - { g_snprintf(msg, IRC_MSG_MAXLEN+1, "PRIVMSG %s :\001ACTION ", recipient); - } else if (type == TP_CHANNEL_TEXT_MESSAGE_TYPE_NOTICE) - { g_snprintf(msg, IRC_MSG_MAXLEN+1, "NOTICE %s :", recipient); - } - else - { + else { IDLE_DEBUG("invalid message type %u", type); error = g_error_new(TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, "invalid message type %u", type); @@ -100,29 +91,24 @@ void idle_text_send (GObject *obj, guint type, const gchar *recipient, const gch headerlen = strlen(msg); - while (part < final_text+len) - { + while (part < final_text+len) { char *br = strchr (part, '\n'); size_t len = IRC_MSG_MAXLEN-headerlen; - if (br) - { + if (br) { len = (len < br - part) ? len : br - part; } - if (type == TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION) - { + if (type == TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION) { g_snprintf(msg+headerlen, len + 1, "%s\001", part); len -= 1; - } - else - { + } else { g_strlcpy(msg+headerlen, part, len + 1); } + part += len; + if (br) - { part++; - } _idle_connection_send(conn, msg); } |