Mercurial > pidgin.yaz

changeset 12863:7a2169f04bdf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 15214] I think blank messages on chats were meant to be ignored, actually. Seems some clients send 'em on join. committer: Tailor Script <tailor@pidgin.im>
author Christopher O'Brien <siege@pidgin.im>
date Fri, 13 Jan 2006 22:00:34 +0000
parents b503265495f7
children 2c0f8815aa2e
files src/protocols/sametime/sametime.c
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/protocols/sametime/sametime.c	Fri Jan 13 18:06:18 2006 +0000
+++ b/src/protocols/sametime/sametime.c	Fri Jan 13 22:00:34 2006 +0000
@@ -1913,12 +1913,14 @@
   GaimConnection *gc;
   char *esc;
 
+  if(! text) return;
+
   srvc = mwConference_getService(conf);
   session = mwService_getSession(MW_SERVICE(srvc));
   pd = mwSession_getClientData(session);
   gc = pd->gc;
 
-  esc = g_markup_escape_text(text? text: "", -1);
+  esc = g_markup_escape_text(text);
   serv_got_chat_in(gc, CONF_TO_ID(conf), who->user_id, 0, esc, time(NULL));
   g_free(esc);
 }
@@ -2985,12 +2987,14 @@
   GaimConnection *gc;
   char *esc;
 
+  if(! msg) return;
+
   srvc = mwPlace_getService(place);
   session = mwService_getSession(MW_SERVICE(srvc));
   pd = mwSession_getClientData(session);
   gc = pd->gc;
 
-  esc = g_markup_escape_text(msg? msg: "", -1);
+  esc = g_markup_escape_text(msg);
   serv_got_chat_in(gc, PLACE_TO_ID(place), who->user, 0, esc, time(NULL));
   g_free(esc);
 }