Mercurial > pidgin

changeset 12830:3b4a6e426b99

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 15178] bugfix for empty messages on chats, and changing the Active status to be Available like all the other protocols committer: Tailor Script <tailor@pidgin.im>
author Christopher O'Brien <siege@pidgin.im>
date Wed, 11 Jan 2006 21:36:26 +0000
parents 3848e5eb7962
children 1bb4837b527e
files src/protocols/sametime/sametime.c
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/protocols/sametime/sametime.c	Wed Jan 11 17:46:41 2006 +0000
+++ b/src/protocols/sametime/sametime.c	Wed Jan 11 21:36:26 2006 +0000
@@ -1918,7 +1918,7 @@
   pd = mwSession_getClientData(session);
   gc = pd->gc;
 
-  esc = g_markup_escape_text(text, -1);
+  esc = g_markup_escape_text(text? text: "", -1);
   serv_got_chat_in(gc, CONF_TO_ID(conf), who->user_id, 0, esc, time(NULL));
   g_free(esc);
 }
@@ -2990,7 +2990,7 @@
   pd = mwSession_getClientData(session);
   gc = pd->gc;
 
-  esc = g_markup_escape_text(msg, -1);
+  esc = g_markup_escape_text(msg? msg: "", -1);
   serv_got_chat_in(gc, PLACE_TO_ID(place), who->user, 0, esc, time(NULL));
   g_free(esc);
 }
@@ -3252,7 +3252,7 @@
   GaimStatusType *type;
 
   type = gaim_status_type_new(GAIM_STATUS_AVAILABLE, MW_STATE_ACTIVE,
-			      _("Active"), TRUE);
+			      _("Available"), TRUE);
   gaim_status_type_add_attr(type, MW_STATE_MESSAGE, _("Message"),
 			    gaim_value_new(GAIM_TYPE_STRING));
   types = g_list_append(types, type);