comparison pidgin/pidginstock.c @ 16269:c14a05c00484

merge of '6b7a5fb8f33d3f1801a33540b42b5fb01b69511a' and '7d305ece871339300b733aa498ca247d21b5aa41'
author Sean Egan <seanegan@gmail.com>
date Fri, 20 Apr 2007 00:47:30 +0000
parents c4ce8368eca8
children c5a8103aa9a4
comparison
equal deleted inserted replaced
16253:a68fffb647d0 16269:c14a05c00484
44 { PIDGIN_STOCK_ALIAS, "buttons", "edit.png" }, 44 { PIDGIN_STOCK_ALIAS, "buttons", "edit.png" },
45 #endif 45 #endif
46 { PIDGIN_STOCK_CHAT, NULL, GTK_STOCK_JUMP_TO }, 46 { PIDGIN_STOCK_CHAT, NULL, GTK_STOCK_JUMP_TO },
47 { PIDGIN_STOCK_CLEAR, NULL, GTK_STOCK_CLEAR }, 47 { PIDGIN_STOCK_CLEAR, NULL, GTK_STOCK_CLEAR },
48 { PIDGIN_STOCK_CLOSE_TABS, NULL, GTK_STOCK_CLOSE }, 48 { PIDGIN_STOCK_CLOSE_TABS, NULL, GTK_STOCK_CLOSE },
49 #if GTK_CHECK_VERSION(2,6,0)
50 { PIDGIN_STOCK_CONNECT, NULL, GTK_STOCK_CONNECT },
51 #else
52 { PIDGIN_STOCK_CONNECT, "icons", "stock_connect_16.png" },
53 #endif
54 { PIDGIN_STOCK_DEBUG, NULL, GTK_STOCK_PROPERTIES }, 49 { PIDGIN_STOCK_DEBUG, NULL, GTK_STOCK_PROPERTIES },
55 { PIDGIN_STOCK_DOWNLOAD, NULL, GTK_STOCK_GO_DOWN }, 50 { PIDGIN_STOCK_DOWNLOAD, NULL, GTK_STOCK_GO_DOWN },
56 #if GTK_CHECK_VERSION(2,6,0) 51 #if GTK_CHECK_VERSION(2,6,0)
57 { PIDGIN_STOCK_DISCONNECT, NULL, GTK_STOCK_DISCONNECT }, 52 { PIDGIN_STOCK_DISCONNECT, NULL, GTK_STOCK_DISCONNECT },
58 #else 53 #else