[empathy: 2/11] Return early from chat_members_changed_cb

[Will Thompson <wjt src gnome org>]

commit 17fb8fcf2f5cb1b535815dcabdc790b04969e6d5
Author: Will Thompson <will thompson collabora co uk>
Date:   Wed Jun 17 21:10:08 2009 +0100

    Return early from chat_members_changed_cb
    
    This avoids the function marching to the right quite so much.

 libempathy-gtk/empathy-chat.c |   85 +++++++++++++++++++++--------------------
 1 files changed, 43 insertions(+), 42 deletions(-)
---
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index e327b27..44f37a8 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -1163,54 +1163,55 @@ chat_members_changed_cb (EmpathyTpChat  *tp_chat,
 			 EmpathyChat    *chat)
 {
 	EmpathyChatPriv *priv = GET_PRIV (chat);
+	const gchar *name = empathy_contact_get_name (contact);
+	gchar *str;
 
-	if (priv->block_events_timeout_id == 0) {
-		const gchar *name = empathy_contact_get_name (contact);
-		gchar *str;
+	if (priv->block_events_timeout_id != 0)
+		return;
+
+	if (is_member) {
+		str = g_strdup_printf (_("%s has joined the room"),
+				       name);
+	} else {
+		const gchar *action;
+
+		if (EMP_STR_EMPTY (message)) {
+			switch (reason) {
+			case TP_CHANNEL_GROUP_CHANGE_REASON_OFFLINE:
+				action = _("%s has disconnected");
+				break;
+			case TP_CHANNEL_GROUP_CHANGE_REASON_KICKED:
+				action = _("%s was kicked");
+				break;
+			case TP_CHANNEL_GROUP_CHANGE_REASON_BANNED:
+				action = _("%s was banned");
+				break;
+			default:
+				action = _("%s has left the room");
+			}
 
-		if (is_member) {
-			str = g_strdup_printf (_("%s has joined the room"),
-					       name);
+			str = g_strdup_printf (action, name);
 		} else {
-			const gchar *action;
-
-			if (EMP_STR_EMPTY (message)) {
-				switch (reason) {
-				case TP_CHANNEL_GROUP_CHANGE_REASON_OFFLINE:
-					action = _("%s has disconnected");
-					break;
-				case TP_CHANNEL_GROUP_CHANGE_REASON_KICKED:
-					action = _("%s was kicked");
-					break;
-				case TP_CHANNEL_GROUP_CHANGE_REASON_BANNED:
-					action = _("%s was banned");
-					break;
-				default:
-					action = _("%s has left the room");
-				}
-
-				str = g_strdup_printf (action, name);
-			} else {
-				switch (reason) {
-				case TP_CHANNEL_GROUP_CHANGE_REASON_OFFLINE:
-					action = _("%s has disconnected (%s)");
-					break;
-				case TP_CHANNEL_GROUP_CHANGE_REASON_KICKED:
-					action = _("%s was kicked (%s)");
-					break;
-				case TP_CHANNEL_GROUP_CHANGE_REASON_BANNED:
-					action = _("%s was banned (%s)");
-					break;
-				default:
-					action = _("%s has left the room (%s)");
-				}
-
-				str = g_strdup_printf (action, name, message);
+			switch (reason) {
+			case TP_CHANNEL_GROUP_CHANGE_REASON_OFFLINE:
+				action = _("%s has disconnected (%s)");
+				break;
+			case TP_CHANNEL_GROUP_CHANGE_REASON_KICKED:
+				action = _("%s was kicked (%s)");
+				break;
+			case TP_CHANNEL_GROUP_CHANGE_REASON_BANNED:
+				action = _("%s was banned (%s)");
+				break;
+			default:
+				action = _("%s has left the room (%s)");
 			}
+
+			str = g_strdup_printf (action, name, message);
 		}
-		empathy_chat_view_append_event (chat->view, str);
-		g_free (str);
 	}
+
+	empathy_chat_view_append_event (chat->view, str);
+	g_free (str);
 }
 
 static gboolean