= Pidgin Branches =

This is an attempt to document the various branches in Monotone, their status, and any dependencies.
Developers, CPWs, and contributors: Please add to this.

== Master Password ==
  * Merge in: 3.0.0
  * See also: #673, #5872
  * [http://d.pidgin.im/viewmtn/branch/shortchanges/im.pidgin.soc.2008.masterpassword soc.2008.masterpassword branch]
  * Remaining:
    * ?

== Webkit Message View and Adium styles ==
  * Merge in: 3.0.0
  * See also: [http://arniealmighty.wordpress.com/2009/08/16/pidgin-and-webkit-message-views/]
  * [http://d.pidgin.im/viewmtn/branch/shortchanges/im.pidgin.soc.2009.webkitmessageview soc.2009.webkitmessageview branch]
  * Remaining:
    * Move webkit stuff to GtkWebView
    * Integrate adium themes as a theme loader.
    * Replace input area?

== Privacy Rewrite ==
  * Merge in: 3.0.0
  * See also: PrivacyRewrite [wiki:GSoC2009/PrivacyRewrite]
  * [http://d.pidgin.im/viewmtn/branch/shortchanges/im.pidgin.soc.2009.privacy_rewrite soc.2009.privacyrewrite branch]
  * Remaining:
    * ?

== Remote Logging ==
  * Merge in: 3.0.0
  * [http://d.pidgin.im/viewmtn/branch/shortchanges/im.pidgin.soc.2007.remotelogging soc.2007.remotelogging branch]
  * Remaining:
    * ?

== ICQ XStatus ==
  * #4508
  * Merge in: 2.7.0
  * [http://d.pidgin.im/viewmtn/branch/shortchanges/im.pidgin.cpw.rekkanoryo.icqxstatus icqxstatus branch]
  * Remaining:
    * Completion of UI elements
    * Integrating XMPP Mood with the new API

== Telepathy prpl ==
  * Merge in: 3.0.0(?)
  * [http://d.pidgin.im/viewmtn/branch/shortchanges/im.pidgin.soc.2009.telepathy telepathy branch]
  * Remaining:
    * Fix dependencies on Pidgin
    * ?

== MSNP16 "Multiple Points of Presence"
  * Merge in: 2.7.0
  * See also: #8247
  * [http://developer.pidgin.im/viewmtn/branch/shortchanges/im.pidgin.cpw.qulogic.msnp16 msnp16 branch]
  * Remaining:
    * Verify file transfers.
    * Fix smileys transfer.

== GObjectification ==
  * Remaining:
    * Lots

== Jingle file transfer ==
  * [http://d.pidgin.im/viewmtn/branch/shortchanges/im.pidgin.cpw.malu.xmpp.jingle_ft jingle ft branch]
  * Remaining:
    * Wait for XEPs related to this to reach draft (0234, 0260, 0261)

== File transfer thumbnails ==
  * [http://d.pidgin.im/viewmtn/branch/shortchanges/im.pidgin.cpw.malu.ft_thumbnails ft thumbnails branch]
  * Remaining:
    * Adds API...
    * XEP support (for XMPP) (XEP 0264) will probably not reach draft status before the Jingle ft XEPs

== Google relay support ==
  * [http://d.pidgin.im/viewmtn/branch/shortchanges/im.pidgin.cpw.malu.xmpp.google_relay google relay branch]
  * Remaining:
    * Still only works connecting to a Google relay when making a call, can not receive calls through them
    * Will this be needed when/if Google switches to standard XEPs/TURN standard?