Revision 6f088861a14e87600e0d324f5c4c994860b602af
nwalp at pidgin.im
nwalp at pidgin.im
Sat Apr 7 15:47:44 EDT 2007
o -----------------------------------------------------------------
| Revision: 6f088861a14e87600e0d324f5c4c994860b602af
| Ancestor: 7154023e5efa2e42a0e17206182c1adf564ed12c
| Author: nwalp at pidgin.im
| Date: 2007-04-07T19:47:35
| Branch: im.pidgin.pidgin
|
| Added files:
| pidgin/pixmaps/toolbar/16/unblock.png
| Modified files:
| pidgin/gtkblist.c pidgin/gtkconv.c pidgin/pidginstock.c
| pidgin/pidginstock.h pidgin/pixmaps/toolbar/16/Makefile.am
| Modified attrs:
| pidgin/pixmaps/toolbar/16/unblock.png
|
| ChangeLog:
|
| block and unblock have the right icons now
|
| ============================================================
| # pidgin/pixmaps/toolbar/16/unblock.png is binary
| ============================================================
| --- pidgin/gtkblist.c 5a53799bf4cdb1e845e6b06aae4f6d63644b66b6
| +++ pidgin/gtkblist.c 473ff4dacd06be14ccca59dcc9ea95020da984e5
| @@ -1008,7 +1008,7 @@ void pidgin_append_blist_node_privacy_me
| 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);
| }
|
| ============================================================
| --- pidgin/gtkconv.c aa911795d163c74c02ef975003f7dd29bc856632
| +++ pidgin/gtkconv.c 73a2ce7e960e54f0d5f60b9c2fb5e8dc7a311bc8
| @@ -2801,9 +2801,9 @@ static GtkItemFactoryEntry menu_items[]
| { 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,
| ============================================================
| --- pidgin/pidginstock.c 608cfbcd23e991a906eeeaae4eaea068388bad17
| +++ pidgin/pidginstock.c b3079924986a3ec882f261c117d484c6d2251f51
| @@ -43,8 +43,6 @@ static struct StockIcon
| #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 @@ static struct SizedStockIcon {
|
| { 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 @@ static struct SizedStockIcon {
| { 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 },
| ============================================================
| --- pidgin/pidginstock.h 4dce26c617dbd66b87fc58332550e596449cec5b
| +++ pidgin/pidginstock.h 7dececcbc6120cb7e23e0f3e772b1c291aa9bfff
| @@ -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"
| ============================================================
| --- pidgin/pixmaps/toolbar/16/Makefile.am f80ed1888e3389a918f27f6106d7734c6979490e
| +++ pidgin/pixmaps/toolbar/16/Makefile.am 0ce6a39a90ffe40d9d7637bcbc2d9ed5e58d3c7a
| @@ -11,6 +11,7 @@ EXTRA_DIST = accounts.png \
| message-new.png \
| plugins.png \
| typing.png \
| + unblock.png \
| user-info.png \
| window-icon.png
|
To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from 6f088861a14e87600e0d324f5c4c994860b602af
More information about the Commits
mailing list