im.pidgin.pidgin: f46a2c20964123688f14b0584cfb4155bd45892b

[hallvard.glad at gmail.com]

-----------------------------------------------------------------
Revision: f46a2c20964123688f14b0584cfb4155bd45892b
Ancestor: d32a0c1772bb88a80d5370ff93e7c4b8cf007608
Ancestor: d6936cb019234c5f9985eceac8678731c6b7bf25
Author: hallvard.glad at gmail.com
Date: 2008-01-08T13:17:59
Branch: im.pidgin.pidgin

Added files:
        finch/gntroomlist.c finch/gntroomlist.h
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32
        config.h.mingw configure.ac doc/finch.1.in finch/Makefile.am
        finch/finch.c finch/gntaccount.c finch/gntblist.c
        finch/gntcertmgr.c finch/gntconv.c finch/gntft.c
        finch/gntft.h finch/gntidle.c finch/gntnotify.c
        finch/gntplugin.c finch/gntplugin.h finch/gntprefs.c
        finch/gntrequest.c finch/gntrequest.h finch/gntsound.c
        finch/gntui.c finch/libgnt/gnt.h finch/libgnt/gntbindable.c
        finch/libgnt/gntcolors.c finch/libgnt/gntentry.c
        finch/libgnt/gntmain.c finch/libgnt/gnttextview.c
        finch/libgnt/gntwm.c finch/libgnt/gntwm.h
        finch/libgnt/pygnt/test.py finch/plugins/gntgf.c
        libpurple/account.c libpurple/blist.c libpurple/buddyicon.c
        libpurple/cipher.c libpurple/connection.c
        libpurple/connection.h libpurple/conversation.h
        libpurple/core.h libpurple/dnsquery.c
        libpurple/example/nullclient.c libpurple/idle.c
        libpurple/plugin.c libpurple/plugins/ciphertest.c
        libpurple/plugins/log_reader.c
        libpurple/plugins/perl/common/fallback/const-c.inc
        libpurple/plugins/ssl/ssl-nss.c libpurple/plugins/tcl/tcl.c
        libpurple/plugins/test.pl
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/bonjour/mdns_win32.c
        libpurple/protocols/bonjour/parser.c
        libpurple/protocols/irc/cmds.c
        libpurple/protocols/irc/parse.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/usertune.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/session.c
        libpurple/protocols/msn/session.h
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msn/switchboard.h
        libpurple/protocols/msnp9/msn.c
        libpurple/protocols/msnp9/session.c
        libpurple/protocols/msnp9/session.h
        libpurple/protocols/msnp9/slpcall.c
        libpurple/protocols/msnp9/switchboard.c
        libpurple/protocols/msnp9/switchboard.h
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/novell/novell.c
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/family_icq.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/oscar_data.c
        libpurple/protocols/qq/file_trans.c
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/zephyr/ZSendList.c
        libpurple/protocols/zephyr/ZSendNot.c
        libpurple/protocols/zephyr/Zinternal.c
        libpurple/protocols/zephyr/zephyr.c
        libpurple/protocols/zephyr/zephyr.h libpurple/purple-remote
        libpurple/purple-send libpurple/purple-send-async
        libpurple/purple-url-handler libpurple/roomlist.c
        libpurple/roomlist.h libpurple/savedstatuses.c
        libpurple/signals.h libpurple/stun.c libpurple/upnp.c
        libpurple/util.c libpurple/util.h libpurple/xmlnode.c
        pidgin/gtkaccount.c pidgin/gtkblist.c pidgin/gtkcertmgr.c
        pidgin/gtkconn.c pidgin/gtkconv.c pidgin/gtkdebug.c
        pidgin/gtkdialogs.c pidgin/gtkdialogs.h
        pidgin/gtkdocklet-x11.c pidgin/gtkdocklet.c pidgin/gtkidle.c
        pidgin/gtkimhtml.c pidgin/gtkimhtmltoolbar.c
        pidgin/gtkmain.c pidgin/gtknotify.c pidgin/gtkpluginpref.c
        pidgin/gtkprefs.c pidgin/gtkprivacy.c pidgin/gtkroomlist.c
        pidgin/gtksavedstatuses.c pidgin/gtksession.c
        pidgin/gtkstatusbox.c pidgin/gtkthemes.c pidgin/gtkutils.c
        pidgin/gtkutils.h pidgin/pidgintooltip.c
        pidgin/plugins/cap/cap.c pidgin/plugins/cap/cap.h
        pidgin/plugins/markerline.c pidgin/plugins/pidginrc.c
        pidgin/plugins/spellchk.c pidgin/plugins/ticker/ticker.c
        pidgin/plugins/xmppconsole.c pidgin/win32/winpidgin.c
        po/POTFILES.in po/check_po.pl po/de.po po/nb.po po/stats.pl

ChangeLog: 

merge of 'd32a0c1772bb88a80d5370ff93e7c4b8cf007608'
     and 'd6936cb019234c5f9985eceac8678731c6b7bf25'