Mercurial > pidgin.yaz
changeset 24521:6476ee291f16
merge of 'c3f6487e649e7fe5c5f960b9c86a256e09b3976e'
and 'c93a08f77b8f726dc4df7516c03ae16e44161b63'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Mon, 01 Dec 2008 17:05:35 +0000 |
| parents | 59c3a33ba3b6 (diff) 1a579e1cdc58 (current diff) |
| children | 006e2e385631 103d0d6ffab6 89b95d143116 |
| files | pidgin/pixmaps/status/48/rtl/login.png pidgin/pixmaps/status/48/rtl/logout.png |
| diffstat | 11 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/pidginstock.c Sun Nov 30 20:00:00 2008 +0000 +++ b/pidgin/pidginstock.c Mon Dec 01 17:05:35 2008 +0000 @@ -175,7 +175,6 @@ { PIDGIN_STOCK_ANIMATION_TYPING4, "animations", "typing4.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, { PIDGIN_STOCK_ANIMATION_TYPING5, "animations", "typing5.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, - { PIDGIN_STOCK_TOOLBAR_ACCOUNTS, "toolbar", "accounts.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, { PIDGIN_STOCK_TOOLBAR_BGCOLOR, "toolbar", "change-bgcolor.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, { PIDGIN_STOCK_TOOLBAR_BLOCK, "emblems", "blocked.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, { PIDGIN_STOCK_TOOLBAR_FGCOLOR, "toolbar", "change-fgcolor.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, @@ -189,7 +188,6 @@ { PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW, "toolbar", "message-new.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, { PIDGIN_STOCK_TOOLBAR_PENDING, "tray", "tray-new-im.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, { PIDGIN_STOCK_TOOLBAR_PLUGINS, "toolbar", "plugins.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, - { PIDGIN_STOCK_TOOLBAR_TYPING, "toolbar", "typing.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, { PIDGIN_STOCK_TOOLBAR_UNBLOCK, "toolbar", "unblock.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, { PIDGIN_STOCK_TOOLBAR_SELECT_AVATAR, "toolbar", "select-avatar.png", FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL }, { PIDGIN_STOCK_TOOLBAR_SEND_FILE, "toolbar", "send-file.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL },
--- a/pidgin/pixmaps/Makefile.am Sun Nov 30 20:00:00 2008 +0000 +++ b/pidgin/pixmaps/Makefile.am Mon Dec 01 17:05:35 2008 +0000 @@ -347,6 +347,8 @@ STATUS_11_RTL = \ status/11/rtl/extended-away.png + status/11/rtl/log-in.png + status/11/rtl/log-out.png STATUS_16 = \ status/16/available.png \ @@ -405,6 +407,7 @@ status/48/busy.png \ status/48/chat.png \ status/48/extended-away.png \ + status/48/invisible.png \ status/48/log-in.png \ status/48/log-out.png \ status/48/offline.png \ @@ -412,8 +415,8 @@ STATUS_48_RTL = \ status/48/rtl/extended-away.png \ - status/48/rtl/login.png \ - status/48/rtl/logout.png + status/48/rtl/log-in.png \ + status/48/rtl/log-out.png TOOLBAR_11 = \ toolbar/11/message-new.png