Mercurial > pidgin
changeset 16410:58a097859388
merge of '5a1b790556f2372c9cfc080af4a11e3c3d19b2ce'
and '7b2e3a93824b2aa9d1939d622c2d12f0bd02ee5d'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Wed, 25 Apr 2007 05:25:57 +0000 |
| parents | f4c72a722741 (current diff) c85fa74f7e50 (diff) |
| children | 569eba287c84 ac9d28bba272 0fa041c66957 |
| files | COPYRIGHT TODO libpurple/plugins/mono/api/Makefile.am libpurple/plugins/mono/loader/Makefile.am libpurple/protocols/gg/.todo libpurple/protocols/irc/.todo libpurple/protocols/msn/.todo libpurple/protocols/yahoo/.todo libpurple/protocols/zephyr/.todo pidgin/pixmaps/accounts.png pidgin/pixmaps/away.png pidgin/pixmaps/change-bgcolor-small.png pidgin/pixmaps/change-fgcolor-small.png pidgin/pixmaps/connect.png pidgin/pixmaps/info.png pidgin/pixmaps/insert-image-small.png pidgin/pixmaps/insert-image.png pidgin/pixmaps/insert-link-small.png pidgin/pixmaps/insert-smiley-small.png pidgin/pixmaps/msgpend.png pidgin/pixmaps/msgunread.png pidgin/pixmaps/offline.png pidgin/pixmaps/online.png pidgin/pixmaps/phone.png pidgin/pixmaps/pidgin.svg pidgin/pixmaps/send-im.png pidgin/pixmaps/status-away.png pidgin/pixmaps/status-connect0.png pidgin/pixmaps/status-connect1.png pidgin/pixmaps/status-connect2.png pidgin/pixmaps/status-connect3.png pidgin/pixmaps/status-invisible.png pidgin/pixmaps/status-offline.png pidgin/pixmaps/status-online.png pidgin/pixmaps/status-typing0.png pidgin/pixmaps/status-typing1.png pidgin/pixmaps/status-typing2.png pidgin/pixmaps/status-typing3.png pidgin/pixmaps/status/default/Makefile.am pidgin/pixmaps/status/default/Makefile.mingw pidgin/pixmaps/status/default/activebuddy.png pidgin/pixmaps/status/default/admin.png pidgin/pixmaps/status/default/aim.png pidgin/pixmaps/status/default/aol.png pidgin/pixmaps/status/default/away.png pidgin/pixmaps/status/default/blocked.png pidgin/pixmaps/status/default/bonjour.png pidgin/pixmaps/status/default/dnd.png pidgin/pixmaps/status/default/extended_away.png pidgin/pixmaps/status/default/external.png pidgin/pixmaps/status/default/female.png pidgin/pixmaps/status/default/founder.png pidgin/pixmaps/status/default/founder.svg pidgin/pixmaps/status/default/freeforchat.png pidgin/pixmaps/status/default/gadu-gadu.png pidgin/pixmaps/status/default/game.png pidgin/pixmaps/status/default/halfop.png pidgin/pixmaps/status/default/halfop.svg pidgin/pixmaps/status/default/hiptop.png pidgin/pixmaps/status/default/icq.png pidgin/pixmaps/status/default/ignored.png pidgin/pixmaps/status/default/ignored.svg pidgin/pixmaps/status/default/invisible.png pidgin/pixmaps/status/default/irc.png pidgin/pixmaps/status/default/jabber.png pidgin/pixmaps/status/default/login.png pidgin/pixmaps/status/default/logout.png pidgin/pixmaps/status/default/male.png pidgin/pixmaps/status/default/meanwhile.png pidgin/pixmaps/status/default/msn.png pidgin/pixmaps/status/default/msn.svg pidgin/pixmaps/status/default/notauthorized.png pidgin/pixmaps/status/default/novell.png pidgin/pixmaps/status/default/occupied.png pidgin/pixmaps/status/default/offline.png pidgin/pixmaps/status/default/op.png pidgin/pixmaps/status/default/op.svg pidgin/pixmaps/status/default/pending.png pidgin/pixmaps/status/default/qq.png pidgin/pixmaps/status/default/secure.png pidgin/pixmaps/status/default/silc.png pidgin/pixmaps/status/default/simple.png pidgin/pixmaps/status/default/unavailable.png pidgin/pixmaps/status/default/voice.png pidgin/pixmaps/status/default/voice.svg pidgin/pixmaps/status/default/wireless.png pidgin/pixmaps/status/default/yahoo.png pidgin/pixmaps/status/default/zephyr.png pidgin/pixmaps/stock_connect_16.png pidgin/pixmaps/stock_disconnect_16.png pidgin/pixmaps/text_bigger.png pidgin/pixmaps/text_normal.png pidgin/pixmaps/text_smaller.png pidgin/pixmaps/typed.png pidgin/pixmaps/typing.png |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Wed Apr 25 02:36:05 2007 +0000 +++ b/COPYRIGHT Wed Apr 25 05:25:57 2007 +0000 @@ -74,6 +74,7 @@ Todd Cohen Jono Cole Lorenzo Colitti +Jeff Connelly Nathan Conrad Felipe Contreras Alex Converse
--- a/libpurple/prpl.h Wed Apr 25 02:36:05 2007 +0000 +++ b/libpurple/prpl.h Wed Apr 25 05:25:57 2007 +0000 @@ -175,8 +175,11 @@ /** * Returns the base icon name for the given buddy and account. - * If buddy is NULL, it will return the name to use for the account's - * icon. This must be implemented. + * If buddy is NULL and the account is non-NULL, it will return the + * name to use for the account's icon. If both are NULL, it will + * return the name to use for the protocol's icon. + * + * This must be implemented. */ const char *(*list_icon)(PurpleAccount *account, PurpleBuddy *buddy);