cpw.qulogic.gtk3: 538eca4f: explicit merge of '6ab9f5ff810acde3c06a2...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 538eca4f2470f750d0a9771bc604eddf655cb8d4
Parent:   6ab9f5ff810acde3c06a2add7b8df2bd75cce6e3
Parent:   7a0bb807afc9c1c3f2aaa7143fc5d1e3dc7c6ee8
Author:   qulogic at pidgin.im
Date:     12/23/11 01:58:52
Branch:   im.pidgin.cpw.qulogic.gtk3
URL: http://d.pidgin.im/viewmtn/revision/info/538eca4f2470f750d0a9771bc604eddf655cb8d4

Changelog: 

explicit merge of '6ab9f5ff810acde3c06a2add7b8df2bd75cce6e3'
              and '7a0bb807afc9c1c3f2aaa7143fc5d1e3dc7c6ee8'
        to branch 'im.pidgin.cpw.qulogic.gtk3'

Changes against parent 6ab9f5ff810acde3c06a2add7b8df2bd75cce6e3

  patched  pidgin/gtkaccount.c
  patched  pidgin/gtkblist.c
  patched  pidgin/gtkblist.h
  patched  pidgin/gtkcellrendererexpander.c
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkconv.h
  patched  pidgin/gtkconvwin.h
  patched  pidgin/gtkdebug.c
  patched  pidgin/gtkdialogs.c
  patched  pidgin/gtkdnd-hints.c
  patched  pidgin/gtkdocklet.c
  patched  pidgin/gtkidle.c
  patched  pidgin/gtkimhtml.c
  patched  pidgin/gtkimhtmltoolbar.c
  patched  pidgin/gtkimhtmltoolbar.h
  patched  pidgin/gtklog.c
  patched  pidgin/gtkmenutray.c
  patched  pidgin/gtkmenutray.h
  patched  pidgin/gtknotify.c
  patched  pidgin/gtkpounce.c
  patched  pidgin/gtkprefs.c
  patched  pidgin/gtkrequest.c
  patched  pidgin/gtksavedstatuses.c
  patched  pidgin/gtkscrollbook.c
  patched  pidgin/gtkstatusbox.c
  patched  pidgin/gtkutils.c
  patched  pidgin/plugins/contact_priority.c
  patched  pidgin/plugins/gestures/gestures.c
  patched  pidgin/plugins/themeedit.c
  patched  pidgin/plugins/ticker/gtkticker.c
  patched  pidgin/plugins/vvconfig.c
  patched  pidgin/plugins/xmppconsole.c

