[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenetwork/kopete/protocols/oscar/oscarsocket
From:       Gustavo P. Boiko <boiko () conectiva ! com ! br>
Date:       2004-07-13 20:47:47
Message-ID: 20040713204747.1B0D316B0F () office ! kde ! org
[Download RAW message or body]

CVS commit by boiko: 

Fixed emoticons parsing in oscar.


  M +10 -6     rtf.cc   1.3
  M +6 -2      rtf.ll   1.4


--- kdenetwork/kopete/protocols/oscar/oscarsocket/rtf.cc  #1.2:1.3
@@ -654,5 +654,5 @@ YY_DECL
 
 
-#line 657 "rtf.cc"
+#line 655 "rtf.cc"
 
         if ( (yy_init) )
@@ -789,5 +789,5 @@ YY_RULE_SETUP
 ECHO;
         YY_BREAK
-#line 792 "rtf.cc"
+#line 790 "rtf.cc"
 case YY_STATE_EOF(INITIAL):
         yyterminate();
@@ -1490,8 +1490,8 @@ YY_BUFFER_STATE rtf_scan_buffer  (char *
  *       rtf_scan_bytes() instead.
  */
-YY_BUFFER_STATE rtf_scan_string (yyconst char * yy_str )
+YY_BUFFER_STATE rtf_scan_string (yyconst char * str )
 {
     
-        return rtf_scan_bytes(yy_str,strlen(yy_str) );
+        return rtf_scan_bytes(str,strlen(str) );
 }
 
@@ -2374,4 +2374,8 @@ QString RTF2HTML::Parse(const char *rtf,
                 cur_level.flush();
                 const char ICQIMAGE[] = "icqimage";
+                                const char *smiles[] = { ":-)" , ":-O" , ":-|" , \
":-/" , // 0-3 +                                                                      \
":-(" , ":-*" , ":-/" , ":'(" , // 4-7 +                                              \
";-)" , ":-@" , ":-$" , ":-X" , // 8-B +                                              \
":-P" , "8-)" , "O:)" , ":-D" }; // C-F  const char *p = rtftext + 3;
                 if ((strlen(p) > strlen(ICQIMAGE)) && !memcmp(p, ICQIMAGE, \
strlen(ICQIMAGE))){ @@ -2395,6 +2399,6 @@ QString RTF2HTML::Parse(const char *rtf,
                         break;
                     }
-                                        if (n < 26)
-                                                PrintUnquoted("<img \
src=\"icon:smile%X\">", n); +                                        if (n < 16)
+                                                PrintUnquoted(" %s ", smiles[n] );
                 }else{
                                                 kdDebug(14200) << "Unknown image " \
<< rtftext << endl;

--- kdenetwork/kopete/protocols/oscar/oscarsocket/rtf.ll  #1.3:1.4
@@ -709,4 +709,8 @@
                 cur_level.flush();
                 const char ICQIMAGE[] = "icqimage";
+                                const char *smiles[] = { ":-)" , ":-O" , ":-|" , \
":-/" , // 0-3 +                                                                      \
":-(" , ":-*" , ":-/" , ":'(" , // 4-7 +                                              \
";-)" , ":-@" , ":-$" , ":-X" , // 8-B +                                              \
":-P" , "8-)" , "O:)" , ":-D" }; // C-F  const char *p = yytext + 3;
                 if ((strlen(p) > strlen(ICQIMAGE)) && !memcmp(p, ICQIMAGE, \
strlen(ICQIMAGE))){ @@ -730,6 +734,6 @@
                         break;
                     }
-                                        if (n < 26)
-                                                PrintUnquoted("<img \
src=\"icon:smile%X\">", n); +                                        if (n < 16)
+                                                PrintUnquoted(" %s ", smiles[n] );
                 }else{
                                                 kdDebug(14200) << "Unknown image " \
<< yytext << endl;


[prev in list] [next in list] [prev in thread] [next in thread]