Rearrange haze_write_im slightly for legibility.

20070806005707-984d1-5cf90ccafd29f3b591f8dbc00a9ef711ab0f08b0.gz

1 files changed, 6 insertions, 10 deletions

diff --git a/src/im-channel-factory.c b/src/im-channel-factory.c
index b797491..d2cd690 100644
--- a/src/im-channel-factory.c
+++ b/src/im-channel-factory.c
@@ -382,23 +382,19 @@ haze_write_im (PurpleConversation *conv,
     g_assert (who);
 
     handle = tp_handle_ensure (contact_repo, who, NULL, NULL);
-    if (handle == 0) {
+    if (handle == 0)
+    {
         g_debug ("got a 0 handle, ignoring message");
         return;
     }
-
-    message = purple_markup_strip_html (xhtml_message);
-
     chan = get_im_channel (self, handle, NULL);
+    tp_handle_unref (contact_repo, handle);
 
-    tp_handle_unref (contact_repo, handle); /* reffed by chan */
-
-    if (flags & PURPLE_MESSAGE_AUTO_RESP) {
+    message = purple_markup_strip_html (xhtml_message);
+    if (flags & PURPLE_MESSAGE_AUTO_RESP)
         type = TP_CHANNEL_TEXT_MESSAGE_TYPE_AUTO_REPLY;
-    }
-    else if (purple_message_meify(message, -1)) {
+    else if (purple_message_meify(message, -1))
         type = TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION;
-    }
 
     tp_text_mixin_receive (G_OBJECT (chan), type, handle,
                            mtime, message);