Changes against parent 7a0bb807afc9c1c3f2aaa7143fc5d1e3dc7c6ee8

  dropped  pidgin/plugins/adiumthemes
  dropped  pidgin/plugins/adiumthemes/Makefile.am
  dropped  pidgin/plugins/adiumthemes/message-style.c
  dropped  pidgin/plugins/adiumthemes/message-style.h
  dropped  pidgin/plugins/adiumthemes/webkit.c
  renamed  pidgin/plugins/adiumthemes/Template.html
       to  pidgin/themes/Template.html
  added    pidgin/themes
  added    libpurple/protocols/gg/win32-resolver.c
  added    libpurple/protocols/gg/win32-resolver.h
  added    pidgin/themes/Makefile.am
  patched  COPYRIGHT
  patched  ChangeLog
  patched  ChangeLog.API
  patched  configure.ac
  patched  finch/gntblist.c
  patched  finch/gntconv.c
  patched  finch/gntnotify.c
  patched  finch/libgnt/gntwm.c
  patched  finch/plugins/grouping.c
  patched  libpurple/account.c
  patched  libpurple/account.h
  patched  libpurple/blist.c
  patched  libpurple/blist.h
  patched  libpurple/certificate.c
  patched  libpurple/certificate.h
  patched  libpurple/cmds.c
  patched  libpurple/connection.c
  patched  libpurple/connection.h
  patched  libpurple/conversation.c
  patched  libpurple/conversation.h
  patched  libpurple/dbus-analyze-functions.py
  patched  libpurple/dbus-bindings.h
  patched  libpurple/dbus-server.c
  patched  libpurple/ft.c
  patched  libpurple/ft.h
  patched  libpurple/network.c
  patched  libpurple/notify.c
  patched  libpurple/notify.h
  patched  libpurple/plugins/autoaccept.c
  patched  libpurple/plugins/log_reader.c
  patched  libpurple/plugins/perl/common/Conversation.xs
  patched  libpurple/plugins/ssl/Makefile.am
  patched  libpurple/plugins/ssl/ssl-gnutls.c
  patched  libpurple/plugins/ssl/ssl-nss.c
  patched  libpurple/prefs.c
  patched  libpurple/protocols/bonjour/bonjour.c
  patched  libpurple/protocols/bonjour/bonjour_ft.c
  patched  libpurple/protocols/bonjour/jabber.c
  patched  libpurple/protocols/bonjour/jabber.h
  patched  libpurple/protocols/bonjour/mdns_avahi.c
  patched  libpurple/protocols/gg/Makefile.am
  patched  libpurple/protocols/gg/Makefile.mingw
  patched  libpurple/protocols/gg/gg-utils.c
  patched  libpurple/protocols/gg/gg-utils.h
  patched  libpurple/protocols/gg/gg.c
  patched  libpurple/protocols/gg/gg.h
  patched  libpurple/protocols/gg/lib/common.c
  patched  libpurple/protocols/gg/lib/compat.h
  patched  libpurple/protocols/gg/lib/dcc.c
  patched  libpurple/protocols/gg/lib/dcc7.c
  patched  libpurple/protocols/gg/lib/events.c
  patched  libpurple/protocols/gg/lib/handlers.c
  patched  libpurple/protocols/gg/lib/http.c
  patched  libpurple/protocols/gg/lib/libgadu-config.h
  patched  libpurple/protocols/gg/lib/libgadu.c
  patched  libpurple/protocols/gg/lib/libgadu.h
  patched  libpurple/protocols/gg/lib/pubdir.c
  patched  libpurple/protocols/gg/lib/pubdir50.c
  patched  libpurple/protocols/gg/lib/resolver.c
  patched  libpurple/protocols/gg/lib/resolver.h
  patched  libpurple/protocols/irc/cmds.c
  patched  libpurple/protocols/irc/dcc_send.c
  patched  libpurple/protocols/irc/irc.c
  patched  libpurple/protocols/irc/irc.h
  patched  libpurple/protocols/irc/msgs.c
  patched  libpurple/protocols/irc/parse.c
  patched  libpurple/protocols/jabber/buddy.c
  patched  libpurple/protocols/jabber/caps.c
  patched  libpurple/protocols/jabber/disco.c
  patched  libpurple/protocols/jabber/google/gmail.c
  patched  libpurple/protocols/jabber/google/google_presence.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/jabber.h
  patched  libpurple/protocols/jabber/jingle/content.c
  patched  libpurple/protocols/jabber/jingle/iceudp.c
  patched  libpurple/protocols/jabber/jingle/jingle.c
  patched  libpurple/protocols/jabber/jingle/rawudp.c
  patched  libpurple/protocols/jabber/jingle/rtp.c
  patched  libpurple/protocols/jabber/jingle/session.c
  patched  libpurple/protocols/jabber/jingle/transport.c
  patched  libpurple/protocols/jabber/oob.c
  patched  libpurple/protocols/jabber/presence.c
  patched  libpurple/protocols/jabber/roster.c
  patched  libpurple/protocols/jabber/si.c
  patched  libpurple/protocols/jabber/usermood.c
  patched  libpurple/protocols/jabber/usertune.c
  patched  libpurple/protocols/msn/httpconn.c
  patched  libpurple/protocols/msn/msg.c
  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/msn/notification.c
  patched  libpurple/protocols/msn/servconn.c
  patched  libpurple/protocols/msn/slp.c
  patched  libpurple/protocols/msn/slpcall.c
  patched  libpurple/protocols/msn/slpmsg.c
  patched  libpurple/protocols/msn/slpmsg.h
  patched  libpurple/protocols/msn/xfer.c
  patched  libpurple/protocols/msn/xfer.h
  patched  libpurple/protocols/mxit/filexfer.c
  patched  libpurple/protocols/mxit/formcmds.c
  patched  libpurple/protocols/mxit/login.c
  patched  libpurple/protocols/mxit/markup.c
  patched  libpurple/protocols/mxit/mxit.c
  patched  libpurple/protocols/mxit/mxit.h
  patched  libpurple/protocols/mxit/protocol.c
  patched  libpurple/protocols/mxit/protocol.h
  patched  libpurple/protocols/myspace/myspace.c
  patched  libpurple/protocols/myspace/session.h
  patched  libpurple/protocols/myspace/zap.c
  patched  libpurple/protocols/novell/novell.c
  patched  libpurple/protocols/null/nullprpl.c
  patched  libpurple/protocols/oscar/family_feedbag.c
  patched  libpurple/protocols/oscar/flap_connection.c
  patched  libpurple/protocols/oscar/oft.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/oscar/peer.c
  patched  libpurple/protocols/oscar/userinfo.c
  patched  libpurple/protocols/sametime/sametime.c
  patched  libpurple/protocols/silc/buddy.c
  patched  libpurple/protocols/silc/ft.c
  patched  libpurple/protocols/silc/ops.c
  patched  libpurple/protocols/silc/silc.c
  patched  libpurple/protocols/silc/util.c
  patched  libpurple/protocols/silc/wb.c
  patched  libpurple/protocols/simple/simple.c
  patched  libpurple/protocols/yahoo/libymsg.c
  patched  libpurple/protocols/yahoo/libymsg.h
  patched  libpurple/protocols/yahoo/yahoo_aliases.c
  patched  libpurple/protocols/yahoo/yahoo_doodle.c
  patched  libpurple/protocols/yahoo/yahoo_filexfer.c
  patched  libpurple/protocols/yahoo/yahoo_picture.c
  patched  libpurple/protocols/zephyr/ZRetSubs.c
  patched  libpurple/protocols/zephyr/zephyr.c
  patched  libpurple/proxy.c
  patched  libpurple/prpl.c
  patched  libpurple/purple-3.pc.in
  patched  libpurple/server.c
  patched  libpurple/util.c
  patched  libpurple/util.h
  patched  libpurple/whiteboard.c
  patched  libpurple/whiteboard.h
  patched  libpurple/win32/libc_interface.c
  patched  libpurple/win32/libc_interface.h
  patched  libpurple/win32/libc_internal.h
  patched  pidgin/Makefile.am
  patched  pidgin/gtkblist.c
  patched  pidgin/gtkcertmgr.c
  patched  pidgin/gtkconv-theme.c
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkdialogs.c
  patched  pidgin/gtkdocklet.c
  patched  pidgin/gtkft.c
  patched  pidgin/gtkimhtml.c
  patched  pidgin/gtkimhtml.h
  patched  pidgin/gtkimhtmltoolbar.c
  patched  pidgin/gtkimhtmltoolbar.h
  patched  pidgin/gtkmedia.c
  patched  pidgin/gtknotify.c
  patched  pidgin/gtkpounce.c
  patched  pidgin/gtkprefs.c
  patched  pidgin/gtkroomlist.c
  patched  pidgin/gtkutils.c
  patched  pidgin/gtkwebview.h
  patched  pidgin/pidgin-3.pc.in
  patched  pidgin/plugins/Makefile.am
  patched  pidgin/plugins/musicmessaging/musicmessaging.c
  patched  pidgin/plugins/vvconfig.c
  patched  pidgin/plugins/xmppconsole.c
  patched  po/ChangeLog
  patched  po/de.po