From: Sean E. <sea...@us...> - 2002-03-16 20:14:30
|
Update of /cvsroot/gaim/gaim/src/protocols/irc In directory usw-pr-cvs1:/tmp/cvs-serv25898/src/protocols/irc Modified Files: irc.c Log Message: A buddy window placement fix by Marc Deslauriers and a compile fix from Benjamin Miller. Thanks guys. Also, an irc fix. Index: irc.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.c,v retrieving revision 1.73 retrieving revision 1.74 diff -u -d -r1.73 -r1.74 --- irc.c 12 Mar 2002 17:21:43 -0000 1.73 +++ irc.c 16 Mar 2002 20:14:24 -0000 1.74 @@ -266,30 +266,45 @@ str = g_string_append(str, cur); cur = ++end; if (!g_strncasecmp(cur, "B>", 2)) { - bold = TRUE; - str = g_string_append_c(str, '\2'); + if (!bold) { + bold = TRUE; + str = g_string_append_c(str, '\2'); + } cur = cur + 2; } else if (!g_strncasecmp(cur, "I>", 2)) { /* use bold for italics too */ - italics = TRUE; - str = g_string_append_c(str, '\2'); + if (!italics) { + italics = TRUE; + str = g_string_append_c(str, '\2'); + } cur = cur + 2; } else if (!g_strncasecmp(cur, "U>", 2)) { - underline = TRUE; - str = g_string_append_c(str, '\37'); + if (!underline) { + underline = TRUE; + str = g_string_append_c(str, '\37'); + } cur = cur + 2; - } else if (!g_strncasecmp(cur, "/B>", 3) && bold) { - bold = FALSE; - str = g_string_append_c(str, '\2'); + } else if (!g_strncasecmp(cur, "/B>", 3)) { + if (bold) { + bold = FALSE; + str = g_string_append_c(str, '\2'); + } cur = cur + 3; - } else if (!g_strncasecmp(cur, "/I>", 3) && italics) { - bold = FALSE; - str = g_string_append_c(str, '\2'); + } else if (!g_strncasecmp(cur, "/I>", 3)) { + if (italics) { + italics = FALSE; + str = g_string_append_c(str, '\2'); + } cur = cur + 3; - } else if (!g_strncasecmp(cur, "/U>", 3) && underline) { - bold = FALSE; - str = g_string_append_c(str, '\37'); + } else if (!g_strncasecmp(cur, "/U>", 3)) { + if (underline) { + underline = FALSE; + str = g_string_append_c(str, '\37'); + } cur = cur + 3; + } else { + str = g_string_append_c(str, '<'); } + } str = g_string_append(str, cur); return str; |