[858] in BarnOwl Developers
[D-O-H] r846 - branches/barnowl_unicode/owl
daemon@ATHENA.MIT.EDU (asedeno@MIT.EDU)
Thu Oct 29 18:10:28 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
To: dirty-owl-hackers@mit.edu
From: asedeno@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Sat, 12 Jan 2008 01:18:21 -0500 (EST)
Author: asedeno
Date: 2008-01-12 01:18:20 -0500 (Sat, 12 Jan 2008)
New Revision: 846
Modified:
branches/barnowl_unicode/owl/fmtext.c
branches/barnowl_unicode/owl/util.c
Log:
unicode/glib branch
Eliminating a warning by un-internalizing a new fmtext function.
Modified: branches/barnowl_unicode/owl/fmtext.c
===================================================================
--- branches/barnowl_unicode/owl/fmtext.c 2008-01-12 06:11:53 UTC (rev 845)
+++ branches/barnowl_unicode/owl/fmtext.c 2008-01-12 06:18:20 UTC (rev 846)
@@ -35,7 +35,7 @@
}
}
-int _owl_fmtext_is_format_char(gunichar c) /*noproto*/
+int owl_fmtext_is_format_char(gunichar c)
{
if ((c & ~OWL_FMTEXT_UC_ATTR_MASK) == OWL_FMTEXT_UC_ATTR) return 1;
if ((c & ~(OWL_FMTEXT_UC_ALLCOLOR_MASK)) == OWL_FMTEXT_UC_COLOR_BASE) return 1;
@@ -294,7 +294,7 @@
/* Find next possible format character. */
p = strchr(s, OWL_FMTEXT_UC_STARTBYTE_UTF8);
while(p) {
- if (_owl_fmtext_is_format_char(g_utf8_get_char(p))) {
+ if (owl_fmtext_is_format_char(g_utf8_get_char(p))) {
/* Deal with all text from last insert to here. */
char tmp;
@@ -336,7 +336,7 @@
attr = f->default_attrs;
fg = f->default_fgcolor;
bg = f->default_bgcolor;
- while (p && _owl_fmtext_is_format_char(g_utf8_get_char(p))) {
+ while (p && owl_fmtext_is_format_char(g_utf8_get_char(p))) {
_owl_fmtext_update_attributes(g_utf8_get_char(p), &attr, &fg, &bg);
p = g_utf8_next_char(p);
}
@@ -438,7 +438,7 @@
ptr_c = ptr_s;
while(ptr_c < ptr_e) {
gunichar c = g_utf8_get_char(ptr_c);
- if (!_owl_fmtext_is_format_char(c)) {
+ if (!owl_fmtext_is_format_char(c)) {
chwidth = mk_wcwidth(c);
if (col + chwidth > bcol) break;
Modified: branches/barnowl_unicode/owl/util.c
===================================================================
--- branches/barnowl_unicode/owl/util.c 2008-01-12 06:11:53 UTC (rev 845)
+++ branches/barnowl_unicode/owl/util.c 2008-01-12 06:18:20 UTC (rev 846)
@@ -774,10 +774,10 @@
while(p) {
/* If it's a format character, copy up to it, and skip all
immediately following format characters. */
- if (_owl_fmtext_is_format_char(g_utf8_get_char(p))) {
+ if (owl_fmtext_is_format_char(g_utf8_get_char(p))) {
strncat(r, s, p-s);
p = g_utf8_next_char(p);
- while (p && _owl_fmtext_is_format_char(g_utf8_get_char(p))) {
+ while (p && owl_fmtext_is_format_char(g_utf8_get_char(p))) {
p = g_utf8_next_char(p);
}
s = p;
