pidgin: b0957c84: Update File Transfer icon and use new se...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: b0957c844e0c179881aa1c05ed36599aec5a9f22
Ancestor: 983c6951e2b49e31fbe1c5f0adc5bcadd9064166
Author: datallah at pidgin.im
Date: 2008-06-03T23:47:24
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b0957c844e0c179881aa1c05ed36599aec5a9f22

Added files:
        pidgin/pixmaps/toolbar/16/transfer.png
Modified files:
        pidgin/gtkblist.c pidgin/pidginstock.c pidgin/pidginstock.h
        pidgin/pixmaps/Makefile.am
        pidgin/pixmaps/toolbar/16/send-file.png
Modified attrs:
        pidgin/pixmaps/toolbar/16/transfer.png

ChangeLog: 

Update File Transfer icon and use new send fie icon. Fixes #2744.

-------------- next part --------------
============================================================
# pidgin/pixmaps/toolbar/16/transfer.png is binary
============================================================
--- pidgin/gtkblist.c	39dfdaa25009e7284995bc9f54a6876ce734f07e
+++ pidgin/gtkblist.c	0e920b2ff658918c7219f87bcbd5cd5914374517
@@ -3270,7 +3270,7 @@ static GtkItemFactoryEntry blist_menu[] 
 	{ N_("/Tools/Pr_eferences"), "<CTL>P", pidgin_prefs_show, 0, "<StockItem>", GTK_STOCK_PREFERENCES },
 	{ N_("/Tools/Pr_ivacy"), NULL, pidgin_privacy_dialog_show, 0, "<Item>", NULL },
 	{ "/Tools/sep2", NULL, NULL, 0, "<Separator>", NULL },
-	{ N_("/Tools/_File Transfers"), "<CTL>T", pidgin_xfer_dialog_show, 0, "<Item>", NULL },
+	{ N_("/Tools/_File Transfers"), "<CTL>T", pidgin_xfer_dialog_show, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_TRANSFER },
 	{ N_("/Tools/R_oom List"), NULL, pidgin_roomlist_dialog_show, 0, "<Item>", NULL },
 	{ N_("/Tools/System _Log"), NULL, gtk_blist_show_systemlog_cb, 3, "<Item>", NULL },
 	{ "/Tools/sep3", NULL, NULL, 0, "<Separator>", NULL },
============================================================
--- pidgin/pidginstock.c	284a74fc79e3afe410fc8f73e459eeba6e6a7dda
+++ pidgin/pidginstock.c	6ee03b43070342286c1cbc86ff77179878a3b1b3
@@ -168,6 +168,7 @@ static struct SizedStockIcon {
 	{ 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  },
+	{ PIDGIN_STOCK_TOOLBAR_TRANSFER, "toolbar", "transfer.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
 
 	{ PIDGIN_STOCK_TRAY_AVAILABLE, "tray", "tray-online.png", FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TRAY_INVISIBLE, "tray", "tray-invisible.png", FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  },
============================================================
--- pidgin/pidginstock.h	cebcad7166aead1bf5a44b5ad7d2f40ebda98618
+++ pidgin/pidginstock.h	b4a7c222fd9013564cee3a9f57cb22ee967269f9
@@ -129,6 +129,7 @@
 #define PIDGIN_STOCK_TOOLBAR_UNBLOCK      "pidgin-unblock"
 #define PIDGIN_STOCK_TOOLBAR_SELECT_AVATAR "pidgin-select-avatar"
 #define PIDGIN_STOCK_TOOLBAR_SEND_FILE    "pidgin-send-file"
+#define PIDGIN_STOCK_TOOLBAR_TRANSFER     "pidgin-transfer"
 
 /* Tray icons */
 #define PIDGIN_STOCK_TRAY_AVAILABLE       "pidgin-tray-available"
============================================================
--- pidgin/pixmaps/Makefile.am	954c6e61b2ccb5962144b7cf94f06b10819da7e7
+++ pidgin/pixmaps/Makefile.am	b05acfc42b518922b3aa393da001559c7adac314
@@ -565,6 +565,7 @@ TOOLBAR_16 = \
 		toolbar/16/message-new.png \
 		toolbar/16/plugins.png \
 		toolbar/16/send-file.png \
+		toolbar/16/transfer.png \
 		toolbar/16/unblock.png
 
 TOOLBAR_22_SCALABLE = \
============================================================
# pidgin/pixmaps/toolbar/16/send-file.png is binary