Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27783/src
Modified Files:
gtkblist.c
Log Message:
00:53:29 <Bleeter> oh yeah, we've lost the accellerator on the 'add/edit' menu item anyway
00:53:42 <deryni> We can get that back.
And now we have.
Index: gtkblist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v
retrieving revision 1.349
retrieving revision 1.350
diff -u -d -p -r1.349 -r1.350
--- gtkblist.c 5 Dec 2005 04:10:08 -0000 1.349
+++ gtkblist.c 5 Dec 2005 06:07:14 -0000 1.350
@@ -2470,6 +2470,7 @@ static GtkItemFactoryEntry blist_menu[]
/* Accounts menu */
{ N_("/_Accounts"), NULL, NULL, 0, "<Branch>" },
+ { N_("/Accounts/Add\\/Edit"), "<CTL>A", gaim_gtk_accounts_window_show, 0, "<StockItem>", GAIM_STOCK_ACCOUNTS },
/* Tools */
{ N_("/_Tools"), NULL, NULL, 0, "<Branch>" },
@@ -5376,15 +5377,12 @@ gaim_gtk_blist_update_accounts_menu(void
/* Clear the old Accounts menu */
for (l = gtk_container_get_children(GTK_CONTAINER(accountmenu)); l; l = l->next) {
- gtk_container_remove(GTK_CONTAINER(accountmenu),
- GTK_WIDGET(l->data));
- }
+ menuitem = l->data;
- menuitem = gtk_menu_item_new_with_label(_("Add/Edit"));
- g_signal_connect(G_OBJECT(menuitem), "activate",
- G_CALLBACK(gaim_gtk_accounts_window_show), NULL);
- gtk_menu_shell_append(GTK_MENU_SHELL(accountmenu), menuitem);
- gtk_widget_show(menuitem);
+ if (menuitem != gtk_item_factory_get_widget(gtkblist->ift, N_("/Accounts/Add\\/Edit")))
+ gtk_container_remove(GTK_CONTAINER(accountmenu),
+ GTK_WIDGET(l->data));
+ }
for (accounts = gaim_accounts_get_all(); accounts; accounts = accounts->next) {
char *buf = NULL;
|
