pidgin: e8b7360d: merge of '17e496a18cf8462d267f5220dd5f62...

[malu at pidgin.im]

----------------------------------------------------------------------
Revision: e8b7360d6e741d9d1a9c9f646663892d3c77546c
Parent:   17e496a18cf8462d267f5220dd5f6283662eeba7
Parent:   c6846e134f765c0da81a81bb60301dedcbb0d4fe
Author:   malu at pidgin.im
Date:     08/25/10 15:12:08
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e8b7360d6e741d9d1a9c9f646663892d3c77546c

Changelog: 

merge of '17e496a18cf8462d267f5220dd5f6283662eeba7'
     and 'c6846e134f765c0da81a81bb60301dedcbb0d4fe'

Changes against parent 17e496a18cf8462d267f5220dd5f6283662eeba7

  dropped  libpurple/protocols/oscar/family_advert.c
  dropped  libpurple/protocols/oscar/family_invite.c
  dropped  libpurple/protocols/oscar/family_odir.c
  dropped  libpurple/protocols/oscar/family_translate.c
  added    libpurple/protocols/oscar/authorization.c
  added    libpurple/protocols/oscar/encoding.c
  added    libpurple/protocols/oscar/encoding.h
  added    libpurple/protocols/oscar/userinfo.c
  added    libpurple/protocols/oscar/visibility.c
  added    libpurple/protocols/oscar/visibility.h
  patched  ChangeLog
  patched  finch/libgnt/gntentry.c
  patched  finch/libgnt/gnttextview.c
  patched  libpurple/log.c
  patched  libpurple/media/backend-fs2.c
  patched  libpurple/plugins/tcl/tcl_cmd.c
  patched  libpurple/plugins/tcl/tcl_signals.c
  patched  libpurple/protocols/bonjour/jabber.c
  patched  libpurple/protocols/bonjour/mdns_avahi.c
  patched  libpurple/protocols/jabber/auth_cyrus.c
  patched  libpurple/protocols/jabber/bosh.c
  patched  libpurple/protocols/jabber/disco.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/message.c
  patched  libpurple/protocols/jabber/si.c
  patched  libpurple/protocols/msn/contact.c
  patched  libpurple/protocols/oscar/Makefile.am
  patched  libpurple/protocols/oscar/Makefile.mingw
  patched  libpurple/protocols/oscar/bstream.c
  patched  libpurple/protocols/oscar/family_admin.c
  patched  libpurple/protocols/oscar/family_alert.c
  patched  libpurple/protocols/oscar/family_auth.c
  patched  libpurple/protocols/oscar/family_bart.c
  patched  libpurple/protocols/oscar/family_bos.c
  patched  libpurple/protocols/oscar/family_buddy.c
  patched  libpurple/protocols/oscar/family_chat.c
  patched  libpurple/protocols/oscar/family_chatnav.c
  patched  libpurple/protocols/oscar/family_feedbag.c
  patched  libpurple/protocols/oscar/family_icbm.c
  patched  libpurple/protocols/oscar/family_icq.c
  patched  libpurple/protocols/oscar/family_locate.c
  patched  libpurple/protocols/oscar/family_oservice.c
  patched  libpurple/protocols/oscar/family_userlookup.c
  patched  libpurple/protocols/oscar/flap_connection.c
  patched  libpurple/protocols/oscar/libaim.c
  patched  libpurple/protocols/oscar/libicq.c
  patched  libpurple/protocols/oscar/misc.c
  patched  libpurple/protocols/oscar/msgcookie.c
  patched  libpurple/protocols/oscar/odc.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/oscar/oscar.h
  patched  libpurple/protocols/oscar/oscar_data.c
  patched  libpurple/protocols/oscar/oscarcommon.h
  patched  libpurple/protocols/oscar/peer_proxy.c
  patched  libpurple/protocols/oscar/rxhandlers.c
  patched  libpurple/protocols/oscar/snac.c
  patched  libpurple/protocols/oscar/tlv.c
  patched  libpurple/protocols/oscar/util.c
  patched  libpurple/protocols/qq/char_conv.c
  patched  libpurple/protocols/qq/qq.c
  patched  libpurple/protocols/qq/qq_trans.c
  patched  libpurple/protocols/yahoo/libymsg.c
  patched  libpurple/protocols/yahoo/yahoo_aliases.c
  patched  libpurple/protocols/yahoo/yahoochat.c
  patched  libpurple/proxy.c
  patched  pidgin/gtkaccount.c
  patched  pidgin/gtkblist.c
  patched  pidgin/gtksourceundomanager.c
  patched  pidgin/gtkutils.c
  patched  pidgin/gtkutils.h
  patched  pidgin/minidialog.c
  patched  pidgin/minidialog.h
  patched  pidgin/plugins/xmppconsole.c
  patched  po/hu.po

Changes against parent c6846e134f765c0da81a81bb60301dedcbb0d4fe

  patched  ChangeLog
  patched  libpurple/media/backend-fs2.c
  patched  libpurple/network.c
  patched  pidgin/gtkprefs.c