[guardian-dev] [guardianproject/Gibberbot] 0bcc83: cleanup avatar saving

Nathan Freitas nathan at freitas.net
Sun Sep 11 23:08:27 EDT 2011


  Branch: refs/heads/master
  Home:   https://github.com/guardianproject/Gibberbot

  Commit: 0bcc83af2ede3e6867e2ccc19ab6aa5420bf135b
      https://github.com/guardianproject/Gibberbot/commit/0bcc83af2ede3e6867e2ccc19ab6aa5420bf135b
  Author: devrandom <c1.android at niftybox.net>
  Date:   2011-09-04 (Sun, 04 Sep 2011)

  Changed paths:
    M src/info/guardianproject/otr/app/im/plugin/xmpp/XmppConnection.java

  Log Message:
  -----------
  cleanup avatar saving


  Commit: 88e8c295a0db0768b567fe27924eddda49fcaf47
      https://github.com/guardianproject/Gibberbot/commit/88e8c295a0db0768b567fe27924eddda49fcaf47
  Author: devrandom <c1.android at niftybox.net>
  Date:   2011-09-04 (Sun, 04 Sep 2011)

  Changed paths:
    M src/info/guardianproject/otr/app/im/engine/ImConnection.java
  M src/info/guardianproject/otr/app/im/plugin/loopback/LoopbackConnection.java
  M src/info/guardianproject/otr/app/im/plugin/xmpp/XmppConnection.java
  M src/info/guardianproject/otr/app/im/service/ImConnectionAdapter.java

  Log Message:
  -----------
  overhaul XmppConnection to ensure reconnections always happen, fix race conditions


  Commit: 8c4867cfc42e8aed80b2d2235f0543fee171c007
      https://github.com/guardianproject/Gibberbot/commit/8c4867cfc42e8aed80b2d2235f0543fee171c007
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2011-09-11 (Sun, 11 Sep 2011)

  Changed paths:
    M src/info/guardianproject/otr/app/im/engine/ImConnection.java
  M src/info/guardianproject/otr/app/im/plugin/loopback/LoopbackConnection.java
  M src/info/guardianproject/otr/app/im/plugin/xmpp/XmppConnection.java
  M src/info/guardianproject/otr/app/im/service/ImConnectionAdapter.java

  Log Message:
  -----------
  Merge branch 'reconnect' of https://github.com/devrandom/Gibberbot into devrandom-reconnect

Conflicts:
	src/info/guardianproject/otr/app/im/plugin/xmpp/XmppConnection.java


Compare: https://github.com/guardianproject/Gibberbot/compare/7161e89...8c4867c


More information about the Guardian-dev mailing list