Hello snade,

On Mon, 21 Mar 2005 19:19:42 -0300 snade <[EMAIL PROTECTED]> wrote:

> > Sending a patch against current CVS to the devel mailing list, and filing 
> it 
> > to the patch tracker at sf.net, is a good idea. So that other people can 
> try 
> > it (me, for instance! highly interested in). It"s also a good idea 
> todiscuss 
> > the incoming feature before working on it, this would avoid several people
> > 
> > doing the same work (the feature you"re proposing has been requested many 
> > times, I also have some pending work on my side around this). 
> > 
> > A question more: does you patch takes into account the colors in history? 
> > 
> > 
> > Regards, 
> > 
> > -- 
> > wwp 
> 
> I have made the patch you requested (diff -up). It is in patch session, with
> ID: 1167910 

BTW, there's something wrong in the patch, which denotes a conflict in your
local files when you did the cvs diff: 

Index: userbox.cpp
===================================================================
RCS file: /cvsroot/licq/qt-gui/src/userbox.cpp,v
retrieving revision 1.167
diff -u -p -r1.167 userbox.cpp
--- userbox.cpp 19 Mar 2005 22:39:57 -0000      1.167
+++ userbox.cpp 21 Mar 2005 21:37:17 -0000
@@ -180,10 +180,16 @@ CUserViewItem::~CUserViewItem()
     free(m_szId);
 
   if (v == NULL) return;
+<<<<<<< userbox.cpp
+  if (this == v->barOffline || this == v->barOnline) 
+    return;
+    
+=======
 
   if (this == v->barOffline || this == v->barOnline)
     return;
 
+>>>>>>> 1.167
   if (m_nStatus == ICQ_STATUS_OFFLINE)
     v->numOffline--;
   else


Anyway, easy to fix :-).


Regards,

-- 
wwp


-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
Licq-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/licq-devel

Reply via email to