[Gaim-commits] CVS: gaim/src dialogs.c,1.586,1.587 gtkblist.c,1.81,1.82 gtkrequest.c,1.59,1.60 stock.c,1.21,1.22 stock.h,1.12,1.13

[Christian H. <ch...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5979

Modified Files:
	dialogs.c gtkblist.c gtkrequest.c stock.c stock.h 
Log Message:
Add an alias stock item, and use it.


Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.586
retrieving revision 1.587
diff -u -d -p -r1.586 -r1.587
--- dialogs.c	20 Feb 2004 23:08:21 -0000	1.586
+++ dialogs.c	20 Feb 2004 23:14:31 -0000	1.587
@@ -1231,7 +1231,7 @@ alias_dialog_blist_chat(GaimChat *chat)
 	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 @@ alias_dialog_contact(GaimContact *contac
 	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 @@ alias_dialog_bud(GaimBuddy *b)
 
 	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);

Index: gtkblist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -p -r1.81 -r1.82
--- gtkblist.c	15 Feb 2004 04:44:00 -0000	1.81
+++ gtkblist.c	20 Feb 2004 23:14:32 -0000	1.82
@@ -833,7 +833,7 @@ static void make_buddy_menu(GtkWidget *m
 			"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 @@ create_chat_menu (GaimBlistNode *node)
 	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 @@ create_contact_menu (GaimBlistNode *node
 	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),

Index: gtkrequest.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkrequest.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -p -r1.59 -r1.60
--- gtkrequest.c	19 Feb 2004 09:47:44 -0000	1.59
+++ gtkrequest.c	20 Feb 2004 23:14:32 -0000	1.60
@@ -222,6 +222,7 @@ text_to_stock(const char *text)
 	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;
 }

Index: stock.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/stock.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -p -r1.21 -r1.22
--- stock.c	20 Feb 2004 23:03:48 -0000	1.21
+++ stock.c	20 Feb 2004 23:14:32 -0000	1.22
@@ -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 @@ static struct StockIcon
 {
 	{ 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 @@ static struct StockIcon
 
 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 },

Index: stock.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/stock.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -p -r1.12 -r1.13
--- stock.h	10 Jan 2004 04:04:56 -0000	1.12
+++ stock.h	20 Feb 2004 23:14:32 -0000	1.13
@@ -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"