Mercurial > pidgin.yaz

changeset 16839:d6ccf170148e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
New Send File icon committer: Sean Egan <seanegan@gmail.com>
author Hylke Bons <hylkebons@gmail.com>
date Thu, 03 May 2007 18:37:33 +0000
parents c53a70e1cbcd
children bbce9e801ec1
files pidgin/gtkblist.c pidgin/gtkconv.c pidgin/pidginstock.c pidgin/pidginstock.h pidgin/pixmaps/Makefile.am pidgin/pixmaps/toolbar/16/Makefile.am pidgin/pixmaps/toolbar/16/send-file.png
diffstat 7 files changed, 7 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkblist.c	Thu May 03 18:29:59 2007 +0000
+++ b/pidgin/gtkblist.c	Thu May 03 18:37:33 2007 +0000
@@ -1086,7 +1086,7 @@
 			prpl_info->can_receive_file(buddy->account->gc, buddy->name))
 		{
 			pidgin_new_item_from_stock(menu, _("_Send File"),
-									 PIDGIN_STOCK_FILE_TRANSFER,
+									 PIDGIN_STOCK_TOOLBAR_SEND_FILE,
 									 G_CALLBACK(gtk_blist_menu_send_file_cb),
 									 buddy, 0, 0, NULL);
 		}
--- a/pidgin/gtkconv.c	Thu May 03 18:29:59 2007 +0000
+++ b/pidgin/gtkconv.c	Thu May 03 18:37:33 2007 +0000
@@ -1579,7 +1579,7 @@
 		if (prpl_info && prpl_info->send_file)
 		{
 			button = pidgin_new_item_from_stock(menu, _("Send File"),
-				PIDGIN_STOCK_FILE_TRANSFER, G_CALLBACK(menu_chat_send_file_cb),
+				PIDGIN_STOCK_TOOLBAR_SEND_FILE, G_CALLBACK(menu_chat_send_file_cb),
 				PIDGIN_CONVERSATION(conv), 0, 0, NULL);
 
 			if (gc == NULL || prpl_info == NULL ||
@@ -2767,7 +2767,7 @@
 
 	{ "/Conversation/sep1", NULL, NULL, 0, "<Separator>", NULL },
 
-	{ N_("/Conversation/Se_nd File..."), NULL, menu_send_file_cb, 0, "<StockItem>", PIDGIN_STOCK_FILE_TRANSFER },
+	{ N_("/Conversation/Se_nd File..."), NULL, menu_send_file_cb, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_SEND_FILE },
 	{ N_("/Conversation/Add Buddy _Pounce..."), NULL, menu_add_pounce_cb,
 			0, "<Item>", NULL },
 	{ N_("/Conversation/_Get Info"), "<CTL>O", menu_get_info_cb, 0,
--- a/pidgin/pidginstock.c	Thu May 03 18:29:59 2007 +0000
+++ b/pidgin/pidginstock.c	Thu May 03 18:37:33 2007 +0000
@@ -36,7 +36,6 @@
 
 } const stock_icons[] =
 {
-	{ PIDGIN_STOCK_ABOUT,           "buttons", "about_menu.png"           },
 	{ PIDGIN_STOCK_ACTION,          NULL,      GTK_STOCK_EXECUTE          },
 #if GTK_CHECK_VERSION(2,6,0)
 	{ PIDGIN_STOCK_ALIAS,           NULL,      GTK_STOCK_EDIT             },
@@ -61,7 +60,6 @@
 #endif
 	{ PIDGIN_STOCK_FILE_CANCELED,   NULL,      GTK_STOCK_CANCEL           },
 	{ PIDGIN_STOCK_FILE_DONE,       NULL,      GTK_STOCK_APPLY            },
-	{ PIDGIN_STOCK_FILE_TRANSFER,   NULL,      GTK_STOCK_REVERT_TO_SAVED  },
 	{ PIDGIN_STOCK_IGNORE,          NULL,      GTK_STOCK_DIALOG_ERROR     },
 	{ PIDGIN_STOCK_INVITE,          NULL,      GTK_STOCK_JUMP_TO          },
 	{ PIDGIN_STOCK_MODIFY,          NULL,      GTK_STOCK_PREFERENCES      },
@@ -160,6 +158,7 @@
 	{ PIDGIN_STOCK_TOOLBAR_TYPING, "toolbar", "typing.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TOOLBAR_UNBLOCK, "toolbar", "unblock.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TOOLBAR_SELECT_AVATAR, "toolbar", "select-avatar.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TOOLBAR_SEND_FILE, "toolbar", "send-file.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
 
 	{ PIDGIN_STOCK_TRAY_AVAILABLE, "tray", "tray-online.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL  },
 	{ PIDGIN_STOCK_TRAY_INVISIBLE, "tray", "tray-invisible.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL  },
--- a/pidgin/pidginstock.h	Thu May 03 18:29:59 2007 +0000
+++ b/pidgin/pidginstock.h	Thu May 03 18:37:33 2007 +0000
@@ -31,7 +31,6 @@
 /** @name Stock images                                                    */
 /**************************************************************************/
 /*@{*/
-#define PIDGIN_STOCK_ABOUT           "pidgin-about"
 #define PIDGIN_STOCK_ACTION          "pidgin-action"
 #define PIDGIN_STOCK_ALIAS           "pidgin-alias"
 #define PIDGIN_STOCK_AWAY            "pidgin-away"
@@ -45,7 +44,6 @@
 #define PIDGIN_STOCK_FGCOLOR         "pidgin-fgcolor"
 #define PIDGIN_STOCK_FILE_CANCELED   "pidgin-file-canceled"
 #define PIDGIN_STOCK_FILE_DONE       "pidgin-file-done"
-#define PIDGIN_STOCK_FILE_TRANSFER   "pidgin-file-transfer"
 #define PIDGIN_STOCK_IGNORE          "pidgin-ignore"
 #define PIDGIN_STOCK_INVITE          "pidgin-invite"
 #define PIDGIN_STOCK_MODIFY          "pidgin-modify"
@@ -125,6 +123,7 @@
 #define PIDGIN_STOCK_TOOLBAR_USER_INFO    "pidgin-info"
 #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"
 
 /* Tray icons */
 #define PIDGIN_STOCK_TRAY_AVAILABLE       "pidgin-tray-available"
--- a/pidgin/pixmaps/Makefile.am	Thu May 03 18:29:59 2007 +0000
+++ b/pidgin/pixmaps/Makefile.am	Thu May 03 18:37:33 2007 +0000
@@ -12,7 +12,7 @@
 		pidgin.ico
 
 pidginbuttonpixdir = $(datadir)/pixmaps/pidgin/buttons
-pidginbuttonpix_DATA = about_menu.png edit.png pause.png
+pidginbuttonpix_DATA = edit.png pause.png
 
 pidgindistpixdir = $(datadir)/pixmaps/pidgin
 pidgindistpix_DATA = logo.png arrow-down.xpm arrow-left.xpm arrow-right.xpm arrow-up.xpm
--- a/pidgin/pixmaps/toolbar/16/Makefile.am	Thu May 03 18:29:59 2007 +0000
+++ b/pidgin/pixmaps/toolbar/16/Makefile.am	Thu May 03 18:37:33 2007 +0000
@@ -10,6 +10,7 @@
 		insert-link.png \
 		message-new.png \
 		plugins.png \
+		send-file.png \
 		unblock.png
 
 pidgintoolbarpixdir = $(datadir)/pixmaps/pidgin/toolbar/16
Binary file pidgin/pixmaps/toolbar/16/send-file.png has changed