Mercurial > pidgin.yaz

changeset 8302:462ead6fc1a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 9026] Add an alias stock item, and use it. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Fri, 20 Feb 2004 23:14:32 +0000
parents 35540faa72c0
children 4eb4b2a6c604
files src/dialogs.c src/gtkblist.c src/gtkrequest.c src/stock.c src/stock.h
diffstat 5 files changed, 11 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/dialogs.c	Fri Feb 20 23:08:21 2004 +0000
+++ b/src/dialogs.c	Fri Feb 20 23:14:32 2004 +0000
@@ -1231,7 +1231,7 @@
 	gaim_request_input(NULL, _("Alias Chat"), NULL,
 					   _("Enter an alias for this chat."),
 					   chat->alias, FALSE, FALSE,
-					   _("_Alias"), G_CALLBACK(alias_chat_cb),
+					   _("Alias"), G_CALLBACK(alias_chat_cb),
 					   _("Cancel"), NULL, chat);
 }
 
@@ -1248,7 +1248,7 @@
 	gaim_request_input(NULL, _("Alias Contact"), NULL,
 					   _("Enter an alias for this contact."),
 					   contact->alias, FALSE, FALSE,
-					   _("_Alias"), G_CALLBACK(alias_contact_cb),
+					   _("Alias"), G_CALLBACK(alias_contact_cb),
 					   _("Cancel"), NULL, contact);
 }
 
@@ -1267,7 +1267,7 @@
 
 	gaim_request_input(NULL, _("Alias Buddy"), NULL,
 					   secondary, b->alias, FALSE, FALSE,
-					   _("_Alias"), G_CALLBACK(alias_buddy_cb),
+					   _("Alias"), G_CALLBACK(alias_buddy_cb),
 					   _("Cancel"), NULL, b);
 
 	g_free(secondary);
--- a/src/gtkblist.c	Fri Feb 20 23:08:21 2004 +0000
+++ b/src/gtkblist.c	Fri Feb 20 23:14:32 2004 +0000
@@ -833,7 +833,7 @@
 			"drawing-menu", menu, b);
 
 	gaim_separator(menu);
-	gaim_new_item_from_stock(menu, _("_Alias..."), GAIM_STOCK_EDIT,
+	gaim_new_item_from_stock(menu, _("_Alias..."), GAIM_STOCK_ALIAS,
 			G_CALLBACK(gtk_blist_menu_alias_cb), b, 0, 0, NULL);
 	gaim_new_item_from_stock(menu, _("_Remove"), GTK_STOCK_REMOVE,
 			G_CALLBACK(gaim_gtk_blist_remove_cb), b,
@@ -905,7 +905,7 @@
 	gaim_new_check_item(menu, _("Auto-Join"),
 			    G_CALLBACK(gtk_blist_menu_autojoin_cb), node,
 				autojoin);
-	gaim_new_item_from_stock(menu, _("_Alias..."), GAIM_STOCK_EDIT,
+	gaim_new_item_from_stock(menu, _("_Alias..."), GAIM_STOCK_ALIAS,
 				 G_CALLBACK(gtk_blist_menu_alias_cb), node, 0, 0, NULL);
 	gaim_new_item_from_stock(menu, _("_Remove"), GTK_STOCK_REMOVE,
 				 G_CALLBACK(gaim_gtk_blist_remove_cb), node, 0, 0, NULL);
@@ -918,7 +918,7 @@
 	GtkWidget *menu;
 
 	menu = gtk_menu_new();
-	gaim_new_item_from_stock(menu, _("_Alias..."), GAIM_STOCK_EDIT,
+	gaim_new_item_from_stock(menu, _("_Alias..."), GAIM_STOCK_ALIAS,
 				 G_CALLBACK(gtk_blist_menu_alias_cb), node, 0, 0, NULL);
 	gaim_new_item_from_stock(menu, _("_Collapse"), GTK_STOCK_ZOOM_OUT,
 				 G_CALLBACK(gaim_gtk_blist_collapse_contact_cb),
--- a/src/gtkrequest.c	Fri Feb 20 23:08:21 2004 +0000
+++ b/src/gtkrequest.c	Fri Feb 20 23:14:32 2004 +0000
@@ -222,6 +222,7 @@
 	STOCK_ITEMIZE(_("Add"),     GTK_STOCK_ADD);
 	STOCK_ITEMIZE(_("Remove"),  GTK_STOCK_REMOVE);
 	STOCK_ITEMIZE(_("Save"),    GTK_STOCK_SAVE);
+	STOCK_ITEMIZE(_("Alias"),   GAIM_STOCK_ALIAS);
 
 	return text;
 }
--- a/src/stock.c	Fri Feb 20 23:08:21 2004 +0000
+++ b/src/stock.c	Fri Feb 20 23:14:32 2004 +0000
@@ -6,7 +6,7 @@
  * Gaim is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
  * source distribution.
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -36,6 +36,7 @@
 {
 	{ GAIM_STOCK_ABOUT,           "buttons", "about_menu.png"           },
 	{ GAIM_STOCK_ACCOUNTS,        "buttons", "accounts.png"             },
+	{ GAIM_STOCK_ALIAS,           "buttons", "edit.png"                 },
 	{ GAIM_STOCK_BGCOLOR,         "buttons", "change-bgcolor-small.png" },
 	{ GAIM_STOCK_BLOCK,           NULL,      GTK_STOCK_STOP             },
 	{ GAIM_STOCK_CHAT,            NULL,      GTK_STOCK_JUMP_TO          },
@@ -82,6 +83,7 @@
 
 const GtkStockItem stock_items[] =
 {
+	{ GAIM_STOCK_ALIAS,     N_("_Alias"),     0, 0, NULL },
 	{ GAIM_STOCK_MODIFY,    N_("_Modify"),    0, 0, NULL },
 	{ GAIM_STOCK_OPEN_MAIL, N_("_Open Mail"), 0, 0, NULL },
 	{ GAIM_STOCK_PAUSE,     N_("_Pause"),     0, 0, NULL },
--- a/src/stock.h	Fri Feb 20 23:08:21 2004 +0000
+++ b/src/stock.h	Fri Feb 20 23:14:32 2004 +0000
@@ -31,6 +31,7 @@
 /*@{*/
 #define GAIM_STOCK_ABOUT           "gaim-about"
 #define GAIM_STOCK_ACCOUNTS        "gaim-accounts"
+#define GAIM_STOCK_ALIAS           "gaim-alias"
 #define GAIM_STOCK_AWAY            "gaim-away"
 #define GAIM_STOCK_BGCOLOR         "gaim-bgcolor"
 #define GAIM_STOCK_BLOCK           "gaim-block"