[Pidgin] #1187: Send Custom Emoticons in MSN

[Pidgin]

#1187: Send Custom Emoticons in MSN
-----------------------+----------------------------------------------------
  Reporter:  salinasv  |       Owner:  rlaager 
      Type:  patch     |      Status:  assigned
  Priority:  minor     |   Milestone:  2.2.3   
 Component:  MSN       |     Version:  2.0     
Resolution:            |    Keywords:          
   Pending:  0         |  
-----------------------+----------------------------------------------------
Comment (by Twain28):

 Ok, following precisely the instructions above posted by rlaager I managed
 to do the first merge: I tested it, and sending custom smiley still
 worked.
 However, the second merge operation required me to setup a 3-way merge
 program (I'm under Windows)....so, being at a complete loss, I decided
 simply to make a diff between revision
 d42c2c6500b8f7eb1ad6340caf7f1b95d9b02c1b and its patched version.
 Obviously, applying it to newest im.pidgin.pidgin branches won't produce
 working code, yet I post it here, so anyone might take a look and maybe
 spot where actually the flow is. IMHO, since I saw the API is changed
 inside prpl.h file, I believe the purplereserved modifications this patch
 does might have something to do with this issue....there are no more 2
 purplereserved spots to substitute in latest revisions, only one is left.
 Is that so, or am I completely mistaken?

-- 
Ticket URL: <http://developer.pidgin.im/ticket/1187#comment:61>
Pidgin <http://pidgin.im>
Pidgin