[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):

 Replying to [comment:69 rlaager]:
 > Twain28: If you have pulled the revision from salinasv, then you
 shouldn't be screwing with applying patches. Given that you've already
 done the work, though, you want to do something like this:
 >
 > 1. Ask salinasv to make sure the patch is on a branch of its own. The
 naming doesn't really matter, but I'd recommend something like this:
 im.pidgin.cpw.salinasv.ticket1187. If it's not already on a branch of its
 own, then salinasv should run: mtn approve -b NEW_BRANCH
 REVISION_WITH_THE_CHANGES
 >
 > 2. Pull the changes from salinasv.
 >
 > 3. From a clean checkout of the im.pidgin.pidgin branch (i.e. upstream
 trunk), run: mtn merge_into_workspace
 h:THE_NAME_OF_THE_BRANCH_FROM_SALINASV
 >
 > 4. Make sure everything works. You may need to redo some of the changes
 that you made when developing your updated patch.
 >
 > 5. mtn commit -b THE_NAME_OF_THE_BRANCH_FROM_SALINASV
 >
 > 6. Push your changes back to salinasv.
 >
 > This process will go much smoother if you'd use the version control
 system to your advantage instead of trying go around its back and manually
 work with patches.

 As a matter of fact, I haven't pulled the revision from salinasv....we
 didn't manage to sync our dbs, so in the end he simply 7zipped his latest
 revision and sent it to me....that's why I posted the patch.
 I'm currently monitoring a defect spreaded by this patch, though, as I
 told you yesterday: seems some part of the patch prevents msn to store a
 custom avatar. I'm skimming through the code and it should be easy to
 spot, so I'm quite positive I'll post a solution soon....

 Replying to [comment:68 msfbrasil]:
 >2- The folder "msn" is still the right one to be used when building MSN
 library and >folder "msnp9" is like a backup, right?
 >
 No. It seems currently Pidgin got back using MSNP9, hence the new folder.
 The MSNP14 previously added rests in the msn folder. You'll notice
 compiling builds only msnp9 folder, so if you'd like to keep using msnp14,
 you can just rename msn folder to msnp9 and compile again. The patch I
 posted actually modifies both protocols, so it's just your choice. :)

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