cpw.qulogic.gtk3: f05deda8: propagate from branch 'im.pidgin.pidgin'...
malu at pidgin.im
malu at pidgin.im
Sat Nov 20 17:36:36 EST 2010
----------------------------------------------------------------------
Revision: f05deda8fae66011778ad6201b94ff6d61a289fe
Parent: 6f879669a6513a5c40335bbaefe842389a92b39e
Parent: f3961bf768b8a93583640b6058ba23d7f2c73c67
Author: malu at pidgin.im
Date: 11/20/10 17:20:35
Branch: im.pidgin.cpw.qulogic.gtk3
URL: http://d.pidgin.im/viewmtn/revision/info/f05deda8fae66011778ad6201b94ff6d61a289fe
Changelog:
propagate from branch 'im.pidgin.pidgin' (head 6f879669a6513a5c40335bbaefe842389a92b39e)
to branch 'im.pidgin.cpw.qulogic.gtk3' (head f3961bf768b8a93583640b6058ba23d7f2c73c67)
Changes against parent 6f879669a6513a5c40335bbaefe842389a92b39e
patched pidgin/gtkaccount.c
patched pidgin/gtkblist.c
patched pidgin/gtkblist.h
patched pidgin/gtkconv.c
patched pidgin/gtkconv.h
patched pidgin/gtkconvwin.h
patched pidgin/gtkdocklet.c
patched pidgin/gtkimhtmltoolbar.c
patched pidgin/gtkimhtmltoolbar.h
patched pidgin/gtkmenutray.c
patched pidgin/gtkmenutray.h
patched pidgin/gtkprefs.c
patched pidgin/gtkrequest.c
patched pidgin/gtkutils.c
patched pidgin/gtkutils.h
patched pidgin/plugins/contact_priority.c
patched pidgin/plugins/ticker/gtkticker.c
Changes against parent f3961bf768b8a93583640b6058ba23d7f2c73c67
dropped libpurple/protocols/jabber/google.c
dropped libpurple/protocols/jabber/google.h
dropped libpurple/protocols/msn/dialog.c
dropped libpurple/protocols/msn/dialog.h
dropped libpurple/protocols/msn/sync.c
dropped libpurple/protocols/msn/sync.h
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
dropped pidgin/pixmaps/emotes/small/16/cool.png
dropped pidgin/pixmaps/emotes/small/16/grin.png
dropped pidgin/win32/IdleTracker
dropped pidgin/win32/IdleTracker/Makefile.mingw
dropped pidgin/win32/IdleTracker/idletrack.c
dropped pidgin/win32/IdleTracker/idletrack.h
added libpurple/protocols/jabber/google
added libpurple/protocols/jabber/google/gmail.c
added libpurple/protocols/jabber/google/gmail.h
added libpurple/protocols/jabber/google/google.c
added libpurple/protocols/jabber/google/google.h
added libpurple/protocols/jabber/google/google_presence.c
added libpurple/protocols/jabber/google/google_presence.h
added libpurple/protocols/jabber/google/google_roster.c
added libpurple/protocols/jabber/google/google_roster.h
added libpurple/protocols/jabber/google/google_session.c
added libpurple/protocols/jabber/google/google_session.h
added libpurple/protocols/jabber/google/jingleinfo.c
added libpurple/protocols/jabber/google/jingleinfo.h
added libpurple/protocols/jabber/google/relay.c
added libpurple/protocols/jabber/google/relay.h
added libpurple/protocols/msn/p2p.c
added libpurple/protocols/msn/p2p.h
added libpurple/protocols/msn/sbconn.c
added libpurple/protocols/msn/sbconn.h
added libpurple/protocols/msn/slpmsg_part.c
added libpurple/protocols/msn/slpmsg_part.h
added libpurple/protocols/msn/xfer.c
added libpurple/protocols/msn/xfer.h
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
added pidgin/pixmaps/emotes/default/24/bored.png
added pidgin/pixmaps/emotes/default/24/cold.png
added pidgin/pixmaps/emotes/default/24/stressed.png
added pidgin/pixmaps/emotes/small/16/bored.png
added pidgin/pixmaps/emotes/small/16/boy.png
added pidgin/pixmaps/emotes/small/16/chilli.png
added pidgin/pixmaps/emotes/small/16/cold.png
added pidgin/pixmaps/emotes/small/16/drool.png
added pidgin/pixmaps/emotes/small/16/excruciating.png
added pidgin/pixmaps/emotes/small/16/eyeroll.png
added pidgin/pixmaps/emotes/small/16/girl.png
added pidgin/pixmaps/emotes/small/16/glasses-cool.png
added pidgin/pixmaps/emotes/small/16/lamp.png
added pidgin/pixmaps/emotes/small/16/lying.png
added pidgin/pixmaps/emotes/small/16/mrgreen.png
added pidgin/pixmaps/emotes/small/16/pirate.png
added pidgin/pixmaps/emotes/small/16/pissed-off.png
added pidgin/pixmaps/emotes/small/16/rose.png
added pidgin/pixmaps/emotes/small/16/shut-mouth.png
added pidgin/pixmaps/emotes/small/16/star.png
added pidgin/pixmaps/emotes/small/16/stressed.png
added pidgin/pixmaps/emotes/small/16/thunder.png
added po/mai.po
added share/ca-certs/Deutsche_Telekom_Root_CA_2.pem
added share/ca-certs/Go_Daddy_Class_2_CA.pem
added share/ca-certs/Microsoft_Internet_Authority_2010.pem
added share/ca-certs/Microsoft_Secure_Server_Authority_2010.pem
added share/ca-certs/Thawte_Primary_Root_CA.pem
added share/ca-certs/ValiCert_Class_2_VA.pem
added share/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G2.pem
patched AUTHORS
patched COPYRIGHT
patched ChangeLog
patched ChangeLog.API
patched NEWS
patched configure.ac
patched doc/pidgin.1.in
patched finch/gntaccount.c
patched finch/gntft.c
patched finch/gntft.h
patched finch/libgnt/gntentry.c
patched finch/libgnt/gnttextview.c
patched libpurple/account.c
patched libpurple/certificate.c
patched libpurple/connection.c
patched libpurple/conversation.c
patched libpurple/debug.h
patched libpurple/desktopitem.c
patched libpurple/dnssrv.c
patched libpurple/ft.c
patched libpurple/ft.h
patched libpurple/log.c
patched libpurple/media/backend-fs2.c
patched libpurple/media/codec.c
patched libpurple/media/codec.h
patched libpurple/media.c
patched libpurple/network.c
patched libpurple/network.h
patched libpurple/ntlm.c
patched libpurple/plugins/idle.c
patched libpurple/plugins/perl/common/BuddyList.xs
patched libpurple/plugins/perl/common/Server.xs
patched libpurple/plugins/perl/common/Util.xs
patched libpurple/plugins/signals-test.c
patched libpurple/plugins/tcl/tcl_cmd.c
patched libpurple/plugins/tcl/tcl_signals.c
patched libpurple/prefs.c
patched libpurple/protocols/bonjour/bonjour.c
patched libpurple/protocols/bonjour/bonjour.h
patched libpurple/protocols/bonjour/bonjour_ft.c
patched libpurple/protocols/bonjour/dns_sd_proxy.c
patched libpurple/protocols/bonjour/dns_sd_proxy.h
patched libpurple/protocols/bonjour/jabber.c
patched libpurple/protocols/bonjour/mdns_avahi.c
patched libpurple/protocols/bonjour/mdns_common.c
patched libpurple/protocols/bonjour/mdns_common.h
patched libpurple/protocols/bonjour/mdns_win32.c
patched libpurple/protocols/jabber/Makefile.am
patched libpurple/protocols/jabber/Makefile.mingw
patched libpurple/protocols/jabber/adhoccommands.c
patched libpurple/protocols/jabber/auth.c
patched libpurple/protocols/jabber/auth.h
patched libpurple/protocols/jabber/auth_cyrus.c
patched libpurple/protocols/jabber/auth_digest_md5.c
patched libpurple/protocols/jabber/auth_plain.c
patched libpurple/protocols/jabber/bosh.c
patched libpurple/protocols/jabber/buddy.c
patched libpurple/protocols/jabber/chat.c
patched libpurple/protocols/jabber/disco.c
patched libpurple/protocols/jabber/iq.c
patched libpurple/protocols/jabber/jabber.c
patched libpurple/protocols/jabber/jabber.h
patched libpurple/protocols/jabber/jingle/jingle.c
patched libpurple/protocols/jabber/jingle/jingle.h
patched libpurple/protocols/jabber/jingle/rtp.c
patched libpurple/protocols/jabber/jingle/transport.c
patched libpurple/protocols/jabber/libxmpp.c
patched libpurple/protocols/jabber/message.c
patched libpurple/protocols/jabber/oob.c
patched libpurple/protocols/jabber/parser.c
patched libpurple/protocols/jabber/presence.c
patched libpurple/protocols/jabber/roster.c
patched libpurple/protocols/jabber/si.c
patched libpurple/protocols/msn/Makefile.am
patched libpurple/protocols/msn/Makefile.mingw
patched libpurple/protocols/msn/cmdproc.c
patched libpurple/protocols/msn/cmdproc.h
patched libpurple/protocols/msn/command.c
patched libpurple/protocols/msn/command.h
patched libpurple/protocols/msn/contact.c
patched libpurple/protocols/msn/directconn.c
patched libpurple/protocols/msn/directconn.h
patched libpurple/protocols/msn/error.c
patched libpurple/protocols/msn/error.h
patched libpurple/protocols/msn/group.h
patched libpurple/protocols/msn/history.h
patched libpurple/protocols/msn/httpconn.c
patched libpurple/protocols/msn/httpconn.h
patched libpurple/protocols/msn/msg.c
patched libpurple/protocols/msn/msg.h
patched libpurple/protocols/msn/msn.c
patched libpurple/protocols/msn/msn.h
patched libpurple/protocols/msn/msnutils.c
patched libpurple/protocols/msn/msnutils.h
patched libpurple/protocols/msn/nexus.c
patched libpurple/protocols/msn/nexus.h
patched libpurple/protocols/msn/notification.c
patched libpurple/protocols/msn/notification.h
patched libpurple/protocols/msn/object.c
patched libpurple/protocols/msn/object.h
patched libpurple/protocols/msn/oim.c
patched libpurple/protocols/msn/servconn.c
patched libpurple/protocols/msn/servconn.h
patched libpurple/protocols/msn/session.c
patched libpurple/protocols/msn/session.h
patched libpurple/protocols/msn/slp.c
patched libpurple/protocols/msn/slp.h
patched libpurple/protocols/msn/slpcall.c
patched libpurple/protocols/msn/slpcall.h
patched libpurple/protocols/msn/slplink.c
patched libpurple/protocols/msn/slplink.h
patched libpurple/protocols/msn/slpmsg.c
patched libpurple/protocols/msn/slpmsg.h
patched libpurple/protocols/msn/soap.c
patched libpurple/protocols/msn/state.c
patched libpurple/protocols/msn/state.h
patched libpurple/protocols/msn/switchboard.c
patched libpurple/protocols/msn/switchboard.h
patched libpurple/protocols/msn/table.h
patched libpurple/protocols/msn/transaction.c
patched libpurple/protocols/msn/transaction.h
patched libpurple/protocols/msn/user.c
patched libpurple/protocols/msn/user.h
patched libpurple/protocols/msn/userlist.c
patched libpurple/protocols/msn/userlist.h
patched libpurple/protocols/mxit/actions.c
patched libpurple/protocols/mxit/markup.c
patched libpurple/protocols/mxit/profile.c
patched libpurple/protocols/mxit/profile.h
patched libpurple/protocols/mxit/roster.c
patched libpurple/protocols/mxit/roster.h
patched libpurple/protocols/myspace/message.c
patched libpurple/protocols/oscar/Makefile.am
patched libpurple/protocols/oscar/Makefile.mingw
patched libpurple/protocols/oscar/bstream.c
patched libpurple/protocols/oscar/clientlogin.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/oft.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.c
patched libpurple/protocols/oscar/peer.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/ChangeLog
patched libpurple/protocols/qq/buddy_info.c
patched libpurple/protocols/qq/buddy_list.c
patched libpurple/protocols/qq/buddy_opt.c
patched libpurple/protocols/qq/char_conv.c
patched libpurple/protocols/qq/file_trans.c
patched libpurple/protocols/qq/group.c
patched libpurple/protocols/qq/group_im.c
patched libpurple/protocols/qq/group_join.c
patched libpurple/protocols/qq/group_opt.c
patched libpurple/protocols/qq/im.c
patched libpurple/protocols/qq/qq.c
patched libpurple/protocols/qq/qq_base.c
patched libpurple/protocols/qq/qq_network.c
patched libpurple/protocols/qq/qq_process.c
patched libpurple/protocols/qq/qq_trans.c
patched libpurple/protocols/qq/send_file.c
patched libpurple/protocols/sametime/sametime.c
patched libpurple/protocols/silc/chat.c
patched libpurple/protocols/silc/ops.c
patched libpurple/protocols/silc/silcpurple.h
patched libpurple/protocols/silc10/chat.c
patched libpurple/protocols/silc10/ops.c
patched libpurple/protocols/silc10/silcpurple.h
patched libpurple/protocols/yahoo/libymsg.c
patched libpurple/protocols/yahoo/libymsg.h
patched libpurple/protocols/yahoo/util.c
patched libpurple/protocols/yahoo/yahoo_aliases.c
patched libpurple/protocols/yahoo/yahoo_doodle.c
patched libpurple/protocols/yahoo/yahoo_doodle.h
patched libpurple/protocols/yahoo/yahoo_filexfer.c
patched libpurple/protocols/yahoo/yahoochat.c
patched libpurple/protocols/zephyr/ZVariables.c
patched libpurple/proxy.c
patched libpurple/purple-remote
patched libpurple/request.c
patched libpurple/stun.c
patched libpurple/util.c
patched libpurple/win32/global.mak
patched libpurple/win32/libc_interface.c
patched libpurple/win32/targets.mak
patched libpurple/win32/win32dep.c
patched pidgin/Makefile.am
patched pidgin/Makefile.mingw
patched pidgin/gtkaccount.c
patched pidgin/gtkblist.c
patched pidgin/gtkconv.c
patched pidgin/gtkdebug.c
patched pidgin/gtkdialogs.c
patched pidgin/gtkft.c
patched pidgin/gtkft.h
patched pidgin/gtkidle.c
patched pidgin/gtkimhtml.c
patched pidgin/gtkimhtmltoolbar.c
patched pidgin/gtkmain.c
patched pidgin/gtknotify.c
patched pidgin/gtkplugin.c
patched pidgin/gtkpounce.c
patched pidgin/gtkprefs.c
patched pidgin/gtkroomlist.c
patched pidgin/gtksession.c
patched pidgin/gtksmiley.c
patched pidgin/gtksourceundomanager.c
patched pidgin/gtkstatusbox.c
patched pidgin/gtkutils.c
patched pidgin/gtkutils.h
patched pidgin/minidialog.c
patched pidgin/minidialog.h
patched pidgin/pidginstock.h
patched pidgin/pixmaps/emotes/default/24/Makefile.am
patched pidgin/pixmaps/emotes/default/24/default.theme.in
patched pidgin/pixmaps/emotes/small/16/Makefile.am
patched pidgin/pixmaps/emotes/small/16/amorous.png
patched pidgin/pixmaps/emotes/small/16/embarrassed.png
patched pidgin/pixmaps/emotes/small/16/excited.png
patched pidgin/pixmaps/emotes/small/16/hungry.png
patched pidgin/pixmaps/emotes/small/16/sleeping.png
patched pidgin/pixmaps/emotes/small/16/small.theme.in
patched pidgin/pixmaps/pidgin.ico
patched pidgin/plugins/Makefile.mingw
patched pidgin/plugins/gevolution/add_buddy_dialog.c
patched pidgin/plugins/gevolution/gevo-util.c
patched pidgin/plugins/gevolution/gevolution.c
patched pidgin/plugins/gevolution/new_person_dialog.c
patched pidgin/plugins/notify.c
patched pidgin/plugins/themeedit-icon.c
patched pidgin/plugins/themeedit.c
patched pidgin/plugins/vvconfig.c
patched pidgin/plugins/win32/winprefs/winprefs.c
patched pidgin/plugins/xmppconsole.c
patched pidgin/win32/gtkwin32dep.c
patched pidgin/win32/gtkwin32dep.h
patched pidgin/win32/nsis/nsis_translations.desktop.in
patched pidgin/win32/nsis/pidgin-installer.nsi
patched pidgin/win32/untar.c
patched pidgin/win32/winpidgin.c
patched pidgin/win32/wspell.c
patched pidgin.spec.in
patched po/ChangeLog
patched po/POTFILES.in
patched po/af.po
patched po/am.po
patched po/ar.po
patched po/as.po
patched po/az.po
patched po/be at latin.po
patched po/bg.po
patched po/bn.po
patched po/bn_IN.po
patched po/bs.po
patched po/ca.po
patched po/ca at valencia.po
patched po/cs.po
patched po/da.po
patched po/de.po
patched po/dz.po
patched po/el.po
patched po/en_AU.po
patched po/en_CA.po
patched po/en_GB.po
patched po/eo.po
patched po/es.po
patched po/et.po
patched po/eu.po
patched po/fa.po
patched po/fi.po
patched po/fr.po
patched po/ga.po
patched po/gl.po
patched po/gu.po
patched po/he.po
patched po/hi.po
patched po/hu.po
patched po/hy.po
patched po/id.po
patched po/it.po
patched po/ja.po
patched po/ka.po
patched po/km.po
patched po/kn.po
patched po/ko.po
patched po/ku.po
patched po/lo.po
patched po/lt.po
patched po/mk.po
patched po/ml.po
patched po/mn.po
patched po/mr.po
patched po/ms_MY.po
patched po/my_MM.po
patched po/nb.po
patched po/ne.po
patched po/nl.po
patched po/nn.po
patched po/oc.po
patched po/or.po
patched po/pa.po
patched po/pl.po
patched po/ps.po
patched po/pt.po
patched po/pt_BR.po
patched po/ro.po
patched po/ru.po
patched po/si.po
patched po/sk.po
patched po/sl.po
patched po/sq.po
patched po/sr.po
patched po/sr at latin.po
patched po/stats.pl
patched po/sv.po
patched po/sw.po
patched po/ta.po
patched po/te.po
patched po/th.po
patched po/tr.po
patched po/uk.po
patched po/ur.po
patched po/vi.po
patched po/xh.po
patched po/zh_CN.po
patched po/zh_HK.po
patched po/zh_TW.po
patched share/ca-certs/Makefile.am
attr on pidgin/pixmaps/emotes/default/24/bored.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/default/24/cold.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/default/24/stressed.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/bored.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/boy.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/chilli.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/cold.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/drool.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/excruciating.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/eyeroll.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/girl.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/glasses-cool.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/lamp.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/lying.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/mrgreen.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/pirate.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/pissed-off.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/rose.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/shut-mouth.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/star.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/stressed.png
set mtn:manual_merge
to true
attr on pidgin/pixmaps/emotes/small/16/thunder.png
set mtn:manual_merge
to true
More information about the Commits
mailing list