# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1137702799 0
# Node ID aba96d7cee741584eab5143fe1dbb670c25acb49
# Parent  397dc33445635da2e27a6461b4023407a388b798
[gaim-migrate @ 15307]
Revert so that the status and message are together on the same line again.

committer: Tailor Script <tailor@pidgin.im>

diff -r 397dc3344563 -r aba96d7cee74 src/protocols/sametime/sametime.c
--- a/src/protocols/sametime/sametime.c	Thu Jan 19 19:37:37 2006 +0000
+++ b/src/protocols/sametime/sametime.c	Thu Jan 19 20:33:19 2006 +0000
@@ -3180,8 +3180,8 @@
 
   GString *str;
   const char *message;
-  char *tmp = NULL;
   const char *status;
+  char *tmp;
 
   gc = b->account->gc;
   pd = gc->proto_data;
@@ -3193,12 +3193,11 @@
 
   if(message != NULL && gaim_utf8_strcasecmp(status, message)) {
     tmp = g_markup_escape_text(message, -1);
-  }
-
-  g_string_append_printf(str, _("\n<b>Status:</b> %s"), status);
-  if(tmp != NULL) {
-    g_string_append_printf(str, _("\n<b>Message:</b> %s"), tmp);
+    g_string_append_printf(str, _("\n<b>%s:</b> %s"), status, tmp);
     g_free(tmp);
+
+  } else {
+    g_string_append_printf(str, _("\n<b>Status:</b> %s"), status);
   }
 
   if(full) {