Mercurial > pidgin
changeset 16007:d64602bb59d2
block and unblock have the right icons now
| author | Nathan Walp <nwalp@pidgin.im> |
|---|---|
| date | Sat, 07 Apr 2007 19:47:35 +0000 |
| parents | 14f20458e4e4 |
| children | 1bde57348057 |
| files | pidgin/gtkblist.c pidgin/gtkconv.c pidgin/pidginstock.c pidgin/pidginstock.h pidgin/pixmaps/toolbar/16/Makefile.am pidgin/pixmaps/toolbar/16/unblock.png |
| diffstat | 6 files changed, 11 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkblist.c Sat Apr 07 13:49:02 2007 +0000 +++ b/pidgin/gtkblist.c Sat Apr 07 19:47:35 2007 +0000 @@ -1008,7 +1008,7 @@ permitted = purple_privacy_check(account, purple_buddy_get_name(buddy)); pidgin_new_item_from_stock(menu, permitted ? _("_Block") : _("Un_block"), - PIDGIN_STOCK_BLOCK, G_CALLBACK(toggle_privacy), + permitted ? PIDGIN_STOCK_TOOLBAR_BLOCK : PIDGIN_STOCK_TOOLBAR_UNBLOCK, G_CALLBACK(toggle_privacy), node, 0 ,0, NULL); }
--- a/pidgin/gtkconv.c Sat Apr 07 13:49:02 2007 +0000 +++ b/pidgin/gtkconv.c Sat Apr 07 19:47:35 2007 +0000 @@ -2801,9 +2801,9 @@ { N_("/Conversation/Al_ias..."), NULL, menu_alias_cb, 0, "<Item>", NULL }, { N_("/Conversation/_Block..."), NULL, menu_block_cb, 0, - "<StockItem>", PIDGIN_STOCK_BLOCK }, + "<StockItem>", PIDGIN_STOCK_TOOLBAR_BLOCK }, { N_("/Conversation/_Unblock..."), NULL, menu_unblock_cb, 0, - "<StockItem>", PIDGIN_STOCK_UNBLOCK }, + "<StockItem>", PIDGIN_STOCK_TOOLBAR_UNBLOCK }, { N_("/Conversation/_Add..."), NULL, menu_add_remove_cb, 0, "<StockItem>", GTK_STOCK_ADD }, { N_("/Conversation/_Remove..."), NULL, menu_add_remove_cb, 0,
--- a/pidgin/pidginstock.c Sat Apr 07 13:49:02 2007 +0000 +++ b/pidgin/pidginstock.c Sat Apr 07 19:47:35 2007 +0000 @@ -43,8 +43,6 @@ #else { PIDGIN_STOCK_ALIAS, "buttons", "edit.png" }, #endif - { PIDGIN_STOCK_BLOCK, NULL, GTK_STOCK_STOP }, - { PIDGIN_STOCK_UNBLOCK, NULL, GTK_STOCK_STOP /* XXX: */ }, { PIDGIN_STOCK_CHAT, NULL, GTK_STOCK_JUMP_TO }, { PIDGIN_STOCK_CLEAR, NULL, GTK_STOCK_CLEAR }, { PIDGIN_STOCK_CLOSE_TABS, NULL, GTK_STOCK_CLOSE }, @@ -155,6 +153,7 @@ { PIDGIN_STOCK_TOOLBAR_ACCOUNTS, "toolbar", "accounts.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE }, { PIDGIN_STOCK_TOOLBAR_BGCOLOR, "toolbar", "change-bgcolor.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_TOOLBAR_BLOCK, "emblems", "blocked.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE }, { PIDGIN_STOCK_TOOLBAR_FGCOLOR, "toolbar", "change-fgcolor.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE }, { PIDGIN_STOCK_TOOLBAR_SMILEY, "toolbar", "emote-select.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE }, { PIDGIN_STOCK_TOOLBAR_TEXT_SMALLER, "toolbar", "font-size-down.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE }, @@ -162,10 +161,11 @@ { PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE, "toolbar", "insert-image.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE }, { PIDGIN_STOCK_TOOLBAR_INSERT_LINK, "toolbar", "insert-link.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE }, { PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW, "toolbar", "message-new.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_TOOLBAR_PENDING, "status", "message-pending.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE }, { PIDGIN_STOCK_TOOLBAR_PLUGINS, "toolbar", "plugins.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE }, { PIDGIN_STOCK_TOOLBAR_TYPING, "toolbar", "typing.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE }, - { PIDGIN_STOCK_TOOLBAR_PENDING, "status", "message-pending.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE }, - + { PIDGIN_STOCK_TOOLBAR_UNBLOCK, "toolbar", "unblock.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_TRAY_AVAILABLE, "tray", "tray-online.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE }, { PIDGIN_STOCK_TRAY_AWAY, "tray", "tray-away.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE }, { PIDGIN_STOCK_TRAY_BUSY, "tray", "tray-busy.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE },
--- a/pidgin/pidginstock.h Sat Apr 07 13:49:02 2007 +0000 +++ b/pidgin/pidginstock.h Sat Apr 07 19:47:35 2007 +0000 @@ -35,8 +35,6 @@ #define PIDGIN_STOCK_ACTION "pidgin-action" #define PIDGIN_STOCK_ALIAS "pidgin-alias" #define PIDGIN_STOCK_AWAY "pidgin-away" -#define PIDGIN_STOCK_BLOCK "pidgin-block" -#define PIDGIN_STOCK_UNBLOCK "pidgin-unblock" #define PIDGIN_STOCK_CHAT "pidgin-chat" #define PIDGIN_STOCK_CLEAR "pidgin-clear" #define PIDGIN_STOCK_CLOSE_TABS "pidgin-close-tab" @@ -112,6 +110,7 @@ /* Toolbar (and menu) icons */ #define PIDGIN_STOCK_TOOLBAR_ACCOUNTS "pidgin-accounts" #define PIDGIN_STOCK_TOOLBAR_BGCOLOR "pidgin-bgcolor" +#define PIDGIN_STOCK_TOOLBAR_BLOCK "pidgin-block" #define PIDGIN_STOCK_TOOLBAR_FGCOLOR "pidgin-fgcolor" #define PIDGIN_STOCK_TOOLBAR_SMILEY "pidgin-smiley" #define PIDGIN_STOCK_TOOLBAR_TEXT_SMALLER "pidgin-text-smaller" @@ -119,10 +118,11 @@ #define PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE "pidgin-insert-image" #define PIDGIN_STOCK_TOOLBAR_INSERT_LINK "pidgin-insert-link" #define PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW "pidgin-message-new" +#define PIDGIN_STOCK_TOOLBAR_PENDING "pidgin-pending" #define PIDGIN_STOCK_TOOLBAR_PLUGINS "pidgin-plugins" #define PIDGIN_STOCK_TOOLBAR_TYPING "pidgin-typing" #define PIDGIN_STOCK_TOOLBAR_USER_INFO "pidgin-info" -#define PIDGIN_STOCK_TOOLBAR_PENDING "pidgin-pending" +#define PIDGIN_STOCK_TOOLBAR_UNBLOCK "pidgin-unblock" /* Tray icons */ #define PIDGIN_STOCK_TRAY_AVAILABLE "pidgin-tray-available"